diff options
| -rw-r--r-- | configuration.nix | 17 | ||||
| -rw-r--r-- | flake.lock | 275 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home.nix | 11 |
4 files changed, 201 insertions, 106 deletions
diff --git a/configuration.nix b/configuration.nix index e5bd3b5..0081e23 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,29 +1,24 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [./hardware-configuration.nix]; nix.settings = { experimental-features = ["nix-command" "flakes"]; auto-optimise-store = true; }; - - boot.loader.grub.device = "/dev/sda"; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "en_US.UTF-8"; - networking = { hostName = "hostname"; networkmanager.enable = true; }; - users.users.tom = { isNormalUser = true; extraGroups = ["wheel" "networkmanager" "video"]; shell = pkgs.zsh; }; - programs = { slock.enable = true; zsh = { @@ -47,6 +42,6 @@ displayManager.startx.enable = true; }; }; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; zramSwap.enable = true; } @@ -1,8 +1,50 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "devshell": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixvim", @@ -10,11 +52,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -37,22 +79,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -62,11 +88,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -75,36 +101,54 @@ "type": "github" } }, - "flake-root": { + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { - "owner": "srid", - "repo": "flake-root", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "flake-utils": { + "git-hooks": { "inputs": { - "systems": "systems" + "flake-compat": [ + "nixvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, @@ -113,7 +157,7 @@ "nixpkgs": [ "nixvim", "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -134,15 +178,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1716711219, - "narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -154,17 +199,37 @@ "home-manager_2": { "inputs": { "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ "nixvim", "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", "type": "github" }, "original": { @@ -182,11 +247,11 @@ ] }, "locked": { - "lastModified": 1716511055, - "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", + "lastModified": 1726742753, + "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", + "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", "type": "github" }, "original": { @@ -197,11 +262,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -213,11 +278,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -227,13 +308,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "type": "github" }, "original": { @@ -245,15 +326,15 @@ }, "nixvim": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1716734238, - "narHash": "sha256-HCE4DMwobEytw0h+e86HpKbpHUQM39cqTIY+NKh65kI=", + "lastModified": 1726936094, + "narHash": "sha256-ZBhSLpdGTJ++cJ53pvnpAHxf4Iw8EVMhnCemkcBgaWk=", "ref": "refs/heads/master", - "rev": "7eb4b1ff5db16429afe06128015ecb96c63b42c5", - "revCount": 4, + "rev": "a1140b2d47df62214537abaea86974c2a14c39b2", + "revCount": 5, "type": "git", "url": "https://git.tombarrett.xyz/nixvim" }, @@ -267,19 +348,19 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-root": "flake-root", - "home-manager": "home-manager_2", + "git-hooks": "git-hooks", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks", + "nixpkgs": "nixpkgs_4", + "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716717390, - "narHash": "sha256-Hd8ky86xAFDrUqNPPx0bO/1x6WUEyWNLrdTEVShAMb8=", + "lastModified": 1726934957, + "narHash": "sha256-ygq8w1bvpbKS2+ePSXt3HQvM+ea10yoRAE2c1L9XruA=", "owner": "nix-community", "repo": "nixvim", - "rev": "beb86eec7cad226d100d2841aae09fc2d4e152a8", + "rev": "384f97cf50c534a18f5a8feac81d40623267aa81", "type": "github" }, "original": { @@ -288,39 +369,34 @@ "type": "github" } }, - "pre-commit-hooks": { + "nuschtosSearch": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "lastModified": 1726816132, + "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", + "owner": "NuschtOS", + "repo": "search", + "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "NuschtOS", + "repo": "search", "type": "github" } }, "root": { "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "agenix": "agenix", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" } }, @@ -339,6 +415,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -348,11 +439,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1726734507, + "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", "type": "github" }, "original": { @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + agenix.url = "github:ryantm/agenix"; nixvim.url = "git+https://git.tombarrett.xyz/nixvim"; home-manager = { url = "github:nix-community/home-manager"; @@ -8,6 +9,7 @@ }; }; outputs = { + agenix, home-manager, nixpkgs, nixvim, @@ -20,7 +22,7 @@ home-manager.nixosModules.home-manager { home-manager = { - extraSpecialArgs = {inherit nixvim;}; + extraSpecialArgs = {inherit agenix nixvim;}; useGlobalPkgs = true; users.tom = import ./home.nix; useUserPackages = true; @@ -1,6 +1,6 @@ { + agenix, config, - lib, nixvim, pkgs, ... @@ -16,12 +16,15 @@ in { home = { username = "tom"; homeDirectory = "/home/tom"; - stateVersion = "23.11"; + stateVersion = "24.05"; packages = with pkgs; [ acpi + agenix.packages.x86_64-linux.agenix + awscli2 bemenu binutils brave + btop feh file firefox @@ -35,8 +38,12 @@ in { nixvim.packages.x86_64-linux.default nmap pavucontrol + pciutils python3Packages.ipython + qrencode + ranger scrot + tigervnc tmux tree unzip |