Merge branch 'main' into feature/add-parthenon

flake.lock

@@ -5,11 +5,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1755819240,
+        "lastModified": 1746562888,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "type": "github"
       },
       "original": {
@@ -21,28 +21,27 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1754405784,
+        "lastModified": 1622559957,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
+        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       }
     },
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1760703920,
+        "lastModified": 1748408240,
-        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
         "type": "github"
       },
       "original": {
@@ -76,11 +75,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1765080359,
+        "lastModified": 1751515409,
-        "narHash": "sha256-BvAgmqgswcokD2eWoyO3uB1k1VTdpxDHGSx0RYRFjDg=",
+        "narHash": "sha256-yu+/TxHkuZ8GHKwpKTv1BpfbYD1wH1CyPsOmY72chTg=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "35f8ab2ecd954b3a348aa0e253878211c48a0aa7",
+        "rev": "2e0dcafe8c48470e036908f34a2a1413f75bd804",
         "type": "gitlab"
       },
       "original": {
@@ -93,11 +92,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1764724327,
+        "lastModified": 1748383148,
-        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
         "type": "github"
       },
       "original": {
@@ -125,11 +124,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1751413152,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
         "type": "github"
       },
       "original": {
@@ -146,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1743550720,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -195,6 +194,32 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "stylix",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747372754,
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -216,23 +241,43 @@
         "type": "github"
       }
     },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "host": "gitlab.gnome.org",
