From 37ecd053b384b711e68c3192b85bd00bb8661a0a Mon Sep 17 00:00:00 2001 From: tom barrett Date: Sat, 3 Jan 2026 11:45:26 +0100 Subject: update --- configuration.nix | 6 +- flake.lock | 155 ++++++++------------------------------------- flake.nix | 46 +++++++------- hardware-configuration.nix | 20 ++++-- home.nix | 9 ++- 5 files changed, 75 insertions(+), 161 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0a15d60..baec170 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: { imports = [ ./hardware-configuration.nix ]; nix.settings = { @@ -51,6 +54,7 @@ }; }; fonts.packages = [ pkgs.hermit ]; + #virtualisation.docker.enable = true; services = { openssh.enable = true; xserver = { diff --git a/flake.lock b/flake.lock index 06d3eaa..02d84f9 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -65,24 +65,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -111,11 +93,11 @@ ] }, "locked": { - "lastModified": 1755229570, - "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", + "lastModified": 1767435806, + "narHash": "sha256-eMvGqc3ZnI7TwgZziozX1k2W8aby8nsV7iwqyohS/nY=", "owner": "nix-community", "repo": "home-manager", - "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", + "rev": "78a8fae57f41352ee424ef5cfd095b495b9df145", "type": "github" }, "original": { @@ -124,36 +106,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1754028485, @@ -172,11 +124,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -188,11 +140,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -202,33 +154,17 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1754393734, - "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "nixpkgs": "nixpkgs_3", "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1755272752, - "narHash": "sha256-ybZAC8y6o7VjfbDhCSZNFgRTi7ins+7VEs0sTgbFAp0=", + "lastModified": 1767436504, + "narHash": "sha256-R5ofs35Bxlq6BVp1YFN3ed81qnRc4f4uwKbxb9iRsL8=", "ref": "refs/heads/master", - "rev": "74b03874475bf82bb7d38f38dd608dabf8da9a26", - "revCount": 7, + "rev": "606b39d454e7504fc33e117583f22ddfddcdd1e8", + "revCount": 11, "type": "git", "url": "https://git.tombarrett.xyz/nixvim" }, @@ -240,16 +176,18 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1755095763, - "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", + "lastModified": 1766721995, + "narHash": "sha256-2qZLSojZFP3AzbC6UNF3ASCIDLahNniR2XP7l/qINm4=", "owner": "nix-community", "repo": "nixvim", - "rev": "ecc7880e00a2a735074243d8a664a931d73beace", + "rev": "66a5dc70e2d8433034bccdbb9c3c7bcecd86f9a6", "type": "github" }, "original": { @@ -258,30 +196,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754301638, - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -319,21 +233,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 146b927..5356ade 100644 --- a/flake.nix +++ b/flake.nix @@ -8,27 +8,29 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { - agenix, - home-manager, - nixpkgs, - nixvim, - self, - }: { - nixosConfigurations.default = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - home-manager.nixosModules.home-manager - { - home-manager = { - extraSpecialArgs = {inherit agenix nixvim;}; - useGlobalPkgs = true; - users.tom = import ./home.nix; - useUserPackages = true; - }; - } - ]; + outputs = + { + agenix, + home-manager, + nixpkgs, + nixvim, + ... + }: + { + nixosConfigurations.default = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./configuration.nix + home-manager.nixosModules.home-manager + { + home-manager = { + extraSpecialArgs = { inherit agenix nixvim; }; + useGlobalPkgs = true; + users.tom = import ./home.nix; + useUserPackages = true; + }; + } + ]; + }; }; - }; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index a09ff30..fdfe407 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -4,18 +4,24 @@ { config, lib, - pkgs, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "sd_mod" "sr_mod" "sdhci_pci"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "ehci_pci" + "ahci" + "sd_mod" + "sr_mod" + "sdhci_pci" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/4a58083f-189f-41ff-a437-b4b78b04c686"; @@ -29,7 +35,7 @@ fsType = "ext4"; }; - swapDevices = []; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/home.nix b/home.nix index 81f7d2e..bbfbc73 100644 --- a/home.nix +++ b/home.nix @@ -55,6 +55,7 @@ in python3Packages.ipython qrencode ranger + ripgrep scrot shfmt tigervnc @@ -109,12 +110,14 @@ in }; git = { enable = true; - userName = "tom barrett"; - userEmail = "tom@tombarrett.xyz"; - extraConfig = { + settings = { init.defaultBranch = "master"; pull.rebase = true; push.autoSetupRemote = true; + user = { + email = "tom@tombarrett.xyz"; + name = "tom barrett"; + }; }; }; gpg.enable = true; -- cgit v1.2.3