updated flake, added snap

This commit is contained in:
2025-11-24 01:02:33 -08:00
parent e809186d9b
commit 262dbf1251
4 changed files with 116 additions and 27 deletions

125
flake.lock generated
View File

@@ -1,6 +1,38 @@
{ {
"nodes": { "nodes": {
"flake-compat": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"revCount": 69,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@@ -8,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762810396, "lastModified": 1763759067,
"narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -67,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762787259, "lastModified": 1763963090,
"narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762627886, "lastModified": 1763505477,
"narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -129,6 +161,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-snapd": {
"inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1761703712,
"narHash": "sha256-OKuNVXmHuZ0zi8T0aGWrBJizIfvdTqV1RiV0IN8GPZs=",
"owner": "nix-community",
"repo": "nix-snapd",
"rev": "f7694a0e26d890e285137e1b726b1b44038805c4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-snapd",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762847253, "lastModified": 1762847253,
@@ -147,27 +199,41 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1762756533, "lastModified": 1761442529,
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "narHash": "sha256-8aDps5fCt0Ndw56ZgeBvdT7E5zeUSFi3CJaNR7ZJKnA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "rev": "75762615e96b1a7f172dcdadf62aa9f3aebedf7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1754788789,
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762596750, "lastModified": 1763835633,
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -177,9 +243,25 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1763622513,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
@@ -187,11 +269,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1762865386, "lastModified": 1763946814,
"narHash": "sha256-2hkqfvY2wH+78M85X/ZApyZURnFc926b2mAHiyHcGDE=", "narHash": "sha256-BGM7b3b38cyAc7xdFgh+qbXGy5dEdZ+7bO3QX0QyzmM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "9e556e752505263eef8c0d0f982e2ab9029cc512", "rev": "3426dd04bbf7aacd2b51b8a40e62e29f4381e7a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -228,8 +310,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "home-manager-unstable": "home-manager-unstable",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-snapd": "nix-snapd",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim" "nixvim": "nixvim"
} }

View File

@@ -6,6 +6,8 @@
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nix-darwin.url = "github:nix-darwin/nix-darwin/master"; nix-darwin.url = "github:nix-darwin/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
nix-snapd.url = "github:nix-community/nix-snapd";
nix-snapd.inputs.pkgs-unstable.follows = "nixpkgs";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.05";
@@ -30,13 +32,14 @@
outputs = outputs =
{ self, { self,
nixpkgs,
nixpkgs-unstable,
nix-darwin,
home-manager, home-manager,
home-manager-unstable, home-manager-unstable,
nixvim, nix-darwin,
nix-snapd,
nixos-hardware, nixos-hardware,
nixpkgs,
nixpkgs-unstable,
nixvim,
... ...
}@inputs: }@inputs:
let let
@@ -65,6 +68,7 @@
./hosts/eva-01/configuration.nix ./hosts/eva-01/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
nixos-hardware.nixosModules.lenovo-thinkpad-x1-nano-gen1 nixos-hardware.nixosModules.lenovo-thinkpad-x1-nano-gen1
nix-snapd.nixosModules.default { services.snap.enable = true; }
]; ];
}; };

View File

@@ -37,6 +37,7 @@
moonlight-qt moonlight-qt
nestopia-ue nestopia-ue
nix-ld nix-ld
notion-app
obsidian obsidian
pandoc pandoc
prismlauncher prismlauncher
@@ -48,7 +49,6 @@
qFlipper qFlipper
r2modman r2modman
remmina remmina
rpi-imager
sdrangel sdrangel
sdrpp sdrpp
signal-desktop signal-desktop
@@ -62,6 +62,7 @@
vscode vscode
wireshark wireshark
yubikey-agent yubikey-agent
# rpi-imager
] ]
++ lib.optionals (hostname == "eva-01") [ ++ lib.optionals (hostname == "eva-01") [

View File

@@ -260,6 +260,7 @@
file file
findutils findutils
git git
goose-cli
hcxdumptool hcxdumptool
hcxtools hcxtools
kopia kopia
@@ -276,8 +277,8 @@
tlp tlp
unzip unzip
vim vim
wirelesstools
wifite2 wifite2
wirelesstools
#fonts #fonts
nerd-fonts.hack nerd-fonts.hack