diff options
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | home/nipsy/common/core/git.nix | 10 | ||||
| -rw-r--r-- | home/root/common/core/git.nix | 2 | ||||
| -rw-r--r-- | hosts/arrakis/default.nix | 21 | ||||
| -rw-r--r-- | hosts/caladan/default.nix | 15 |
5 files changed, 36 insertions, 54 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1760130406, - "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=", + "lastModified": 1761061028, + "narHash": "sha256-SK12k/LxFrfdCfGqZcDgX1dLk863EYDYGQ3F2AHV9U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d305eece827a3fe317a2d70138f53feccaf890a1", + "rev": "aa559a682b4ab29e2bea410248dbc60a591299b0", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1760200295, - "narHash": "sha256-2RA4qKkAXu7DKZJPs8B5Zsko2P61uBVYWV4Oe9SS1mI=", + "lastModified": 1761061904, + "narHash": "sha256-1V4tC7DTL210LX48DocrJoj4CuZ+Ejb/+p9ZU+u6RSo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8cca1f576757f5c8596c25dd38c5f44837cb4bc", + "rev": "be55946f3b0d301d8de888ac5fb0674a08e733fd", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1758268943, - "narHash": "sha256-ufkrvMWvS+tgzs5H5iRZn/okuvmSzRLeBf+zUxES6YE=", + "lastModified": 1760529408, + "narHash": "sha256-8O93EsTHCL2OEs/ABLlaGZn+0cmcfsqnCEcveDfeal0=", "owner": "icewind1991", "repo": "nvidia-patch-nixos", - "rev": "e7358911c8f611eb1eb8e0758aa668d4d2d55cd9", + "rev": "56bfb36201da85131cb9f7207b10bf3357e4c5c6", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", + "lastModified": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "type": "github" }, "original": { diff --git a/home/nipsy/common/core/git.nix b/home/nipsy/common/core/git.nix index d8bc6cf..5ff118e 100644 --- a/home/nipsy/common/core/git.nix +++ b/home/nipsy/common/core/git.nix @@ -1,8 +1,12 @@ { programs.git = { enable = true; - userEmail = "nipsy@bitgnome.net"; - userName = "Mark Nipper"; - extraConfig.pull.rebase = true; + settings = { + pull.rebase = true; + user = { + email = "nipsy@bitgnome.net"; + name = "Mark Nipper"; + }; + }; }; } diff --git a/home/root/common/core/git.nix b/home/root/common/core/git.nix index 49e10df..e1cb96b 100644 --- a/home/root/common/core/git.nix +++ b/home/root/common/core/git.nix @@ -1,6 +1,6 @@ { programs.git = { enable = true; - extraConfig.pull.rebase = true; + settings.pull.rebase = true; }; } diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 8e0c8eb..de07f5f 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -83,39 +83,18 @@ ''; environment.systemPackages = [ - pkgs.angband - #pkgs.assaultcube pkgs.bitcoind - pkgs.bsdgames - pkgs.bzflag - pkgs.extremetuxracer - #pkgs.frozen-bubble - pkgs.hedgewars #pkgs.igir - pkgs.kobodeluxe pkgs.lidarr pkgs.mailutils pkgs.megacmd - #pkgs.moc - pkgs.nethack - #pkgs.openttd pkgs.prowlarr pkgs.qbittorrent-nox pkgs.radarr pkgs.rdiff-backup pkgs.readarr - #pkgs.scorched3d - pkgs.signal-desktop pkgs.sonarr - #pkgs.superTux - #pkgs.superTuxKart - pkgs.umoria - pkgs.vial - pkgs.warzone2100 - #pkgs.wine9_22.wineWowPackages.stagingFull pkgs.wpa_supplicant - pkgs.xonotic-sdl - #pkgs.xpilot-ng ]; imports = [ diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index 5bbfeaf..746c1ee 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -29,12 +29,12 @@ environment.systemPackages = [ pkgs.angband - #pkgs.assaultcube + pkgs.assaultcube pkgs.bsdgames pkgs.bzflag pkgs.extremetuxracer pkgs.fastfetch - #pkgs.frozen-bubble + pkgs.frozen-bubble pkgs.hedgewars #pkgs.igir pkgs.kobodeluxe @@ -42,23 +42,22 @@ pkgs.mailutils #pkgs.moc pkgs.nethack - #pkgs.openttd + pkgs.openttd pkgs.linuxKernel.packages.linux_6_16.turbostat pkgs.qbittorrent-nox pkgs.rdiff-backup - #pkgs.scorched3d + pkgs.scorched3d pkgs.signal-desktop - #pkgs.superTux - #pkgs.superTuxKart + pkgs.superTux + pkgs.superTuxKart pkgs.umoria pkgs.vial pkgs.vice pkgs.warzone2100 pkgs.wayback-x11 - #pkgs.wine9_22.wineWowPackages.stagingFull pkgs.wpa_supplicant pkgs.xonotic-sdl - #pkgs.xpilot-ng + pkgs.xpilot-ng ]; imports = [ |