mod: stop lazygit from autofetching

defaults/sway/config

@@ -198,8 +198,8 @@ bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 bindsym XF86AudioPlay exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
-bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+bindsym XF86MonBrightnessUp exec light -A 5
-bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
+bindsym XF86MonBrightnessDown exec light -U 5
 
 ### Lock the screen
 bindsym $mod+Ctrl+q 'swaylock -f -i /home/wyatt/.wallpaper/.wallpaper_lock.png'

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1783689476,
+        "lastModified": 1777475243,
-        "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=",
+        "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "af94408291ad477cae8eed964981ab41f90eb184",
+        "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8",
         "type": "github"
       },
       "original": {
@@ -29,37 +29,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1783744694,
+        "lastModified": 1772129556,
-        "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
+        "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74",
+        "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-26.05",
+        "ref": "nix-darwin-25.11",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "darwin_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779036909,
-        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "56c666e108467d87d13508936aade6d567f2a501",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -83,27 +62,41 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
+        "lastModified": 1761588595,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "edolstra",
         "repo": "flake-compat",
         "type": "github"
       }
     },
     "flake-schemas": {
       "locked": {
-        "lastModified": 1780327564,
+        "lastModified": 1761577921,
-        "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
+        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
-        "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
+        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
-        "revCount": 149,
+        "revCount": 107,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
+      }
+    },
+    "flake-schemas_2": {
+      "locked": {
+        "lastModified": 1761577921,
+        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
+        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
+        "revCount": 107,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -115,29 +108,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1701680307,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -156,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778507602,
+        "lastModified": 1765016596,
-        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
         "type": "github"
       },
       "original": {
@@ -198,11 +173,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1783668331,
+        "lastModified": 1777487930,
-        "narHash": "sha256-mMfzU9jvq9XQyyssR9w0Rki8/Ec4Ez+bLkFWc7BaGGg=",
+        "narHash": "sha256-vdB1KmqUuUmzr0H1JI491jvuninmuSkeaARwBsTHM58=",
         "owner": "purpleclay",
         "repo": "go-overlay",
-        "rev": "423eed783363fa154fc7f0c049f7effa910d2440",
+        "rev": "aa92d14492077f331898bd8ed671765ef5a5884e",
         "type": "github"
       },
       "original": {
@@ -211,26 +186,6 @@
         "type": "github"
       }
     },
-    "hildibrand": {
-      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1785717646,
-        "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
-        "ref": "refs/heads/master",
-        "rev": "9588520925513ed0e47711a5798c6e9958143a0a",
-        "revCount": 5,
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -238,34 +193,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1783740085,
+        "lastModified": 1775425411,
-        "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-26.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1779507042,
-        "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -288,11 +225,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
+        "lastModified": 1765779637,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
         "type": "github"
       },
       "original": {
@@ -304,67 +241,21 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1783703440,
+        "lastModified": 1777077449,
-        "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=",
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1784280462,
-        "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
-        "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
-        "revCount": 1009740,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1778443072,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1780902259,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -380,26 +271,32 @@
         "type": "github"
       }
     },
-    "nur": {
+    "nixpkgs_4": {
-      "inputs": {
-        "darwin": "darwin_2",
-        "flake-utils": "flake-utils_2",
-        "hildibrand": "hildibrand",
-        "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_5"
-      },
       "locked": {
-        "lastModified": 1786304454,
+        "lastModified": 1766201043,
-        "narHash": "sha256-2ovOgwFWnKqUMoQfxbobtIWQ+TSN62llX9eJVb9hFoY=",
+        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
-        "ref": "refs/heads/master",
+        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
-        "rev": "ea7094e4e33fbb030edf28383de37073fc8b84e0",
+        "revCount": 904049,
-        "revCount": 43,
+        "type": "tarball",
-        "type": "git",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz"
-        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
       },
       "original": {
-        "type": "git",
+        "type": "tarball",
-        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1769089682,
+        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
+        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
+        "revCount": 906333,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.906333%2Brev-078d69f03934859a181e81ba987c2bb033eebfc5/019bebf2-031c-7119-8fdc-ce9d29d005fa/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
       }
     },
     "root": {
@@ -410,8 +307,9 @@
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_2",
-        "nur": "nur",
+        "rust-overlay": "rust-overlay_2",
-        "rust-overlay": "rust-overlay_3"
+        "swaytreesave": "swaytreesave",
+        "vintage-story": "vintage-story"
       }
     },
     "rust-overlay": {
@@ -422,11 +320,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782875958,
+        "lastModified": 1770952264,
-        "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=",
+        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca",
+        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
         "type": "github"
       },
       "original": {
@@ -437,18 +335,14 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3"
-          "nur",
-          "hildibrand",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1784438913,
+        "lastModified": 1777432579,
-        "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
+        "narHash": "sha256-Ce11TStDsqCge2vAAfLKe2+4lDI5cSX5ZYZOuKJBKKQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
+        "rev": "3ecb5e6ab380ced3272ef7fcfe398bffbcc0f152",
         "type": "github"
       },
       "original": {
@@ -457,22 +351,23 @@
         "type": "github"
       }
     },
