From 92b170e5e8332deb39c5cf4ce065bdcc3493eb5b Mon Sep 17 00:00:00 2001 From: aaron Date: Thu, 1 Oct 2026 11:20:22 +0200 Subject: [PATCH] feature: pull in the latest updates, fix some errors and add a devenv for this repository --- .gitignore | 4 ++ devenv.lock | 65 +++++++++++++++++++++++++++++++ devenv.nix | 29 ++++++++++++++ devenv.yaml | 3 ++ flake.lock | 24 ++++++------ hosts/argon/configuration.nix | 1 - hosts/default/home.nix | 1 - modules/home-manager/noctalia.nix | 7 ++-- modules/nixos/packages.nix | 1 - 9 files changed, 117 insertions(+), 18 deletions(-) create mode 100644 devenv.lock create mode 100644 devenv.nix create mode 100644 devenv.yaml diff --git a/.gitignore b/.gitignore index 780d93b..493ee99 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,7 @@ result-* # vim *.swp + +# devenv +.devenv* +devenv.local.nix diff --git a/devenv.lock b/devenv.lock new file mode 100644 index 0000000..20cf7d3 --- /dev/null +++ b/devenv.lock @@ -0,0 +1,65 @@ +{ + "nodes": { + "devenv": { + "locked": { + "dir": "src/modules", + "lastModified": 1790701375, + "narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=", + "owner": "cachix", + "repo": "devenv", + "rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4", + "type": "github" + }, + "original": { + "dir": "src/modules", + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "nixpkgs": { + "inputs": { + "nixpkgs-src": "nixpkgs-src" + }, + "locked": { + "lastModified": 1789506231, + "narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs-src": { + "flake": false, + "locked": { + "lastModified": 1789370336, + "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7def046b9a883d46974757852106483d741586f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} \ No newline at end of file diff --git a/devenv.nix b/devenv.nix new file mode 100644 index 0000000..e515280 --- /dev/null +++ b/devenv.nix @@ -0,0 +1,29 @@ +{ pkgs, ... }: + +{ + packages = with pkgs; [ + # issue tracker (git.0x29a.ch) + tea + + # nix tooling + nixfmt # official formatter (RFC 166 style) + statix # lints for nix anti-patterns + deadnix # finds unused bindings and arguments + nixd # language server + nvd # diff system generations + ]; + + scripts = { + lint.exec = '' + statix check . + deadnix --fail . + ''; + fmt.exec = '' + nixfmt $(git ls-files '*.nix') + ''; + }; + + enterShell = '' + echo "nixconfig devenv: tea, lint, fmt" + ''; +} diff --git a/devenv.yaml b/devenv.yaml new file mode 100644 index 0000000..6bf1e6c --- /dev/null +++ b/devenv.yaml @@ -0,0 +1,3 @@ +inputs: + nixpkgs: + url: github:cachix/devenv-nixpkgs/rolling diff --git a/flake.lock b/flake.lock index d6b98d0..ef154e3 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1790365885, - "narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=", + "lastModified": 1790819692, + "narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b", + "rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790323409, - "narHash": "sha256-VVTPf+Hyd5ebpjBMHmrLMSBIeW6ls48Bqtosj7CNKLA=", + "lastModified": 1790689126, + "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2", + "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1790359697, - "narHash": "sha256-AIMlxsdXEAiv7KQQ/fcarzqe541iUrT+hCUVS71CrJI=", + "lastModified": 1790541651, + "narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=", "owner": "nix-community", "repo": "nixvim", - "rev": "4571c7a95787165cc7102d417a0fe4519bf6a995", + "rev": "5980a626794486abad69fca7667f9c11dfbc3bd7", "type": "github" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1790432627, - "narHash": "sha256-iegtG9qBQ3PwY9imebhurqwB61t0Ow0c5BovD8+3WpQ=", + "lastModified": 1790718664, + "narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "94712e922116d74381bc67bfc92df70cf4dc76b5", + "rev": "fd9759c892fe5034b682c185695f1bee121cd5b3", "type": "github" }, "original": { diff --git a/hosts/argon/configuration.nix b/hosts/argon/configuration.nix index 5e410e0..57be3a3 100644 --- a/hosts/argon/configuration.nix +++ b/hosts/argon/configuration.nix @@ -11,7 +11,6 @@ ../../modules/nixos/claudecode.nix ../../modules/nixos/drives.nix ../../modules/nixos/gnupg.nix - ../../modules/nixos/gnuradio.nix ../../modules/nixos/graphics.nix ../../modules/nixos/greetd.nix ../../modules/nixos/locales.nix diff --git a/hosts/default/home.nix b/hosts/default/home.nix index c93b67a..04a20fb 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -29,7 +29,6 @@ iotop iftop strace - ltrace lsof sysstat lm_sensors diff --git a/modules/home-manager/noctalia.nix b/modules/home-manager/noctalia.nix index 1b8ef7f..24ee89a 100644 --- a/modules/home-manager/noctalia.nix +++ b/modules/home-manager/noctalia.nix @@ -1,14 +1,15 @@ { config, pkgs, inputs, ... }: { - # Noctalia v5 shell, managed via its upstream home-manager module. + # Noctalia v5 shell, managed via home-manager's built-in programs.noctalia module. + # The noctalia flake's homeModules.default is not imported: it redeclares the same + # options and its disabledModules path ("programs/noctalia.nix") doesn't match HM's. # See https://docs.noctalia.dev/v5/getting-started/nixos/ - imports = [ inputs.noctalia.homeModules.default ]; programs.noctalia = { enable = true; - # The module's `package` option has no default, so it must be set explicitly. + # Use the package from the noctalia flake rather than nixpkgs. package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default; # settings is rendered to ~/.config/noctalia/config.toml diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix index 2268645..4a40962 100644 --- a/modules/nixos/packages.nix +++ b/modules/nixos/packages.nix @@ -18,7 +18,6 @@ ldns lm_sensors lsof - ltrace mtr neovim nfs-utils