From 122b36204c5852a349fb6d8a1c98c4344815489f Mon Sep 17 00:00:00 2001 From: William Date: Sun, 13 Jul 2025 13:16:29 -0300 Subject: [PATCH] use nixos-cli --- flake.lock | 157 +++++++++++++++++++++++++++++++++++-- flake.nix | 4 + hosts/modules/programs.nix | 1 + hosts/modules/services.nix | 7 ++ 4 files changed, 163 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7e80c31..70aca9c 100644 --- a/flake.lock +++ b/flake.lock @@ -188,6 +188,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1747046372, "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", @@ -223,6 +239,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -419,13 +453,54 @@ "type": "github" } }, + "nix-options-doc": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1742115705, + "narHash": "sha256-RfXwJPWBoWswIU68+y/XZfTWtFHd/fK14bKvOlRmfPo=", + "owner": "Thunderbottom", + "repo": "nix-options-doc", + "rev": "2caa4b5756a8666d65d70122f413e295f56886e7", + "type": "github" + }, + "original": { + "owner": "Thunderbottom", + "ref": "v0.2.0", + "repo": "nix-options-doc", + "type": "github" + } + }, + "nixos-cli": { + "inputs": { + "flake-compat": "flake-compat_2", + "nix-options-doc": "nix-options-doc", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1752359519, + "narHash": "sha256-ksd2Gu1JpKU3rKvbkpiUlrkY72M8VAln1w4W7pj77WQ=", + "owner": "nix-community", + "repo": "nixos-cli", + "rev": "c2778572d75bc27ae2234653c5ce9489930d0c7d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-cli", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -451,6 +526,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1751625545, + "narHash": "sha256-4E7wWftF1ExK5ZEDzj41+9mVgxtuRV3wWCId7QAYMAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c860cf0b3a0829f0f6cf344ca8de83a2bbfab428", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -486,11 +593,34 @@ "home-manager-stable": "home-manager-stable", "impermanence": "impermanence", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs", + "nixos-cli": "nixos-cli", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "stylix": "stylix" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cli", + "nix-options-doc", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740796337, + "narHash": "sha256-FuoXrXZPoJEZQ3PF7t85tEpfBVID9JQIOnVKMNfTAb0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "bbac9527bc6b28b6330b13043d0e76eac11720dc", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -498,7 +628,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -507,7 +637,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -573,6 +703,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a6309e0..9dfb40c 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,8 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; + nixos-cli.url = "github:nix-community/nixos-cli"; + nix-flatpak.url = "github:gmodena/nix-flatpak/main"; impermanence.url = "github:nix-community/impermanence"; @@ -50,6 +52,7 @@ disko, agenix, deploy-rs, + nixos-cli, nix-flatpak, impermanence, ... @@ -79,6 +82,7 @@ impermanence.nixosModules.impermanence nix-flatpak.nixosModules.nix-flatpak stylix.nixosModules.stylix + nixos-cli.nixosModules.nixos-cli self.nixosModules.git-pull-timer { nixpkgs.overlays = [ diff --git a/hosts/modules/programs.nix b/hosts/modules/programs.nix index e7c9927..8715d07 100644 --- a/hosts/modules/programs.nix +++ b/hosts/modules/programs.nix @@ -18,6 +18,7 @@ ### System Utilities ### btop nixos-firewall-tool + nvd sysz tmux wget diff --git a/hosts/modules/services.nix b/hosts/modules/services.nix index a63e75d..e6ca3f1 100644 --- a/hosts/modules/services.nix +++ b/hosts/modules/services.nix @@ -27,6 +27,13 @@ user = "user"; group = "users"; }; + nixos-cli = { + enable = true; + config = { + use_nvd = true; + ignore_dirty_tree = true; + }; + }; fwupd.enable = true; fstrim.enable = true; };