+        "lastModified": 1748186689,
-        "lastModified": 1764524476,
+        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
-        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
+        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
-        "type": "gitlab"
+        "type": "github"
       },
       "original": {
-        "host": "gitlab.gnome.org",
         "owner": "GNOME",
-        "ref": "gnome-49",
+        "ref": "48.2",
         "repo": "gnome-shell",
-        "type": "gitlab"
+        "type": "github"
       }
     },
     "home-manager": {
@@ -242,11 +287,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764998300,
+        "lastModified": 1751513147,
-        "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=",
+        "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",
+        "rev": "426b405d979d893832549b95f23c13537c65d244",
         "type": "github"
       },
       "original": {
@@ -259,14 +304,16 @@
       "inputs": {
         "nix": "nix",
         "nix-eval-jobs": "nix-eval-jobs",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1764967565,
+        "lastModified": 1748756240,
-        "narHash": "sha256-abU6ikAK96VFhqkyBBMpoCQedyVbXSObn5aPq+s/wr0=",
+        "narHash": "sha256-hiplweg3818WiWqnTCEXW0xKhzLUmJaAK2SPJXSkOEU=",
         "ref": "add-gitea-pulls",
-        "rev": "7123dd8981bc1dfadbea009441c5e7d3ad770578",
+        "rev": "ae8c1554cb8aec9772cb25ec5c7a3b7a1cf11f34",
-        "revCount": 4450,
+        "revCount": 4379,
         "type": "git",
         "url": "https://nayeonie.com/ahuston-0/hydra"
       },
@@ -283,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765113580,
+        "lastModified": 1750372088,
-        "narHash": "sha256-b8YOwGDFprkQJjXsKGuSNS1pWe8w4cUW36YxlUelNpU=",
+        "narHash": "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "db18f83bebbc2cf43a21dbb26cd99aabe672d923",
+        "rev": "189f32f56285aae9646bf1292976392beba5a2e2",
         "type": "github"
       },
       "original": {
@@ -299,16 +346,16 @@
     "nix": {
       "flake": false,
       "locked": {
-        "lastModified": 1760573252,
+        "lastModified": 1748154947,
-        "narHash": "sha256-mcvNeNdJP5R7huOc8Neg0qZESx/0DMg8Fq6lsdx0x8U=",
+        "narHash": "sha256-rCpANMHFIlafta6J/G0ILRd+WNSnzv/lzi40Y8f1AR8=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "3c39583e5512729f9c5a44c3b03b6467a2acd963",
+        "rev": "d761dad79c79af17aa476a29749bd9d69747548f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "2.32-maintenance",
+        "ref": "2.29-maintenance",
         "repo": "nix",
         "type": "github"
       }
@@ -316,16 +363,15 @@
     "nix-eval-jobs": {
       "flake": false,
       "locked": {
-        "lastModified": 1760478325,
+        "lastModified": 1748211873,
-        "narHash": "sha256-hA+NOH8KDcsuvH7vJqSwk74PyZP3MtvI/l+CggZcnTc=",
+        "narHash": "sha256-AJ22q6yWc1hPkqssXMxQqD6QUeJ6hbx52xWHhKsmuP0=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "daa42f9e9c84aeff1e325dd50fda321f53dfd02c",
+        "rev": "d9262e535e35454daebcebd434bdb9c1486bb998",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "v2.32.1",
         "repo": "nix-eval-jobs",
         "type": "github"
       }
@@ -337,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765080594,
+        "lastModified": 1751170039,
-        "narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=",
+        "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754",
+        "rev": "9c932ae632d6b5150515e5749b198c175d8565db",
         "type": "github"
       },
       "original": {
@@ -381,11 +427,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751591814,
+        "lastModified": 1751281697,
-        "narHash": "sha256-A4lgvuj4v+Pr8MniXz1FBG0DXOygi8tTECR+j53FMhM=",
+        "narHash": "sha256-abHhTXGEGYhCKOc9vQbqHFG7dxwJ6AudIy1h4MUsjm0=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "fef2d0c78c4e4d6c600a88795af193131ff51bdc",
+        "rev": "78b86e37713a1111d9e37c62b242d60be3013bd1",
         "type": "github"
       },
       "original": {
@@ -402,11 +448,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764234087,
+        "lastModified": 1747663185,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
         "type": "github"
       },
       "original": {
@@ -417,11 +463,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764440730,
+        "lastModified": 1751432711,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
         "type": "github"
       },
       "original": {
@@ -440,42 +486,42 @@
         ]
       },
       "locked": {
-        "lastModified": 1764726320,
+        "lastModified": 1751469444,
-        "narHash": "sha256-0AD/V/uCDG15xZSkQayaKjn/4Rlvoilwa+PsoSaubco=",
+        "narHash": "sha256-L5vPflQCt7WWzL66cA0ZbITfg+vzrSf6Ak5m4s6vDds=",
-        "owner": "NuschtOS",
+        "owner": "SuperSandro2000",
         "repo": "nixos-modules",
-        "rev": "1e03233c1b662f91c5ff8c7dba1a0a693a930e51",
+        "rev": "ed24075c9b4d1cedac253f31aaa2d4729d4fdf53",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "owner": "SuperSandro2000",
         "repo": "nixos-modules",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765053261,
+        "lastModified": 1751529439,
-        "narHash": "sha256-CBVtkpfM7pMgXuXvByXn53p5lSm7fiDZK4EGOMnhaoo=",
+        "narHash": "sha256-fn4qiux6lOX2MEB5VU/KFUhjc4HuQON2SexwJnC1ibc=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "60a511057b110094129bdfb99f343548b59f0aba",
+        "rev": "f596e2141c241f5cca21188543cd4dcda32f2c3c",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-25.11-small",
+        "ref": "nixos-unstable-small",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1761765539,
+        "lastModified": 1751159883,
-        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
+        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
+        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
         "type": "github"
       },
       "original": {
@@ -500,22 +546,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1764950072,
-        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f61125a668a320878494449750330ca58b78c557",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -525,14 +555,15 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1764773531,
+        "lastModified": 1748730660,
-        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
+        "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
+        "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
         "type": "github"
       },
       "original": {
@@ -552,11 +583,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765016596,
+        "lastModified": 1750779888,
-        "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
         "type": "github"
       },
       "original": {
@@ -579,7 +610,7 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixos-modules": "nixos-modules",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "pre-commit-hooks": "pre-commit-hooks",
         "rust-overlay": "rust-overlay",
@@ -596,11 +627,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765075567,
+        "lastModified": 1751510438,
-        "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=",
+        "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f",
+        "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b",
         "type": "github"
       },
       "original": {
@@ -616,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765079830,
+        "lastModified": 1750119275,
-        "narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=",
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "aeb517262102f13683d7a191c7e496b34df8d24c",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
         "type": "github"
       },
       "original": {
@@ -636,8 +667,15 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "flake-parts": "flake-parts_2",
+        "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -650,11 +688,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1765047449,
+        "lastModified": 1751498047,
-        "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=",
+        "narHash": "sha256-2T/VKbqqp4KTz3szFl58AaI+LBg9ctLjnP1IQA8sPg8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a",
+        "rev": "d21cfb364a78ad72935625e79b8c5d497f0b7616",
         "type": "github"
       },
       "original": {
@@ -729,11 +767,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1763914658,
+        "lastModified": 1748180480,
-        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
+        "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
+        "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
         "type": "github"
       },
       "original": {
@@ -745,11 +783,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1764465359,
+        "lastModified": 1748740859,
-        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
+        "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
+        "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
         "type": "github"
       },
       "original": {
@@ -761,11 +799,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1764464512,
+        "lastModified": 1725758778,
-        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
+        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
+        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
         "type": "github"
       },
       "original": {
@@ -774,6 +812,28 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "wired-notify": {
       "inputs": {
         "flake-parts": [
@@ -787,11 +847,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759739742,
+        "lastModified": 1743305055,
-        "narHash": "sha256-nTNmgO71tD3jJGpr9yIS1atOBJp8K1pwZOxnEdS+aAk=",
+        "narHash": "sha256-NIsi8Dno9YsOLUUTrLU4p+hxYeJr3Vkg1gIpQKVTaDs=",
         "owner": "Toqozz",
         "repo": "wired-notify",
-        "rev": "6a96aa2066d8ad945f2323b63dc217081ef51168",
+        "rev": "75d43f54a02b15f2a15f5c1a0e1c7d15100067a6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -31,8 +31,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     #nixpkgs.url = "github:nuschtos/nuschtpkgs/nixos-unstable";
-    #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     #nixpkgs.url = "github:nixos/nixpkgs/1d2fe0135f360c970aee1d57a53f816f3c9bddae?narHash=sha256-Up7YlXIupmT7fEtC4Oj676M91INg0HAoamiswAsA3rc%3D";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     systems.url = "github:nix-systems/default";
@@ -58,7 +57,7 @@
     hydra = {
       url = "git+https://nayeonie.com/ahuston-0/hydra?ref=add-gitea-pulls";
       inputs = {
-        #nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs";
       };
     };
 
@@ -67,14 +66,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    #lix-module = {
-    #  url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
-    #  inputs = {
-    #    nixpkgs.follows = "nixpkgs";
-    #    flake-utils.follows = "flake-utils";
-    #  };
-    #};
-
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -96,7 +87,7 @@
     };
 
     nixos-modules = {
-      url = "github:NuschtOS/nixos-modules";
+      url = "github:SuperSandro2000/nixos-modules";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -128,6 +119,8 @@
     stylix = {
       url = "github:danth/stylix";
       inputs = {
+        flake-compat.follows = "flake-compat";
+        home-manager.follows = "home-manager";
         nixpkgs.follows = "nixpkgs";
       };
     };
@@ -174,29 +167,6 @@
       formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
 
       nixosConfigurations = genSystems inputs outputs src (src + "/systems");
-      homeConfigurations = {
-        "alice" = inputs.home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs { system = "x86_64-linux"; };
-          modules = [
-            inputs.stylix.homeModules.stylix
-            inputs.sops-nix.homeManagerModules.sops
-            inputs.nix-index-database.homeModules.nix-index
-            {
-              nixpkgs.config = {
-                allowUnfree = true;
-                allowUnfreePredicate = _: true;
-              };
-            }
-            ./users/alice/home.nix
-          ];
-          extraSpecialArgs = {
-            inherit inputs outputs;
-            machineConfig = {
-              server = false;
-            };
-          };
-        };
-      };
       images = {
         install-iso = getImages nixosConfigurations "install-iso";
         iso = getImages nixosConfigurations "iso";

hydra/jobs.nix

@@ -10,9 +10,6 @@ let
   getCfg = _: cfg: cfg.config.system.build.toplevel;
   hostToAgg = _: cfg: cfg;
 
-  getHome = _: cfg: cfg.config.home.activationPackage;
-  homeToAgg = _: cfg: cfg;
-
   # get per-system check derivation (with optional postfix)
   mapSystems =
     {
@@ -25,16 +22,11 @@ rec {
   inherit (outputs) formatter devShells checks;
 
   host = lib.mapAttrs getCfg outputs.nixosConfigurations;
-  home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage
 
   hosts = pkgs.releaseTools.aggregate {
     name = "hosts";
     constituents = lib.mapAttrsToList hostToAgg host;
   };
-  homes = pkgs.releaseTools.aggregate {
-    name = "homes";
-    constituents = lib.mapAttrsToList homeToAgg home;
-  };
 
   devChecks = pkgs.releaseTools.aggregate {
     name = "devChecks";

lib/systems.nix

@@ -156,7 +156,6 @@ rec {
       modules ? [ ],
       server ? true,
       sops ? true,
-      lix ? false,
       system ? "x86_64-linux",
     }@args:
     lib.nixosSystem {
@@ -169,20 +168,19 @@ rec {
           system
           ;
       };
-      modules = [
+      modules =
-        inputs.nixos-modules.nixosModule
+        [
-        inputs.nix-index-database.nixosModules.nix-index
+          inputs.nixos-modules.nixosModule
-        (genHostName hostname)
+          (genHostName hostname)
-        (configPath + "/hardware.nix")
+          (configPath + "/hardware.nix")
-        (configPath + "/configuration.nix")
+          (configPath + "/configuration.nix")
-      ]
+        ]
-      ++ modules
+        ++ modules
-      ++ (lib.adev.fileList (src + "/modules"))
+        ++ (lib.adev.fileList (src + "/modules"))
-      ++ genWrapper sops genSops args
+        ++ genWrapper sops genSops args
-      ++ genWrapper home genHome args
+        ++ genWrapper home genHome args
-      ++ genWrapper true genUsers args
+        ++ genWrapper true genUsers args
-      #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args
+        ++ genWrapper (system != "x86_64-linux") genNonX86 args;
-      ++ genWrapper (system != "x86_64-linux") genNonX86 args;
     };
 
   # a convenience function for automatically generating NixOS systems by reading a directory via constructSystem

modules/autopull.nix

@@ -59,12 +59,11 @@ in
       repos = lib.filterAttrs (_: { enable, ... }: enable) cfg.repo;
     in
     lib.mkIf cfg.enable {
-      environment.systemPackages = [
+      environment.systemPackages =
-        pkgs.git
+        [ pkgs.git ]
-      ]
+        ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
-      ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
+          pkgs.openssh
-        pkgs.openssh
+        ];
-      ];
 
       systemd.services = lib.mapAttrs' (
         _:

modules/boot.nix

@@ -35,11 +35,10 @@ in
   config.boot = lib.mkIf cfg.default {
     supportedFilesystems = [ cfg.filesystem ];
     tmp.useTmpfs = true;
-    kernelParams = [
+    kernelParams =
-      "nordrand"
+      [ "nordrand" ]
-    ]
+      ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
-    ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
+      ++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
-    ++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
     initrd = {
       kernelModules = lib.mkIf cfg.amdGPU [ "amdgpu" ];
       network = lib.mkIf cfg.fullDiskEncryption {

modules/nix.nix

@@ -1,15 +1,12 @@
 { lib, pkgs, ... }:
 {
   nix = {
-    #package = pkgs.nixVersions.latest;
+    package = pkgs.nixVersions.latest;
     diffSystem = true;
     settings = {
       experimental-features = [
         "nix-command"
         "flakes"
-        "blake3-hashes"
-        "git-hashing"
-        "verified-fetches"
       ];
       keep-outputs = true;
       builders-use-substitutes = true;

systems/artemision/configuration.nix

@@ -42,8 +42,7 @@
   services = {
     flatpak.enable = true;
     calibre-web = {
-      # temp disable this
+      enable = true;
-      enable = false;
       listen = {
         ip = "127.0.0.1";
       };

systems/artemision/default.nix

@@ -3,7 +3,6 @@
   system = "x86_64-linux";
   home = true;
   sops = true;
-  lix = true;
   server = false;
   users = [ "alice" ];
   modules = [

systems/artemision/graphics.nix

@@ -6,10 +6,13 @@
     enable = true;
     enable32Bit = true;
 
+    ## amdvlk: an open-source Vulkan driver from AMD
     extraPackages = with pkgs; [
+      amdvlk
       rocmPackages.clr.icd
     ];
     extraPackages32 = with pkgs; [
+      driversi686Linux.amdvlk
       rocmPackages.clr.icd
     ];
   };

systems/artemision/libvirt.nix

@@ -12,6 +12,15 @@
       package = pkgs.qemu_kvm;
       runAsRoot = true;
       swtpm.enable = true;
+      ovmf = {
+        enable = true;
+        packages = [
+          (pkgs.OVMF.override {
+            secureBoot = true;
+            tpmSupport = true;
+          }).fd
+        ];
+      };
     };
   };
   users.users.alice = {

systems/artemision/programs.nix

@@ -53,6 +53,7 @@
     # nbt explorer?
     ncdu
     nemo-with-extensions
+    neofetch
     neovim
     nix-init
     nix-output-monitor
@@ -75,7 +76,7 @@
     restic
     ripgrep
     rpi-imager
-    rofi
+    rofi-wayland
     samba
     signal-desktop
     # signal in tray?

systems/palatine-hill/attic/default.nix

@@ -10,6 +10,10 @@
     attic-client
   ];
 
+  systemd.services.atticd.environment = {
+    RUST_LOG = "INFO";
+  };
+
   services = {
     atticd = {
       enable = true;
@@ -67,9 +71,6 @@
   # configured default webstore for this on root user separately
   systemd = {
     services = {
-      atticd.environment = {
-        RUST_LOG = "INFO";
-      };
       attic-watch-store = {
         wantedBy = [ "multi-user.target" ];
         after = [

systems/palatine-hill/configuration.nix

@@ -49,11 +49,11 @@
       enable = true;
       extraPackages = with pkgs; [
         intel-media-driver # LIBVA_DRIVER_NAME=iHD
-        intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+        vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-        libva-vdpau-driver
+        vaapiVdpau
         libvdpau-va-gl
         intel-compute-runtime
-        vpl-gpu-rt # replaces intel-media-sdk
+        intel-media-sdk
       ];
     };
   };

systems/palatine-hill/docker/act-runner.nix

@@ -11,7 +11,7 @@ in
 {
   virtualisation.oci-containers.containers = {
     act-stable-latest-main = {
-      image = "gitea/act_runner:nightly";
+      image = "gitea/act_runner:latest";
       pull = "always";
       extraOptions = [
         "--stop-signal=SIGINT"
@@ -35,7 +35,7 @@ in
     };
 
     act-stable-latest-1 = {
-      image = "gitea/act_runner:nightly";
+      image = "gitea/act_runner:latest";
       pull = "always";
       extraOptions = [
         "--stop-signal=SIGINT"
@@ -58,7 +58,7 @@ in
     };
 
     act-stable-latest-2 = {
-      image = "gitea/act_runner:nightly";
+      image = "gitea/act_runner:latest";
       pull = "always";
       extraOptions = [
         "--stop-signal=SIGINT"

systems/palatine-hill/docker/act_config.yaml

@@ -38,19 +38,19 @@ runner:
         - "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
         - "ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04"
         - "ubuntu-20.04:docker://gitea/runner-images:ubuntu-20.04"
-cache:
+        #cache:
     # Enable cache server to use actions/cache.
-    enabled: true
+    #enabled: true
     # The directory to store the cache data.
     # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
     #dir: ""
     # The host of the cache server.
     # It's not for the address to listen, but the address to connect from job containers.
     # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
-    host: "192.168.76.2"
+    #host: ""
     # The port of the cache server.
     # 0 means to use a random available port.
-    port: 8088
+    #port: 0
     # The external cache server URL. Valid only when enable is true.
     # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
     # The URL should generally end with "/".

systems/palatine-hill/docker/arr.nix

@@ -76,6 +76,20 @@ in
       ];
       autoStart = true;
     };
+    readarr = {
+      image = "ghcr.io/linuxserver/readarr:latest";
+      ports = [ "8787:8787" ];
+      environment = {
+        PUID = "600";
+        PGID = "100";
+        TZ = "America/New_York";
+      };
+      volumes = [
+        "${vars.primary_docker}/readarr:/config"
+        "${vars.primary_plex_storage}/data:/data"
+      ];
+      autoStart = true;
+    };
     unpackerr = {
       image = "golift/unpackerr:latest";
       user = "600:100";
@@ -88,22 +102,9 @@ in
       ];
       autoStart = true;
     };
-    notifiarr = {
+
-      image = "golift/notifiarr:latest";
-      ports = [ "5454:5454" ];
-      user = "600:100";
-      environment = {
-        TZ = "America/New_York";
-      };
-      environmentFiles = [ config.sops.secrets."docker/notifiarr".path ];
-      volumes = [
-        "${vars.primary_docker}/notifiarr:/config"
-        "${vars.primary_plex_storage}:/data"
-      ];
-      autoStart = true;
-    };
     overseerr = {
-      image = "fallenbagel/jellyseerr:preview-seerr";
+      image = "lscr.io/linuxserver/overseerr";
       environment = {
         PUID = "600";
         PGID = "100";
@@ -120,10 +121,4 @@ in
       autoStart = true;
     };
   };
-
-  sops = {
-    secrets = {
-      "docker/notifiarr".owner = "docker-service";
-    };
-  };
 }

systems/palatine-hill/docker/minecraft.nix

@@ -9,7 +9,6 @@ let
     divinejourney = "dj.alicehuston.xyz";
     rlcraft = "rlcraft.alicehuston.xyz";
     arcanum-institute = "arcanum.alicehuston.xyz";
-    meits = "meits.alicehuston.xyz";
     # bcg-plus = "bcg.alicehuston.xyz";
   };
 

systems/palatine-hill/docker/restic.nix

@@ -10,7 +10,7 @@ in
       image = "restic/rest-server:latest";
       volumes = [ "${restic_path}:/data" ];
       environment = {
-        OPTIONS = "--prometheus --private-repos --htpasswd-file /data/.htpasswd";
+        OPTIONS = "--prometheus --htpasswd-file /data/.htpasswd";
       };
       ports = [ "8010:8000" ];
       extraOptions = [

systems/palatine-hill/hydra.nix

@@ -42,12 +42,7 @@ in
   services = {
     hydra = {
       enable = true;
-      package = inputs.hydra.packages.x86_64-linux.hydra.overrideAttrs (old: {
+      package = inputs.hydra.packages.x86_64-linux.hydra;
-        preCheck = ''
-          export YATH_JOB_COUNT=8
-          ${old.preCheck or ""}
-        '';
-      });
       hydraURL = "https://hydra.alicehuston.xyz";
       smtpHost = "alicehuston.xyz";
       notificationSender = "hydra@alicehuston.xyz";

systems/palatine-hill/postgresql.nix

@@ -20,8 +20,7 @@ in
       enableJIT = true;
       package = pkgs.postgresql_16;
       configurePgStatStatements = true;
-      #enableAllPreloadedLibraries = true;
+      enableAllPreloadedLibraries = true;
-      installAllAvailableExtensions = true;
       #preloadAllExtensions = true;
       identMap = ''
         # ArbitraryMapName systemUser DBUser

systems/palatine-hill/secrets.yaml

@@ -25,7 +25,6 @@ docker:
     collabora: ENC[AES256_GCM,data:LPRkzPEv5qfzeWSDbf+L+0asfmiK5Mhj8jCdfVyvVQAaD75Cbo4qLD0Nc80z,iv:/l2vAyYYJChhv6T+JkHT4I74ZpdhvbVqxlDWIM4Y4bw=,tag:/+uzn1vtd1RnO9/lGiQAKA==,type:str]
     delugevpn: ENC[AES256_GCM,data:YGkgaQUuA9oteKD77tnFzxZSHctyOQjMNlfvJr3mPWAl2P8wfcshiUoa6SNp69pagxbzRV6mfuzwzinbkQCoZN3lw7uF76y0,iv:Bro0H4tFR+3wi9DGGq9a6ge4o4uPlVXBUF7h17zyqg8=,tag:N1kVNFasqGMx8R9qTq2dJA==,type:str]
     protonvpn-start-script: ENC[AES256_GCM,data:ZnlDpCLdILHXSUCI6itWkqO4y75Lwjj7qT1DBkfueLneQOaQ0JhuE2FbOOajkmI046nP9fMrJbu3g4QZHsq1g8yqGU1wb0OOT+eS9+M92Md29B4NnUdwnVAO6/RzvRKXP2tsQ4iprx9An+BEFwZYD6WG6DQc6NjJVSgRcYvfH9rQey2VdwLysNsgFCs8eC6QgikqBpeg4eOIvDDNbdXPKkW+ZPph9xpzGkcFIMwlX5esg0n7qyUoMvWwBn4avC46U5erOw0fNajY60ri9sm5Afht6LZrFal71Hx/K9/5EXBp9dD4teLO2Ew0CQX0i94pKCuR207l9868s7Ao3udLp4wbiLnXoRKq+w==,iv:qR0kNYpb50NXEqSksvHBPAaRG51RKCsSwTq32nosxzo=,tag:+xRQyuWi4Ja/N9lcd11oJA==,type:str]
-    notifiarr: ENC[AES256_GCM,data:XxVEhp4Rei6mRcdSSooRnofuVNZDalVhDYiVUmvQUr8QihrVRMKRE9Kpl5PGWUBw,iv:urMLaUf3XUjMks2vk0E7iRUU3mLHBiMAiwtQgmWQq20=,tag:dHdTOyC/ukd71UlYEI5fWw==,type:str]
 acme:
     bunny: ENC[AES256_GCM,data:P2yROVUga9mORcq8VR/l0i4/2Vod1zvlYq+ZJLLNKow0SpblkwQX/i1ucQYAOkTTRddN+3C+t0zj1rMWkdLoaLjEUJJi3VsSxi+chV2FFiVKFQGEcg24,iv:aQvGgGLsgRGoEmwTgZHR8Jm/MYxmGtVTT/fZKaTLeMs=,tag:m3ssF4O8qs4yxvMu6yUcjw==,type:str]
     dnsimple: ENC[AES256_GCM,data:37FKyBibFtXZgI4EduJQ0z8F+shBc5Q6YlLa3YkVPh9XuJVS20eybi75bfJxiozcZ9d+YRaqcbkBQCSdFOCotDU=,iv:oq3JjqbfAm2C4jcL1lvUb2EOmnwlR07vPoO8H0BmydQ=,tag:E3NO/jMElL6Q817666gIyg==,type:str]
@@ -44,8 +43,8 @@ sops:
             cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
             LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-08T03:05:16Z"
+    lastmodified: "2025-06-01T23:54:50Z"
-    mac: ENC[AES256_GCM,data:gIw//fnDU/lE2rDP4890MjnQ2xp0I4fXwvSWrLC0kFjW1RMLzNCaRLlJzw5/khALH/IZgTrnRqTHF3zHZd+mlyqvC/vzkyBBVdWRRX6w5l9JhFDfe83r86tvsV9G/AOeRchDp1gGuBBNkRamSuCOj7QFc1l334e/jNdKDadhwgI=,iv:nrOQxvJBce5/NDvpowJX/AiIssQdNOStvjj/Lkutppk=,tag:MlRJxbG3laajsi5KHAxy5g==,type:str]
+    mac: ENC[AES256_GCM,data:xBSrKfuBEXYVqLhZF903HbLaCpgXyuo3r7/FUBPM9Pl+rKUGx8p7LKCIec2NPCGO8ylQvC8T2mochSHSAvN339nxPlQ7f/tKWc6QgicaX4Sb4k0wJdqamSJTq4mkg8482HOUiFCSi3lA3zWC3Y9ZixESmEWTbxe9sQ51Vo69lkw=,iv:XiGVzryZwo5UmJe7I8pkg5IEdms0vR9iRdlFu2wjUeI=,tag:jhOuV+aZd5rQF0xg+0tvOg==,type:str]
     pgp:
         - created_at: "2024-11-28T18:56:39Z"
           enc: |-
@@ -60,4 +59,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
     unencrypted_suffix: _unencrypted
-    version: 3.11.0
+    version: 3.10.2

systems/selinunte/programs.nix

@@ -52,6 +52,7 @@
     # nbt explorer?
     ncdu
     nemo-with-extensions
+    neofetch
     neovim
     nix-init
     nix-output-monitor
@@ -74,7 +75,7 @@
     restic
     ripgrep
     rpi-imager
-    rofi
+    rofi-wayland
     samba
     signal-desktop
     # signal in tray?

users/alice/home.nix

@@ -7,17 +7,18 @@
 }:
 
 {
-  imports = [
+  imports =
-    ./home/zsh.nix
+    [
-    ./home/git.nix
+      ./home/zsh.nix
-  ]
+      ./home/git.nix
-  ++ lib.optionals (!machineConfig.server) [
+    ]
-    ./home/gammastep.nix
+    ++ lib.optionals (!machineConfig.server) [
-    ./home/doom
+      ./home/gammastep.nix
-    ./home/hypr
+      ./home/doom
-    ./home/waybar.nix
+      ./home/hypr
-    ./non-server.nix
+      ./home/waybar.nix
-  ];
+      ./non-server.nix
+    ];
 
   home = {
     # # Adds the 'hello' command to your environment. It prints a friendly
@@ -54,6 +55,7 @@
       file
       sqlite
       ncdu
+      neofetch
       onefetch
       hyfetch
       smartmontools
@@ -74,7 +76,6 @@
       nix-prefetch
       nix-tree
       nh
-      home-manager
 
       # doom emacs dependencies
       fd
@@ -147,9 +148,6 @@
         };
       };
     };
-    fastfetch = {
-      enable = true;
-    };
   };
 
   services.ssh-agent.enable = true;
@@ -178,7 +176,7 @@
 
   nix.gc = {
     automatic = true;
-    dates = "weekly";
+    frequency = "weekly";
     options = "--delete-older-than 30d";
   };
 

users/alice/home/git.nix

@@ -8,7 +8,22 @@
       key = "5EFFB75F7C9B74EAA5C4637547940175096C1330";
       signByDefault = true;
     };
-    settings = {
+    userEmail = "aliceghuston@gmail.com";
+    userName = "ahuston-0";
+    aliases = {
+      gone = ''
+        !git for-each-ref --format '%(refname:short) %(upstream)' | # dump all older branches
+                        awk 'NF < 2 {print $1}' | # get nuked branches
+                        grep -Pv "(^origin/|^origin$|stash)" | # filter out remotes & stash
+                        sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons
+                        xargs -r git branch -D # nuke the branches
+        # !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches
+        #                 awk '$2 == "[gone]" {print $1}' | # get nuked branches
+        #                 sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons
+        #                 xargs -r git branch -D; # nuke the branches #
+      '';
+    };
+    extraConfig = {
       push.autosetupremote = true;
       pull.rebase = true;
       color.ui = true;
@@ -16,21 +31,6 @@
       format.signoff = true;
       pack.windowMemory = "2g";
       pack.packSizeLimit = "1g";
-      user.email = "aliceghuston@gmail.com";
-      user.name = "ahuston-0";
-      alias = {
-        gone = ''
-          		!git for-each-ref --format '%(refname:short) %(upstream)' | # dump all older branches
-          						awk 'NF < 2 {print $1}' | # get nuked branches
-          						grep -Pv "(^origin/|^origin$|stash)" | # filter out remotes & stash
-          						sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons
-          						xargs -r git branch -D # nuke the branches
-          		# !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches
-          		#                 awk '$2 == "[gone]" {print $1}' | # get nuked branches
-          		#                 sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons
-          		#                 xargs -r git branch -D; # nuke the branches #
-          	'';
-      };
     };
   };
 }

users/alice/home/zsh.nix

@@ -72,7 +72,7 @@
       "sgc" = "sudo git -C /root/dotfiles";
       ## SSH
       "ssh-init" =
-        "ssh-add -t 2h  ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails  ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh ~/.ssh/id_ed25519";
+        "ssh-add -t 2h  ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails  ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh";
 
       ## Backups
       "borgmatic-backup-quick" =
@@ -118,8 +118,6 @@
       "octave" = "prime-run octave --gui";
       "pc-firefox" = "proxychains firefox -P qbit -no-remote -P 127.0.0.1:9050";
       "hx" = "helix";
-      "dungeondraft-arch" = "/opt/Dungeondraft/Dungeondraft.x86_64";
-      "wonderdraft-arch" = "/opt/wonderdraft/Wonderdraft.x86_64";
     };
   };
 }

users/alice/non-server.nix

@@ -83,7 +83,7 @@
     rust-analyzer
     clang
     clang-tools
-    wakatime-cli
+    wakatime
     enchant
     nuspell
     hunspellDicts.en-us
@@ -105,8 +105,5 @@
     obsidian
     libreoffice-qt-fresh
     wlr-randr
-
-    # media tools
-    #deepin.deepin-music
   ];
 }