diff --git a/README.md b/README.md index fc549ae..50fba3f 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,8 @@ the config, but especially when trying out new tools the code could be a bit wil Additionally, there's a couple of ideas I have for this: - [ ] Deploy base tooling to all hosts. This mainly includes shell and `helix` configs. They should still be configurable per-host. Potential issue here could be hosts where I don't use home manager -- [ ] Make everything more composable. Can make use of the `elements` config some more, like how it's done for `quirks` +- [ ] Make everything more composable. Can make use of the `_elements` config some more, like how it's done for `quirks` +- [ ] Create custom live-ISO that has installation tooling/shortcuts pre-configured [just]: https://github.com/casey/just [snowfall]: https://snowfall.org/guides/lib/quickstart diff --git a/flake.lock b/flake.lock index ff03fad..68ce45f 100644 --- a/flake.lock +++ b/flake.lock @@ -156,22 +156,6 @@ "type": "github" } }, - "docker-compose-1": { - "locked": { - "lastModified": 1624397714, - "narHash": "sha256-mtIXSGsYIIK8IM6bY02bZ9ENkOpPNQEMAoHE43Dg8HE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b0f0b5c6c021ebafbd322899aa9a54b87d75a313", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b0f0b5c6c021ebafbd322899aa9a54b87d75a313", - "type": "github" - } - }, "elemental-wine-source": { "flake": false, "locked": { @@ -635,7 +619,6 @@ "agenix-rekey": "agenix-rekey", "darwin": "darwin_2", "disko": "disko", - "docker-compose-1": "docker-compose-1", "home-manager": "home-manager_2", "musnix": "musnix", "nixpkgs": "nixpkgs_5", diff --git a/flake.nix b/flake.nix index 985ea71..e2fb2ce 100644 --- a/flake.nix +++ b/flake.nix @@ -100,6 +100,5 @@ affinity-nix.url = "github:mrshmllow/affinity-nix"; quadlet.url = "github:SEIAROTg/quadlet-nix"; musnix.url = "github:musnix/musnix"; - docker-compose-1.url = github:nixos/nixpkgs/b0f0b5c6c021ebafbd322899aa9a54b87d75a313; }; } diff --git a/homes/x86_64-linux/christopher@cobalt/config/dev.nix b/homes/x86_64-linux/christopher@cobalt/config/dev.nix index 8391bd9..17d3e48 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/dev.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/dev.nix @@ -36,7 +36,10 @@ nodejs_20.pkgs.pnpm ]; - programs.direnv.enable = true; + programs.direnv = { + enable = true; + config.global.log_filter = "^$"; + }; programs.direnv.nix-direnv.enable = true; programs.go.enable = true; diff --git a/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix b/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix deleted file mode 100644 index 4fb3825..0000000 --- a/homes/x86_64-linux/christopher@cobalt/config/hausgold.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - home.packages = with pkgs; [ - # docker has to be installed globally because we have to enable virtualization - inputs.docker-compose-1.legacyPackages."x86_64-linux".docker-compose - - ruby_3_4 - - # Dev environment specifics - libxcrypt # maklerportal-frontend-test-suite - postgresql - geos - - # mDNS support - nssmdns - avahi - - slack - ]; -} diff --git a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix index 0383a99..10d1d10 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix @@ -17,6 +17,7 @@ slurp # Region selection # GUI + slack # Work chat vesktop # Discord client vlc # Video player obsidian # Note taking diff --git a/modules/home/common/terminal/default.nix b/modules/home/common/terminal/default.nix index 2f6c75c..031bb96 100644 --- a/modules/home/common/terminal/default.nix +++ b/modules/home/common/terminal/default.nix @@ -15,7 +15,6 @@ in { # clean up ~ LESSHISTFILE = "${cache}/less/history"; LESSKEY = "${conf}/less/lesskey"; - DIRENV_LOG_FORMAT = ""; BROWSER = "firefox"; TERMINAL = "kitty"; diff --git a/modules/nixos/quirks/docker.nix b/modules/nixos/quirks/docker.nix index ab2713d..e7f44c7 100644 --- a/modules/nixos/quirks/docker.nix +++ b/modules/nixos/quirks/docker.nix @@ -1,27 +1,19 @@ { config, - inputs, lib, ... }: { - config = lib.mkIf (builtins.elem "avahi" config.elements.quirks) { - # Use legacy docker compose v1 - environment.systemPackages = [ - inputs.docker-compose-1.legacyPackages."x86_64-linux".docker-compose - ]; + config = lib.mkIf (builtins.elem "docker" config.elements.quirks) { + virtualisation.docker = { + enable = true; - virtualisation = { - docker = { - enable = true; - - # https://github.com/hausgold/knowledge/blob/master/troubleshooting/local-env-quirks.md#haproxy--docker-ulimit-glitch - daemon.settings = { - default-ulimits = { - nofile = { - Hard = 100000; - Soft = 100000; - Name = "nofile"; - }; + # https://github.com/hausgold/knowledge/blob/master/troubleshooting/local-env-quirks.md#haproxy--docker-ulimit-glitch + daemon.settings = { + default-ulimits = { + nofile = { + Hard = 100000; + Soft = 100000; + Name = "nofile"; }; }; };