-    "rust-overlay_3": {
+    "swaytreesave": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "flake-schemas": "flake-schemas",
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1783834461,
+        "lastModified": 1767148467,
-        "narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=",
+        "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=",
-        "owner": "oxalica",
+        "ref": "refs/heads/master",
-        "repo": "rust-overlay",
+        "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a",
-        "rev": "a286e5b998e852297a403786f063fb2c9fe7f57a",
+        "revCount": 4,
-        "type": "github"
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
       },
       "original": {
-        "owner": "oxalica",
+        "type": "git",
-        "repo": "rust-overlay",
+        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
-        "type": "github"
       }
     },
     "systems": {
@@ -490,19 +385,23 @@
         "type": "github"
       }
     },
-    "systems_2": {
+    "vintage-story": {
+      "inputs": {
+        "flake-schemas": "flake-schemas_2",
+        "nixpkgs": "nixpkgs_5"
+      },
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1769397199,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-MSajncUGZtlpl88rqFdj42eGGyWnk2jw84VbK3AgUBA=",
-        "owner": "nix-systems",
+        "ref": "refs/heads/master",
-        "repo": "default",
+        "rev": "4d2313c50933645040a0d12556016fc2916bfa65",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "revCount": 1,
-        "type": "github"
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
       },
       "original": {
-        "owner": "nix-systems",
+        "type": "git",
-        "repo": "default",
+        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
-        "type": "github"
       }
     }
   },

flake.nix

@@ -1,14 +1,14 @@
 {
   description = "Wyatt's nix configuration suite";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
     home-manager = {
-      url = "github:nix-community/home-manager/release-26.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-26.05";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     rust-overlay.url = "github:oxalica/rust-overlay";
@@ -17,7 +17,10 @@
       url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
+
+    # My personal flakes
+    swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git";
+    vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git";
   };
 
   outputs = inputs @ {
@@ -29,13 +32,14 @@
     rust-overlay,
     go-overlay,
     aagl,
-    nur,
+    swaytreesave,
+    vintage-story,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail nur;
+      inherit userName userEmail swaytreesave;
     };
 
     myOverlays = { ... }: {
@@ -82,7 +86,7 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail aagl nur;
+        inherit userName userEmail aagl vintage-story;
         hostname = "cloud";
         role = "workstation";
       };
@@ -122,7 +126,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "workstation"; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
@@ -165,7 +169,7 @@
     nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail nur;
+        inherit userName userEmail vintage-story;
         hostname = "thancred";
         role = "server";
       };
@@ -213,32 +217,6 @@
       ];
     };
 
-    # Discord bot server
-    nixosConfigurations."estinien" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail nur;
-        hostname = "estinien";
-        role = "server";
-      };
-      modules = [
-        myOverlays
-        ./modules/common
-        ./modules/machine/estinien
-
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
-          home-manager.backupFileExtension = "bak";
-          home-manager.users.${userName}.imports = [
-            ./home
-          ];
-        }
-      ];
-    };
-
     # generic non-NixOS Linux machine
     homeConfigurations."generic" = let
       hostname = builtins.getEnv "HOSTNAME";

home/default.nix

@@ -1,6 +1,7 @@
 { lib
 , pkgs
 , userName
+, swaytreesave
 , isNixOS ? true
 , ...
 }: let

home/lazygit.nix

@@ -4,6 +4,7 @@
     package = pkgs.lazygitLatest;
 
     settings = {
+      git.autoFetch = false;
       gui.skipDiscardChangeWarning = true;
       gui.theme = {
         activeBorderColor = ["#a6e3a1" "bold"];

home/packages/linux.nix

@@ -5,12 +5,7 @@ lib.mkIf pkgs.stdenv.isLinux {
     xdg-utils
   ] ++ lib.optionals isNixOS [
     vesktop
-    thunar
+    xfce.thunar
-    thunar-volman
-    thunar-shares-plugin
-    thunar-vcs-plugin
-    thunar-archive-plugin
-    thunar-media-tags-plugin
     pavucontrol
     zathura
     gpu-screen-recorder

home/sway.nix

@@ -1,7 +1,7 @@
 {
   lib,
   pkgs,
-  nur,
+  swaytreesave,
   ...
 }: let
   dirs = {
@@ -17,7 +17,7 @@
   };
 in {
   imports = [
-    nur.homeManagerModules.swaytreesave
+    swaytreesave.homeManagerModules.default
   ];
 
   programs.swaytreesave.enable = if pkgs.stdenv.isLinux then true else false;
@@ -155,4 +155,5 @@ in {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
   };
+
 }

modules/apps/gaming.nix

@@ -3,7 +3,7 @@
   lib,
   pkgs,
   aagl,
-  nur,
+  vintage-story,
   ...
 }: let
   cfg = config.gaming;
@@ -149,15 +149,10 @@ in {
     vintage-story = {
       enable = lib.mkEnableOption "Vintage Story client and server";
     };
-
-    archon = {
-      enable = lib.mkEnableOption "Archon from NUR";
-    };
   };
 
   config = let 
     agl = cfg.aagl;
-    nurPkgs = import "${nur.outPath}/pkgs" { inherit pkgs; };
   in {
     programs.steam = lib.mkIf cfg.steam.enable {
       enable = true;
@@ -223,8 +218,7 @@ in {
       )) ++
       (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
       (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
-      (lib.optionals cfg.vintage-story.enable [nurPkgs.vintage-story]) ++
+      (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++
-      (lib.optionals cfg.archon.enable [nurPkgs.archon]) ++
       (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++
       (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++
       (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]);
@@ -232,7 +226,7 @@ in {
     nix.settings = let 
       inherit agl;
     in (lib.mkIf
-      (agl.anime-game-launcher.enable || agl.honkers-railway-launcher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
+      (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
       {
         substituters = [ "https://ezkea.cachix.org" ];
         trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ];

modules/machine/cloud/configuration.nix

@@ -3,7 +3,6 @@
   pkgs,
   userName,
   aagl,
-  nur,
   ...
 }: let
   flatpakPackages = [
@@ -35,20 +34,7 @@ in {
   ];
 
   # Enable flakes for NixOS
-  nix.settings = {
+  nix.settings.experimental-features = ["nix-command" "flakes"];
-    experimental-features = ["nix-command" "flakes"];
-    substituters = [
-      "https://attic.home.wyattjmiller.com/wyatt"
-    ];
-
-    trusted-substituters = [
-      "https://attic.home.wyattjmiller.com/wyatt"
-    ];
-
-    trusted-public-keys = [
-      "wyatt:KBM2U2fVUomYUdMsxeNp0MDrUrCU5BECZHLF72o8TOI="
-    ];
-  };
 
   # Custom kernel/boot stuff
   boot = {
@@ -71,7 +57,7 @@ in {
     grim
     slurp
     playerctl
-    # light - UNMAINTAINED, brightnessctl is the replacement
+    light
     brightnessctl
     wttrbar
     cliphist
@@ -82,12 +68,6 @@ in {
     shared-mime-info
     wl-clipboard
     wl-clip-persist
-    ollama-rocm
-    newelle
-    vlc
-    mediainfo
-    makemkv
-    ffmpeg
   ];
 
   # Enable Polkit
@@ -126,13 +106,11 @@ in {
     };
 
     ffxiv.enable = true;
-    archon.enable = true;
     minecraft.enable = true;
-    aagl.wavey-launcher.enable = true;
+    aagl.anime-game-launcher.enable = true;
     vintage-story.enable = true;
   };
 
-  
   # Power management (see ../../pwrMgmt/default.nix)
   pwrMgmt = {
     enable = true;
@@ -232,8 +210,5 @@ in {
     ];
   };
 
-  # Tailscale service
-  services.tailscale.enable = true;
-
   system.stateVersion = "24.11";
 }

modules/machine/estinien/configuration.nix

@@ -1,118 +0,0 @@
-{
-  pkgs,
-  userName,
-  nur,
-  ...
-}: let
-    hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand;
-    caitsith = nur.packages.${pkgs.stdenv.hostPlatform.system}.caitsith;
-  in {
-  imports = [
-    ../../pwrMgmt
-    ../../networking/core.nix
-  ];
-
-  # Enable flakes for NixOS
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
-  # Custom kernel/boot stuff
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # Set your timezone
-  time.timeZone = "America/Detroit";
-
-  # Enable OpenSSH
-  services.openssh.enable = true;
-
-  # Enable keyring
-  services.gnome.gnome-keyring.enable = true;
-
-  # Enable GnuPG
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # Enable SUID wrappers (some programs need them)
-  programs.mtr.enable = true;
-
-  # Enable Polkit
-  security.polkit.enable = true;
-
-  # Power management (see ../../pwrMgmt/default.nix)
-  pwrMgmt = {
-    enable = true;
-    cpuFreqGovernor = "performance";
-    powertop.enable = false;
-  };
-
-  network = {
-    firewall = {
-      enable = true;
-    };
-    networkManager.enable = true;
-  };
-
-  environment.systemPackages = [
-    hildibrand
-    caitsith
-  ];
-
-  systemd.services.hildibrand = {
-    description = "Hildibrand - trivia buzzer bot";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "simple";
-      User = userName;
-      WorkingDirectory = "/home/${userName}";
-      ExecStart = "${hildibrand}/bin/hildebrand";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      EnvironmentFile = "/etc/secrets/hildibrand.env";
-    };
-  };
-
-  systemd.services.caitsith = {
-    description = "Caitsith - a randomizer bot";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "simple";
-      User = userName;
-      WorkingDirectory = "/home/${userName}";
-      ExecStart = "${caitsith}/bin/hildebrand";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      EnvironmentFile = "/etc/secrets/caitsith.env";
-    };
-  };
-
-  # Add username to groups "wheel" and "video" - more may be added here later
-  users = {
-    users = {
-      ${userName} = {
-        extraGroups = [ "wheel" "network" ];
-        openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
-        ];
-      };
-    };
-  };
-
-  services.fail2ban = {
-    enable = true;
-    package = pkgs.fail2ban;
-    maxretry = 5;
-    bantime = "3h";
-    bantime-increment = {
-      enable = true;
-      rndtime = "10m";
-    };
-  };
-
-  system.stateVersion = "24.11";
-}

modules/machine/estinien/default.nix

@@ -1,6 +0,0 @@
-{ ... }: {
-  imports = [
-    ./configuration.nix
-    ./hardware-configuration.nix
-  ];
-}

modules/machine/estinien/hardware-configuration.nix

@@ -1,32 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/498ce176-f090-46d8-96bf-9e6141cffa19";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/09A6-B803";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/4a64a2ee-2b32-4e53-b00f-7b1f127162aa"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

modules/machine/sephiroth/apps.nix

@@ -2,7 +2,6 @@
   environment.systemPackages = with pkgs; [
     neovim
     git
-    tailscale
   ];
 
   environment.variables.EDITOR = "nvim";

modules/machine/thancred/configuration.nix

@@ -1,7 +1,7 @@
 {
   pkgs,
   userName,
-  nur,
+  vintage-story,
   ...
 }: {
   imports = [
@@ -60,7 +60,7 @@
   };
 
   environment.systemPackages = [
-    nur.packages.${pkgs.system}.vintage-story
+    vintage-story.packages.${pkgs.system}.default
   ];
 
   systemd.services.vintagestory-server = {
@@ -71,7 +71,7 @@
       Type = "simple";
       User = userName;
       WorkingDirectory = "/home/${userName}";
-      ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
+      ExecStart = "${vintage-story.packages.${pkgs.system}.default}/bin/vintagestory-server";
       Restart = "on-failure";
       RestartSec = "5s";
     };

modules/sound/pipewire.nix

@@ -6,7 +6,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    # helvum - UNMAINTAINED
+    helvum
-    crosspipe
   ];
 }