feat: use hypridle and hyprlock

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725199881,
+        "lastModified": 1731959031,
-        "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
+        "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
+        "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
         "type": "github"
       },
       "original": {
@@ -34,18 +34,12 @@
       }
     },
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "helix",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1709610799,
+        "lastModified": 1727974419,
-        "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
+        "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "81c393c776d5379c030607866afef6406ca1be57",
+        "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f",
         "type": "github"
       },
       "original": {
@@ -61,11 +55,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725377834,
+        "lastModified": 1732988076,
-        "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=",
+        "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe",
+        "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1",
         "type": "github"
       },
       "original": {
@@ -107,16 +101,32 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "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-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1709126324,
+        "lastModified": 1726560853,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -130,11 +140,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1726560853,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -170,11 +180,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1725513492,
+        "lastModified": 1732021966,
-        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -185,13 +195,13 @@
     },
     "git-hooks_2": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
-        "gitignore": "gitignore_2",
+        "gitignore": "gitignore_3",
         "nixpkgs": [
           "slippi",
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
         "lastModified": 1721042469,
@@ -229,6 +239,28 @@
       }
     },
     "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-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"
+      }
+    },
+    "gitignore_3": {
       "inputs": {
         "nixpkgs": [
           "slippi",
@@ -252,11 +284,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1725885300,
+        "lastModified": 1733139194,
-        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
+        "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
+        "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88",
         "type": "github"
       },
       "original": {
@@ -290,11 +322,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1725976743,
+        "lastModified": 1733164621,
-        "narHash": "sha256-pLQQbiC9uO4lF58fAnlcDxlbsBB1XFWswsU1oZOIVqU=",
+        "narHash": "sha256-AhYHB343nLY4bkm9yyOT9I7LIg799ouuIBWb31gORcA=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "237cbe4bca46eed52efed39ed75eb44aaccbdde3",
+        "rev": "c0bfdd7bfe8b5a3d13e7e8631eec2e8ea0b726a5",
         "type": "github"
       },
       "original": {
@@ -311,16 +343,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1725703823,
+        "lastModified": 1733050161,
-        "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=",
+        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
+        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -332,11 +364,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725948275,
+        "lastModified": 1733133928,
-        "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=",
+        "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe",
+        "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011",
         "type": "github"
       },
       "original": {
@@ -361,11 +393,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722623071,
+        "lastModified": 1728669738,
-        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
+        "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
+        "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
         "type": "github"
       },
       "original": {
@@ -378,19 +410,21 @@
       "inputs": {
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs_2",
+        "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1726132501,
+        "lastModified": 1733157082,
-        "narHash": "sha256-mFSCZCvUZJX51V7F2NA3uAj5iaCzsDWhBXMNDz0PhH0=",
+        "narHash": "sha256-rmJkUKyvaejRaQeEOpInjGjQv6rgFkm2uJ2iVlMEuOk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "73b9756b8d7ee06fc1c9f072f2a41f2dd1aeb2c9",
+        "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888",
         "type": "github"
       },
       "original": {
@@ -403,21 +437,19 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "xdph",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "xdph",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1721326555,
+        "lastModified": 1728345020,
-        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
+        "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
+        "rev": "a7c183800e74f337753de186522b9017a07a8cee",
         "type": "github"
       },
       "original": {
@@ -442,11 +474,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725188252,
+        "lastModified": 1728168612,
-        "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
+        "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
+        "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
         "type": "github"
       },
       "original": {
@@ -467,11 +499,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724966483,
+        "lastModified": 1732288281,
-        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
+        "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
+        "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
         "type": "github"
       },
       "original": {
@@ -492,11 +524,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721324119,
+        "lastModified": 1726874836,
-        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
+        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
+        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
         "type": "github"
       },
       "original": {
@@ -513,11 +545,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728974938,
+        "lastModified": 1732739177,
-        "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
+        "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "23170582b0658e6afd913149a58863af3a57b376",
+        "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75",
         "type": "github"
       },
       "original": {
@@ -568,11 +600,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690328911,
+        "lastModified": 1729697500,
-        "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
+        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
         "owner": "zhaofengli",
         "repo": "nix-github-actions",
-        "rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
+        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
         "type": "github"
       },
       "original": {
@@ -584,11 +616,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709479366,
+        "lastModified": 1728018373,
-        "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
@@ -600,11 +632,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720386169,
+        "lastModified": 1730741070,
-        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
         "type": "github"
       },
       "original": {
@@ -615,6 +647,22 @@
       }
     },
     "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_3": {
       "locked": {
         "lastModified": 1720386169,
         "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
@@ -632,11 +680,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1725910328,
+        "lastModified": 1733064805,
-        "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
+        "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
+        "rev": "31d66ae40417bb13765b0ad75dd200400e98de84",
         "type": "github"
       },
       "original": {
@@ -648,11 +696,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1725103162,
+        "lastModified": 1732758367,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
         "type": "github"
       },
       "original": {
@@ -664,20 +712,44 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1725826545,
+        "lastModified": 1732981179,
-        "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
+        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
+        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_2"
+      },
+      "locked": {
+        "lastModified": 1732021966,
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
@@ -698,21 +770,17 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "helix",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "helix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1709604635,
+        "lastModified": 1728268235,
-        "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
+        "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
+        "rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
         "type": "github"
       },
       "original": {
@@ -729,11 +797,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726280639,
+        "lastModified": 1729477859,
-        "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=",
+        "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e9f8641c92f26fd1e076e705edb12147c384171d",
+        "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
         "type": "github"
       },
       "original": {
@@ -753,11 +821,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725647475,
+        "lastModified": 1725994332,
-        "narHash": "sha256-1PaNuhxB+rhAcpBMwDZCUJpI7Lw0AJfzYot/S18hrXo=",
+        "narHash": "sha256-gla6TlSG6MIczpJ7xhXA66amcaJPAZ9lFHSUrLmR/QY=",
         "owner": "lytedev",
         "repo": "slippi-nix",
-        "rev": "10eb5d58b9d9c0da276d48d1c12898ea53c89d2a",
+        "rev": "68e971a57de45fb3f2081e837962f2c9b8c34240",
         "type": "github"
       },
       "original": {
@@ -770,17 +838,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs-unstable"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1725922448,
+        "lastModified": 1733128155,
-        "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=",
+        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "cede1a08039178ac12957733e97ab1006c6b6892",
+        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
         "type": "github"
       },
       "original": {
@@ -848,11 +913,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1727585736,
+        "lastModified": 1732918908,
-        "narHash": "sha256-vEkcyKdFpfWbrtZlB5DCjNCmI2GudIJuHstWo3F9gL8=",
+        "narHash": "sha256-k43oaC+35/LGqJ+3MjIhn4Ko+ap3wTvHCJ4sj9W/o+k=",
         "owner": "wez",
         "repo": "wezterm",
-        "rev": "a2f2c07a29f5c98f6736cde0c86b24887f9fd48a",
+        "rev": "4906789a6d61da58f73b95f89b59c41af60e0f3b",
         "type": "github"
       },
       "original": {
@@ -864,11 +929,22 @@
     },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
         "hyprlang": [
           "hyprland",
           "hyprlang"
         ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -879,11 +955,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725203932,
+        "lastModified": 1731703417,
-        "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
+        "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
+        "rev": "8070f36deec723de71e7557441acb17e478204d3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
     disko.url = "github:nix-community/disko/master";
@@ -8,12 +8,12 @@
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
+    # sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
 
     git-hooks.url = "github:cachix/git-hooks.nix";
     git-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     home-manager-unstable.url = "github:nix-community/home-manager";
@@ -89,7 +89,7 @@
     forSystems = nixpkgs.lib.genAttrs systems;
     pkgsFor = system: (import nixpkgs {inherit system;}).extend overlays.default;
     genPkgs = func: (forSystems (system: func (pkgsFor system)));
-    pkg = callee: overrides: genPkgs (pkgs: pkgs.callPackage callee overrides);
+    # pkg = callee: overrides: genPkgs (pkgs: pkgs.callPackage callee overrides);
 
     unstable = {
       forSystems = nixpkgs-unstable.lib.genAttrs systems;
@@ -183,7 +183,7 @@
             nodejs
             wget
             sudo
-            nixFlakes
+            nixVersions.stable
             cacert
             gnutar
             gzip
@@ -242,7 +242,24 @@
         I did try using the latest code via the flake, but alas it did not resolve my issues with mux'ing
         */
         wezterm = wezterm-input.outputs.packages.${prev.system}.default;
+        # wezterm = (import nixpkgs {inherit (prev) system;}).wezterm;
         final.wezterm = wezterm;
+
+        # zellij = prev.zellij.overrideAttrs rec {
+        #   version = "0.41.0";
+        #   src = prev.fetchFromGitHub {
+        #     owner = "zellij-org";
+        #     repo = "zellij";
+        #     rev = "v0.41.0";
+        #     hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do=";
+        #   };
+        #   cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const {
+        #     name = "zellij-vendor.tar.gz";
+        #     inherit src;
+        #     outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE=";
+        #   });
+        # };
+        # final.zellij = zellij;
       };
 
       unstable-packages = final: _prev: {
@@ -277,7 +294,6 @@
             hardware.nixosModules.common-cpu-intel
 
             outputs.nixosModules.deno-netlify-ddns-client
-
             {
               services.deno-netlify-ddns-client = {
                 enable = true;
@@ -320,11 +336,11 @@
           virtual-machines
           virtual-machines-gui
           music-production
+          # plasma6
           gaming
           slippi.nixosModules.default
 
           outputs.nixosModules.deno-netlify-ddns-client
-
           {
             services.deno-netlify-ddns-client = {
               enable = true;
@@ -445,6 +461,7 @@
           kde-connect
           password-manager
           graphical-workstation
+          # plasma6
           virtual-machines
           virtual-machines-gui
           laptop
@@ -480,7 +497,7 @@
                   # we use command -v $cmd here because we only want to invoke these calls _if_ the related package is installed on the system
                   # otherwise, they will likely have no effect anyways
                   text = ''
-                    command -v powerprofilesctl &>/dev/null && bash -x -c 'powerprofilesctl set performance'
+                    command -v powerprofilesctl &>/dev/null && bash -x -c 'powerprofilesctl set balanced'
                     command -v swaymsg &>/dev/null && bash -x -c 'swaymsg output eDP-1 mode 2880x1920@120Hz'
                   '';
                 })
@@ -507,6 +524,7 @@
           common
           password-manager
           graphical-workstation
+          plasma6
           music-production
           laptop
           gaming
@@ -577,6 +595,7 @@
           common
           password-manager
           graphical-workstation
+          plasma6
           laptop
           gaming
 
@@ -655,7 +674,6 @@
           troubleshooting-tools
 
           outputs.nixosModules.deno-netlify-ddns-client
-
           {
             services.deno-netlify-ddns-client = {
               enable = true;

modules/home-manager/eww/eww.scss

@@ -38,7 +38,7 @@ $rosewater: #f5e0dc;
   font-size: 12.0pt;
 }
 
-.sidestuff slider {
+.leftsidestuff slider {
   color: $sapphire;
 }
 
@@ -84,6 +84,7 @@ $rosewater: #f5e0dc;
 }
 
 .workspace {
+  /* height: 100%; */
   padding-left: 10px;
   padding-right: 10px;
   color: #666666;

modules/home-manager/eww/eww.yuck

@@ -1,8 +1,9 @@
 (defwidget bar []
   (centerbox :orientation "h"
-    (sidestuff)
+    (leftsidestuff)
     (box)
-    (music)))
+    (rightsidestuff)
+    ))
 
 (defwindow bar0
   :monitor 0
@@ -30,14 +31,16 @@
     :anchor "bottom center")
   (bar))
 
-(defwidget sidestuff []
+(defwidget rightsidestuff []
-  (box :class "sidestuff" :orientation "h" :space-evenly false :halign "start" :valign "center" :spacing 10
+  (box :class "rightsidestuff" :orientation "h" :space-evenly false :halign "end" :valign "center" :spacing 10
-    time
+    (music)
-    ; TODO: indicator/tray/taskbar/toolbar icons and management? (probably should use something standalone?)
+    (systray)
-    ; https://github.com/elkowar/eww/issues/111
+  ))
 
+(defwidget leftsidestuff []
+  (box :class "leftsidestuff" :orientation "h" :space-evenly false :halign "start" :valign "center" :spacing 10
+    time
     ; TODO: idle inhibitor?
-    ; TODO: hyprland workspaces?
     ; TODO: get these to align properly? icons seem lower than they should be?
     (box :class "mic" (
       box :class {micMuted == "false" ? "live" : "muted"} {micMuted == "false" ? " " : " "}
@@ -48,7 +51,7 @@
       ) {"${volume}%"}
     )
     {" ${round(EWW_CPU["avg"], 0)}%"}
-    {" ${round(EWW_RAM["used_mem_perc"], 0)}%"}
+    {" ${round(EWW_RAM["used_mem_perc"], 0)}%"}
     ; TODO: have these "widgets" be omitted entirely instead of just empty strings
     {(showBrightness == "true") ? (" ${brightness}%") : ""}
     {(showBattery == "true") ? ("󱊣 ${EWW_BATTERY["BAT1"]["capacity"]}% (${batteryTime})") : ""}

modules/home-manager/eww/scripts/hypr-workspaces.bash

@@ -63,7 +63,7 @@ workspaces
 # listen to events and re-render
 while true; do
   # TODO: not sure why this socat | read invocation seems to stop?
-  socat - "UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" | while read -r line; do
+  socat - "UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" | while read -r line; do
     workspaces "$line"
   done
 done

modules/home-manager/ewwbar.nix

@@ -1,6 +0,0 @@
-{...}: {
-  programs.eww = {
-    enable = true;
-    configDir = ./eww;
-  };
-}

modules/home-manager/fish/interactiveShellInit.fish

@@ -61,6 +61,9 @@ end
 function _last_cmd_duration
     set_color -b normal green
     set -q CMD_DURATION && printf " %dms" $CMD_DURATION
+    if test $CMD_DURATION -gt 5000
+        printf "\e]777;notify;%s;%s\e\\" "WezTerm: Command Finished" (history --max 1)
+    end
 end
 
 function _maybe_jobs_summary

modules/home-manager/hyprland.nix

@@ -1,24 +1,16 @@
 {
   pkgs,
-  colors,
+  style,
   config,
   lib,
   # font,
   ...
-}: {
+}: let
-  imports = [
+  inherit (style) colors;
-    ./ewwbar.nix
+in {
-    ./mako.nix
+  # TODO: Hyprland seems to sometimes use a ton of CPU?
-    ./swaylock.nix
-    # TODO: figure out how to import this for this module _and_ for the sway module?
-    ./linux-desktop.nix
-  ];
-
-  # TODO: Hyprland seems to have issues with resuming from hibernation on my
-  # laptop where it uses a ton of CPU.
 
   home.packages = with pkgs; [
-    # TODO: integrate osd
     swayosd
   ];
 
@@ -47,38 +39,12 @@
         "hyprpaper"
         "mako"
         "swayosd-server"
-        "eww daemon && eww open bar$EWW_BAR_MON"
+        "eww daemon"
-        "firefox"
+        "[workspace 1 silent] firefox"
-        "wezterm"
+        "[workspace 1 silent] wezterm"
         "xwaylandvideobridge"
-        "dbus-update-activation-environment --systemd --all"
         "systemctl --user import-environment QT_QPA_PLATFORMTHEME"
-        # "wezterm"
+        "hypridle"
-        # NOTE: maybe check out hypridle?
-        (lib.concatStringsSep " " [
-          "swayidle -w"
-          "timeout 300  'notify-send \"Idling in 300 seconds\"' resume 'notify-send \"Idling cancelled.\"'"
-          "timeout 480  'notify-send -u critical \"Idling in 120 seconds\"'"
-          "timeout 510  'notify-send -u critical \"Idling in 90 seconds\"'"
-          "timeout 540  'notify-send -u critical \"Idling in 60 seconds!\"'"
-          "timeout 570  'notify-send -u critical \"Idling in 30 seconds!\"'"
-          "timeout 590  'notify-send -u critical \"Idling in 10 seconds!\"'"
-          "timeout 591  'notify-send -u critical \"Idling in 9 seconds!\"'"
-          "timeout 592  'notify-send -u critical \"Idling in 8 seconds!\"'"
-          "timeout 593  'notify-send -u critical \"Idling in 7 seconds!\"'"
-          "timeout 594  'notify-send -u critical \"Idling in 6 seconds!\"'"
-          "timeout 595  'notify-send -u critical \"Idling in 5 seconds!\"'"
-          "timeout 596  'notify-send -u critical \"Idling in 4 seconds!\"'"
-          "timeout 597  'notify-send -u critical \"Idling in 3 seconds!\"'"
-          "timeout 598  'notify-send -u critical \"Idling in 2 seconds!\"'"
-          "timeout 599  'notify-send -u critical \"Idling in 1 second!\"'"
-          "timeout 600  'swaylock --daemonize'"
-          "timeout 600  'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'"
-          "after-resume       'maybe-good-morning'"
-          "before-sleep 'swaylock --daemonize'"
-        ])
-        ''swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on && maybe-good-morning' before-sleep 'swaylock -f'"''
-        "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
       ];
 
       env = [
@@ -97,8 +63,8 @@
 
         follow_mouse = 2;
 
-        repeat_delay = 200;
+        repeat_delay = 180;
-        repeat_rate = 60;
+        repeat_rate = 120;
 
         touchpad = {
           natural_scroll = "yes";
@@ -117,6 +83,10 @@
         allow_workspace_cycles = true;
       };
 
+      cursor = {
+        no_warps = true;
+      };
+
       general = {
         # See https://wiki.hyprland.org/Configuring/Variables/ for more
         "col.active_border" = "0xff${colors.primary} 0xff${colors.green} 45deg";
@@ -125,7 +95,6 @@
         gaps_in = 3;
         gaps_out = 6;
         border_size = 2;
-        no_cursor_warps = true;
         resize_on_border = true;
         no_focus_fallback = true;
 
@@ -133,7 +102,7 @@
       };
 
       decoration = {
-        rounding = 3;
+        rounding = 5;
 
         /*
         blur = "no";
@@ -142,10 +111,12 @@
         blur_new_optimizations = on
         */
 
-        drop_shadow = "yes";
+        shadow = {
-        shadow_range = 4;
+          enabled = true;
-        shadow_render_power = 3;
+          color = "rgba(1a1a1aee)";
-        "col.shadow" = "rgba(1a1a1aee)";
+          range = 4;
+          render_power = 3;
+        };
 
         dim_inactive = false;
       };
@@ -179,10 +150,10 @@
         "$mod, l, movefocus, r"
         "$mod, k, movefocus, u"
         "$mod, j, movefocus, d"
-        "$mod SHIFT, H, swapwindow, l"
+        "$mod SHIFT, H, movewindow, l"
-        "$mod SHIFT, L, swapwindow, r"
+        "$mod SHIFT, L, movewindow, r"
-        "$mod SHIFT, K, swapwindow, u"
+        "$mod SHIFT, K, movewindow, u"
-        "$mod SHIFT, J, swapwindow, d"
+        "$mod SHIFT, J, movewindow, d"
 
         "$mod SHIFT, V, exec, swayosd-client --input-volume mute-toggle"
         ", XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
@@ -228,10 +199,10 @@
         # Scroll through existing workspaces with mod + scroll
         "$mod, mouse_down, workspace, e+1"
         "$mod, mouse_up, workspace, e-1"
-        "CTRL SHIFT $mod, L, exec, swaylock"
+        "CTRL SHIFT $mod, L, exec, hyprlock"
         "$mod CTRL, space, exec, makoctl dismiss"
         "$mod SHIFT CTRL, space, exec, makoctl restore"
-        "$mod SHIFT, space, exec, makoctl invoke"
+        "$mod SHIFT, space, exec, makoctl invoke default"
         "$mod, E, exec, thunar"
       ];
 
@@ -259,12 +230,12 @@
         # master switch for pseudotiling. Enabling is bound to mod + P in the keybinds section below
         pseudotile = yes
         preserve_split = 1
-        no_gaps_when_only = true
+        # no_gaps_when_only = true
       }
 
       master {
         # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_is_master = true
+        # new_is_master = true
       }
 
       gestures {
@@ -280,14 +251,170 @@
 
       ## See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
       windowrulev2 = idleinhibit,class:^.*([Ss]lippi).*$
-      windowrulev2 = float,class:^.*([Kk]itty|[Ff]irefox|[Ww]ezterm|[Dd]iscord|[Ss]potify|[Ss]lack).*$
+      windowrulev2 = float,class:^.*$
-      windowrulev2 = opacity 1.0 0.9,floating:1
+      windowrulev2 = tile,class:^.*([Kk]itty|[Ff]irefox|[Ww]ezterm|[Dd]iscord|[Ss]potify|[Ss]lack).*$
+      windowrulev2 = opacity 1.0 0.95,class:^.*$
+      windowrulev2 = center 1,floating:1
 
-      windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
+      windowrulev2 = opacity 0.0 override, class:^(xwaylandvideobridge)$
       windowrulev2 = noanim, class:^(xwaylandvideobridge)$
       windowrulev2 = noinitialfocus, class:^(xwaylandvideobridge)$
       windowrulev2 = maxsize 1 1, class:^(xwaylandvideobridge)$
       windowrulev2 = noblur, class:^(xwaylandvideobridge)$
+      windowrulev2 = nofocus, class:^(xwaylandvideobridge)$
     '';
   };
+
+  programs.hyprlock = {
+    enable = true;
+    settings = {
+      # docs: https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
+
+      general = {
+        grace = 0;
+        no_face_out = true;
+      };
+
+      input-field = [
+        {
+          monitor = "";
+          fade_on_empty = false;
+          placeholder_text = "Locked";
+          rounding = 5;
+          font_size = 20;
+          font_color = "rgba(255, 255, 255, 1.0)";
+          inner_color = "rgba(31, 31, 47, 0.95)";
+          outer_color = "0xff74c7ec 0xff74c7ec 45deg";
+          outline_thickness = 3;
+          position = "0, -200";
+
+          dots_size = 0.1;
+          size = "300 75";
+          font_family = "IosevkaLyteTerm";
+
+          shadow_passes = 3;
+          shadow_size = 8;
+          shadow_color = "rgba(0, 0, 0, 1.0)";
+          shadow_boost = 0.8;
+        }
+      ];
+
+      background = [
+        {
+          path = "~/.wallpaper";
+          blur_passes = 2;
+        }
+      ];
+
+      label = [
+        {
+          monitor = "";
+          font_size = 64;
+
+          halign = "center";
+          valign = "center";
+          text_align = "center";
+
+          # rotate = 10;
+          position = "0, 200";
+          font_family = "IosevkaLyteTerm";
+          text = ''Locked for <span foreground="##74c7ec">$USER</span>'';
+
+          shadow_passes = 1;
+          shadow_size = 8;
+          shadow_color = "rgba(0, 0, 0, 1.0)";
+          shadow_boost = 0.5;
+        }
+
+        {
+          monitor = "";
+          font_size = 20;
+
+          halign = "center";
+          valign = "center";
+          text_align = "center";
+          color = "rgba(255, 255, 255, 0.5)";
+
+          position = "0 120";
+          font_family = "IosevkaLyteTerm";
+          text = "cmd[update:1000] date '+%a %b %d %H:%M:%S'";
+
+          shadow_passes = 3;
+          shadow_size = 1;
+          shadow_color = "rgba(0, 0, 0, 1.0)";
+          shadow_boost = 1.0;
+        }
+
+        {
+          monitor = "";
+          font_size = 200;
+
+          halign = "center";
+          valign = "center";
+          text_align = "center";
+          color = "rgba(220, 240, 255, 0.8)";
+          position = "0 500";
+          font_family = "NerdFontSymbolsOnly";
+          text = "󰍁";
+
+          shadow_passes = 3;
+          shadow_size = 1;
+          shadow_color = "rgba(0, 0, 0, 1.0)";
+          shadow_boost = 1.0;
+        }
+      ];
+    };
+  };
+
+  services.hypridle = let
+    secondsPerMinute = 60;
+    lockSeconds = 10 * secondsPerMinute;
+  in {
+    enable = true;
+    settings = {
+      general = {
+        after_sleep_cmd = "hyprctl dispatch dpms on";
+        before_sleep_cmd = "loginctl lock-session";
+        ignore_dbus_inhibit = false;
+        lock_cmd = "pidof hyprlock || hyprlock";
+      };
+
+      listener = [
+        {
+          timeout = lockSeconds - 300;
+          on-timeout = ''notify-send "Auto-locking in 5 minutes"'';
+          on-resume = ''notify-send "Auto-locking cancelled"'';
+        }
+        {
+          timeout = lockSeconds - 180;
+          on-timeout = ''notify-send "Auto-locking in 3 minutes"'';
+        }
+        {
+          timeout = lockSeconds - 120;
+          on-timeout = ''notify-send "Auto-locking in 2 minutes"'';
+        }
+        {
+          timeout = lockSeconds - 60;
+          on-timeout = ''notify-send "Auto-locking in 1 minute"'';
+        }
+        {
+          timeout = lockSeconds - 30;
+          on-timeout = ''notify-send "Auto-locking in 30 seconds"'';
+        }
+        {
+          timeout = lockSeconds - 10;
+          on-timeout = ''notify-send -u critical "Auto-locking in 10 seconds"'';
+        }
+        {
+          timeout = lockSeconds;
+          on-timeout = ''loginctl lock-session'';
+        }
+        {
+          timeout = lockSeconds + 5;
+          on-timeout = ''hyprctl dispatch dpms off'';
+          on-resume = ''hyprctl dispatch dpms on'';
+        }
+      ];
+    };
+  };
 }

modules/home-manager/sway.nix

@@ -2,7 +2,6 @@
   style,
   lib,
   config,
-  pkgs,
   ...
 }: {
   programs.foot = {
@@ -20,47 +19,6 @@
     };
   };
 
-  home.file."${config.xdg.configHome}/mako/config" = {
-    enable = true;
-    text = with style.colors.withHashPrefix; ''
-      border-size=1
-      max-visible=5
-      default-timeout=15000
-      font=Symbols Nerd Font ${toString style.font.size},${style.font.name} ${toString style.font.size}
-      anchor=top-right
-      on-notify=exec ${pkgs.mpv}/bin/mpv --volume=50 ~/.notify.wav
-
-      background-color=${bg}
-      text-color=${text}
-      border-color=${primary}
-      progress-color=${primary}
-
-      [urgency=high]
-      border-color=${urgent}
-
-      [urgency=high]
-      background-color=${urgent}
-      border-color=${urgent}
-      text-color=${bg}
-    '';
-  };
-
-  home.file."${config.xdg.configHome}/tofi/config" = {
-    enable = true;
-    text = ''
-      font = ${pkgs.iosevkaLyteTerm}/share/fonts/truetype/IosevkaLyteTerm-regular.ttf
-
-      text-color = #f8f8f8
-      prompt-color = #f38ba8
-      selection-color = #66d9ef
-      background-color = #1e1e2e
-      border-width = 4
-      border-color = #66d9ef
-
-      fuzzy-match = true
-    '';
-  };
-
   wayland.windowManager.sway = {
     /*
     TODO:

modules/home-manager/wezterm/config.lua

@@ -4,6 +4,7 @@ if wezterm.config_builder then
   config = wezterm.config_builder()
 end
 
+config.adjust_window_size_when_changing_font_size = false
 config.font = wezterm.font_with_fallback {
   { family = "IosevkaLyteTerm",        weight = 'Medium',  italic = false },
   { family = 'Symbols Nerd Font Mono', weight = 'Regular', italic = false },
@@ -21,8 +22,12 @@ config.tab_bar_at_bottom = true
 config.window_background_opacity = 1.0
 config.enable_kitty_keyboard = true
 config.show_new_tab_button_in_tab_bar = true
+config.notification_handling = "SuppressFromFocusedTab"
 
 -- config.front_end = "WebGpu"
+-- config.webgpu_power_preference = 'HighPerformance'
+config.enable_wayland = true
+-- config.use_ime = true
 
 local function tab_title(tab_info)
   local title = tab_info.tab_title

modules/nixos/default.nix

@@ -33,6 +33,12 @@
       package = flakeInputs.hyprland.packages.${pkgs.system}.hyprland;
     };
 
+    home-manager.users.daniel = {
+      imports = with homeManagerModules; [
+        hyprland
+      ];
+    };
+
     # TODO: include the home-manager modules for daniel?
   };
 
@@ -101,8 +107,6 @@
     environment = {
       variables = {
         VISUAL = "hx";
-        PAGER = "less";
-        MANPAGER = "less";
       };
 
       systemPackages = with pkgs; [
@@ -191,22 +195,9 @@
     };
   };
 
-  less-pager = {pkgs, ...}: {
-    environment = {
-      systemPackages = [
-        pkgs.less
-      ];
-      variables = {
-        PAGER = "less";
-        MANPAGER = "less";
-      };
-    };
-  };
-
   helix-text-editor = {pkgs, ...}: {
     environment = {
       systemPackages = [
-        pkgs.less
         helix.packages.${pkgs.system}.helix
       ];
       variables = {
@@ -246,16 +237,21 @@
 
   my-favorite-default-system-apps = {pkgs, ...}: {
     imports = with nixosModules; [
-      less-pager
       helix-text-editor
       zellij-multiplexer
       fish-shell
     ];
 
-    environment.systemPackages = with pkgs; [
+    environment = {
+      variables = {
+        PAGER = "bat --style=plain";
+        MANPAGER = "bat --style=plain";
+      };
+      systemPackages = with pkgs; [
         curl
         dua
-      eza # TODO: needs shell aliases
+        bat
+        eza
         fd
         file
         iputils
@@ -270,6 +266,7 @@
         rsync
         sd
       ];
+    };
 
     programs = {
       traceroute.enable = true;
@@ -456,7 +453,11 @@
     };
   };
 
-  development-tools = {pkgs, ...}: {
+  development-tools = {
+    pkgs,
+    lib,
+    ...
+  }: {
     imports = with nixosModules; [
       postgres
       podman
@@ -478,10 +479,9 @@
       taplo # toml language server for editing helix configs per repo
       picocom # serial
       pgcli
-      oil
+      oils-for-unix
       watchexec
       android-tools
-      kubectl
       stern
       libresprite
       # logseq
@@ -521,6 +521,17 @@
         yubico-piv-tool
       ];
 
+      programs.direnv.mise = {
+        enable = true;
+      };
+
+      programs.mise = {
+        enable = true;
+        enableFishIntegration = true;
+        enableBashIntegration = true;
+        enableZshIntegration = true;
+      };
+
       programs.thunderbird = {
         enable = true;
 
@@ -537,7 +548,7 @@
       };
 
       programs.jujutsu = {
-        enable = true;
+        enable = lib.mkDefault true;
       };
 
       programs.k9s = {
@@ -618,7 +629,7 @@
   }: {
     imports = with nixosModules; [
       sway
-      # hyprland
+      hyprland
       enable-flatpaks-and-appimages
       fonts
       development-tools
@@ -636,6 +647,7 @@
       then {
         graphics = {
           enable = true;
+          enable32Bit = true;
           /*
           driSupport32Bit = true;
           driSupport = true;
@@ -689,8 +701,13 @@
   };
 
   fonts = {pkgs, ...}: {
-    fonts.packages = with pkgs; [
+    fonts.packages = [
-      (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+      (
+        # allow nixpkgs 24.11 and unstable to both work
+        if builtins.hasAttr "nerd-fonts" pkgs
+        then (pkgs.nerd-fonts.symbols-only)
+        else (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+      )
       pkgs.iosevkaLyteTerm
     ];
   };
@@ -750,7 +767,7 @@
       */
     ];
 
-    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-tty;
+    programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt;
   };
 
   lutris = {pkgs, ...}: {
@@ -1002,7 +1019,26 @@
   wifi = {lib, ...}: let
     inherit (lib) mkDefault;
   in {
-    networking.networkmanager.enable = mkDefault true;
+    networking.networkmanager = {
+      enable = mkDefault true;
+      # ensureProfiles = {
+      #   profiles = {
+      #     home-wifi = {
+      #     id="home-wifi";
+      #     permissions = "";
+      #     type = "wifi";
+      #     };
+      #     wifi = {
+      #     ssid = "";
+      #     };
+      #     wifi-security = {
+      #     # auth-alg = "";
+      #     # key-mgmt = "";
+      #     psk = "";
+      #     };
+      #   };
+      # };
+    };
     systemd.services.NetworkManager-wait-online.enable = mkDefault false;
 
     /*
@@ -1182,12 +1218,13 @@
       root
     ];
 
-    boot.tmp.useTmpfs = true;
+    # boot.tmp.useTmpfs = true;
     systemd.services.nix-daemon = {
       environment.TMPDIR = "/var/tmp";
     };
     boot.tmp.cleanOnBoot = true;
-    services.irqbalance.enable = true;
+    # boot.uki.tries = 3;
+    # services.irqbalance.enable = true;
 
     # this is not ready for primetime yet
     # services.kanidm = {

nixos/beefcake.nix

@@ -35,7 +35,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         initrd.supportedFilesystems = {
           zfs = true;
         };
-        kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+        # kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
         initrd.availableKernelModules = ["ehci_pci" "mpt3sas" "usbhid" "sd_mod"];
         kernelModules = ["kvm-intel"];
         kernelParams = ["nohibernate"];
@@ -268,7 +268,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         ];
       };
       services.nextcloud = {
-        enable = true;
+        enable = false;
         hostName = "nextcloud.h.lyte.dev";
         maxUploadSize = "100G";
         extraAppsEnable = true;
@@ -304,10 +304,12 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         serviceConfig.Group = "nextcloud";
       };
 
-      services.phpfpm.pools.nextcloud.settings = {
+      services.phpfpm = lib.mkIf config.services.nextcloud.enable {
+        pools.nextcloud.settings = {
           "listen.owner" = "caddy";
           "listen.group" = "caddy";
         };
+      };
 
       services.caddy.virtualHosts."nextcloud.h.lyte.dev" = let
         fpm-nextcloud-pool = config.services.phpfpm.pools.nextcloud;
@@ -811,7 +813,117 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         # acmeCA = "https://acme-staging-v02.api.letsencrypt.org/directory";
       };
     }
-    {
+    ({...}: let
+      theme = pkgs.fetchzip {
+        url = "https://github.com/catppuccin/gitea/releases/download/v1.0.1/catppuccin-gitea.tar.gz";
+        sha256 = "sha256-et5luA3SI7iOcEIQ3CVIu0+eiLs8C/8mOitYlWQa/uI=";
+      };
+      logos = {
+        png = pkgs.fetchurl {
+          url = "https://lyte.dev/icon.png";
+          sha256 = "sha256-o/iZDohzXBGbpJ2PR1z23IF4FZignTAK88QwrfgTwlk=";
+        };
+        svg = pkgs.fetchurl {
+          url = "https://lyte.dev/img/logo.svg";
+          sha256 = "sha256-G9leVXNanoaCizXJaXn++JzaVcYOgRc3dJKhTQsMhVs=";
+        };
+        svg-with-background = pkgs.fetchurl {
+          url = "https://lyte.dev/img/logo-with-background.svg";
+          sha256 = "sha256-CdMTRXoQ3AI76aHW/sTqvZo1q/0XQdnQs9V1vGmiffY=";
+        };
+      };
+      forgejoCustomCss =
+        pkgs.writeText "iosevkalyte.css"
+        ''
+          @font-face {
+            font-family: ldiosevka;
+            font-style: normal;
+            font-weight: 300;
+            src: local("Iosevka"), url("//lyte.dev/font/iosevkalytewebmin/iosevkalyteweb-regular.subset.woff2");
+            font-display: swap
+          }
+
+          @font-face {
+            font-family: ldiosevka;
+            font-style: italic;
+            font-weight: 300;
+            src: local("Iosevka"), url("//lyte.dev/font/iosevkalytewebmin/iosevkalyteweb-italic.subset.woff2");
+            font-display: swap
+          }
+
+          @font-face {
+            font-family: ldiosevka;
+            font-style: italic;
+            font-weight: 500;
+            src: local("Iosevka"), url("//lyte.dev/font/iosevkalytewebmin/iosevkalyteweb-bolditalic.woff2");
+            font-display: swap
+          }
+          :root {
+            --fonts-monospace: ldiosevka, ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace, var(--fonts-emoji);
+          }
+        '';
+      forgejoCustomHeaderTmpl =
+        pkgs.writeText "header.tmpl"
+        ''
+          <link rel="stylesheet" href="/assets/css/iosevkalyte.css" />
+          <script async="" defer="" data-domain="lyte.dev" src="https://a.lyte.dev/js/script.js"></script>
+        '';
+      forgejoCustomHomeTmpl =
+        pkgs.writeText "home.tmpl"
+        ''
+          {{template "base/head" .}}
+          <div role="main" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}" class="page-content home">
+          	<div class="tw-mb-8 tw-px-8">
+          		<div class="center">
+          			<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}">
+          			<div class="hero">
+          				<h1 class="ui icon header title">
+                    {{AppDisplayName}}
+          				</h1>
+          				<h2>{{ctx.Locale.Tr "startpage.app_desc"}}</h2>
+          			</div>
+          		</div>
+          	</div>
+          	<div class="ui stackable middle very relaxed page grid">
+          		<div class="eight wide center column">
+          			<h1 class="hero ui icon header">
+          				{{svg "octicon-flame"}} {{ctx.Locale.Tr "startpage.install"}}
+          			</h1>
+          			<p class="large">
+          				{{ctx.Locale.Tr "startpage.install_desc" "https://forgejo.org/download/#installation-from-binary" "https://forgejo.org/download/#container-image" "https://forgejo.org/download"}}
+          			</p>
+          		</div>
+          		<div class="eight wide center column">
+          			<h1 class="hero ui icon header">
+          				{{svg "octicon-device-desktop"}} {{ctx.Locale.Tr "startpage.platform"}}
+          			</h1>
+          			<p class="large">
+          				{{ctx.Locale.Tr "startpage.platform_desc"}}
+          			</p>
+          		</div>
+          	</div>
+          	<div class="ui stackable middle very relaxed page grid">
+          		<div class="eight wide center column">
+          			<h1 class="hero ui icon header">
+          				{{svg "octicon-rocket"}} {{ctx.Locale.Tr "startpage.lightweight"}}
+          			</h1>
+          			<p class="large">
+          				{{ctx.Locale.Tr "startpage.lightweight_desc"}}
+          			</p>
+          		</div>
+          		<div class="eight wide center column">
+          			<h1 class="hero ui icon header">
+          				{{svg "octicon-code"}} {{ctx.Locale.Tr "startpage.license"}}
+          			</h1>
+          			<p class="large">
+          				{{ctx.Locale.Tr "startpage.license_desc" "https://forgejo.org/download" "https://codeberg.org/forgejo/forgejo"}}
+          			</p>
+          		</div>
+          	</div>
+          </div>
+          {{template "base/footer" .}}
+        '';
+    in {
       # systemd.tmpfiles.settings = {
       #   "10-forgejo" = {
       #     "/storage/forgejo" = {
@@ -825,6 +937,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
       # };
       services.forgejo = {
         enable = true;
+        package = pkgs.unstable-packages.forgejo;
         stateDir = "/storage/forgejo";
         settings = {
           DEFAULT = {
@@ -852,8 +965,8 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
             # LEVEL = "Debug";
           };
           ui = {
-            THEMES = "forgejo-auto,forgejo-light,forgejo-dark";
+            THEMES = "catppuccin-mocha-sapphire,forgejo-auto,forgejo-light,forgejo-dark";
-            DEFAULT_THEME = "forgejo-auto";
+            DEFAULT_THEME = "catppuccin-mocha-sapphire";
           };
           indexer = {
             REPO_INDEXER_ENABLED = "true";
@@ -862,6 +975,13 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
             # REPO_INDEXER_INCLUDE =
             REPO_INDEXER_EXCLUDE = "resources/bin/**";
           };
+          "markup.asciidoc" = {
+            ENABLED = true;
+            NEED_POSTPROCESS = true;
+            FILE_EXTENSIONS = ".adoc,.asciidoc";
+            RENDER_COMMAND = "${pkgs.asciidoctor}/bin/asciidoctor --embedded --safe-mode=secure --out-file=- -";
+            IS_INPUT_FILE = false;
+          };
         };
         lfs = {
           enable = true;
@@ -881,6 +1001,26 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
         "forgejo-runner.env" = {mode = "0400";};
       };
       systemd.services.gitea-runner-beefcake.after = ["sops-nix.service"];
+
+      systemd.services.forgejo = {
+        preStart = lib.mkAfter ''
+          rm -rf ${config.services.forgejo.stateDir}/custom/public
+          mkdir -p ${config.services.forgejo.stateDir}/custom/public/
+          mkdir -p ${config.services.forgejo.stateDir}/custom/public/assets/
+          mkdir -p ${config.services.forgejo.stateDir}/custom/public/assets/img/
+          mkdir -p ${config.services.forgejo.stateDir}/custom/public/assets/css/
+          mkdir -p ${config.services.forgejo.stateDir}/custom/templates/custom/
+          ln -sf ${logos.png} ${config.services.forgejo.stateDir}/custom/public/assets/img/logo.png
+          ln -sf ${logos.svg} ${config.services.forgejo.stateDir}/custom/public/assets/img/logo.svg
+          ln -sf ${logos.png} ${config.services.forgejo.stateDir}/custom/public/assets/img/favicon.png
+          ln -sf ${logos.svg-with-background} ${config.services.forgejo.stateDir}/custom/public/assets/img/favicon.svg
+          ln -sf ${theme}/theme-catppuccin-mocha-sapphire.css ${config.services.forgejo.stateDir}/custom/public/assets/css/
+          ln -sf ${forgejoCustomCss} ${config.services.forgejo.stateDir}/custom/public/assets/css/iosevkalyte.css
+          ln -sf ${forgejoCustomHeaderTmpl} ${config.services.forgejo.stateDir}/custom/templates/custom/header.tmpl
+          ln -sf ${forgejoCustomHomeTmpl} ${config.services.forgejo.stateDir}/custom/templates/home.tmpl
+        '';
+      };
+
       services.gitea-actions-runner = {
         # TODO: simple git-based automation would be dope? maybe especially for
         # mirroring to github super easy?
@@ -929,7 +1069,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
           reverse_proxy :${toString config.services.forgejo.settings.server.HTTP_PORT}
         '';
       };
-    }
+    })
     {
       services.restic.commonPaths = [
         config.services.vaultwarden.backupDir
@@ -1767,7 +1907,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
 
       services.paperless = {
         enable = true;
-        package = pkgs.paperless-ngx;
+        # package = pkgs.paperless-ngx;
         dataDir = "/storage/paperless";
         passwordFile = config.sops.secrets.paperless-superuser-password.path;
       };
@@ -1794,7 +1934,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
 
       virtualisation.oci-containers = {
         containers.actual = {
-          image = "ghcr.io/actualbudget/actual-server:24.10.1";
+          image = "ghcr.io/actualbudget/actual-server:24.11.0";
           autoStart = true;
           ports = ["5006:5006"];
           volumes = ["/storage/actual:/data"];

nixos/dragon.nix

@@ -6,7 +6,7 @@
 }: {
   imports = [
     {
-      system.stateVersion = "24.05";
+      system.stateVersion = "24.11";
       home-manager.users.daniel.home.stateVersion = "24.05";
       networking.hostName = "dragon";
     }
@@ -31,6 +31,14 @@
       };
     }
   ];
+  hardware.amdgpu = {
+    amdvlk = {
+      enable = true;
+      support32Bit = {
+        enable = true;
+      };
+    };
+  };
   hardware.graphics.extraPackages = [
     # pkgs.rocmPackages.clr.icd
     pkgs.amdvlk
@@ -95,8 +103,8 @@
     # TODO: monitor config module?
     wayland.windowManager.hyprland = {
       settings = {
-        env = [
+        exec-once = [
-          "EWW_BAR_MON,1"
+          "eww open bar1"
         ];
         # See https://wiki.hyprland.org/Configuring/Keywords/ for more
         monitor = [
@@ -108,12 +116,23 @@
           "desc:LG Display 0x0521,3840x2160@120,0x0,1"
           "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,1"
           */
-          "DP-2,3840x2160@60,0x0,1.5,transform,1"
+          "DP-1,3840x2160@60,0x0,1.5,transform,1"
         ];
         input = {
           force_no_accel = true;
           sensitivity = 1; # -1.0 - 1.0, 0 means no modification.
         };
+        workspace = [
+          "1, monitor:DP-3, default:true"
+          "2, monitor:DP-3, default:false"
+          "3, monitor:DP-3, default:false"
+          "4, monitor:DP-3, default:false"
+          "5, monitor:DP-3, default:false"
+          "6, monitor:DP-3, default:false"
+          "7, monitor:DP-3, default:false"
+          "8, monitor:DP-1, default:true"
+          "9, monitor:DP-1, default:false"
+        ];
       };
     };
 

nixos/factorio-versions.json

@@ -1,57 +1,13 @@
 {
   "x86_64-linux": {
-    "alpha": {
-      "experimental": {
-        "name": "factorio_alpha_x64-1.1.110.tar.xz",
-        "needsAuth": true,
-        "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.110/alpha/linux64",
-        "version": "1.1.110"
-      },
-      "stable": {
-        "name": "factorio_alpha_x64-1.1.110.tar.xz",
-        "needsAuth": true,
-        "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.110/alpha/linux64",
-        "version": "1.1.110"
-      }
-    },
-    "demo": {
-      "experimental": {
-        "name": "factorio_demo_x64-1.1.110.tar.xz",
-        "needsAuth": false,
-        "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.110/demo/linux64",
-        "version": "1.1.110"
-      },
-      "stable": {
-        "name": "factorio_demo_x64-1.1.110.tar.xz",
-        "needsAuth": false,
-        "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.110/demo/linux64",
-        "version": "1.1.110"
-      }
-    },
     "headless": {
-      "experimental": {
-        "name": "factorio_headless_x64-2.0.9.tar.xz",
-        "needsAuth": false,
-        "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8",
-        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.9/headless/linux64",
-        "version": "2.0.9"
-      },
       "stable": {
-        "name": "factorio_headless_x64-2.0.8.tar.xz",
+        "name": "factorio_headless_x64-2.0.15.tar.xz",
         "needsAuth": false,
-        "sha256": "2VlMTVUqPk+WWxiKR3TajIsBD8I92w78Y7HZSBjd4co=",
+        "sha256": "cLRBy4B4EaYFhsARBySMHY164EO9HyNnX8kk+6qlONg=",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.8/headless/linux64",
+        "url": "https://factorio.com/get-download/2.0.15/headless/linux64",
-        "version": "2.0.8"
+        "version": "2.0.15"
       }
     }
   }

nixos/foxtrot.nix

@@ -266,6 +266,7 @@ in
 
   environment = {
     systemPackages = with pkgs; [
+      easyeffects
       godot_4
       fractal
       prismlauncher
@@ -285,19 +286,39 @@ in
       };
     };
 
-    /*
+    services.easyeffects = {
+      enable = true;
+      preset = "philonmetal";
+      # clone from https://github.com/ceiphr/ee-framework-presets
+      # then `cp *.json ~/.config/easyeffects/output`
+      # TODO: nixify this
+    };
+
+    services.hypridle = let
+      secondsPerMinute = 60;
+      lockSeconds = 10 * secondsPerMinute;
+    in {
+      settings = {
+        listener = [
+          {
+            timeout = lockSeconds + 55;
+            on-timeout = ''systemctl suspend'';
+          }
+        ];
+      };
+    };
+
     wayland.windowManager.hyprland = {
       settings = {
-        env = [
+        exec-once = [
-          "EWW_BAR_MON,0"
+          "eww open bar0"
         ];
         # See https://wiki.hyprland.org/Configuring/Keywords/ for more
         monitor = [
-          "eDP-1,2256x1504@60,0x0,${toString scale}"
+          "eDP-1,2880x1920@120Hz,0x0,1.66667"
         ];
       };
     };
-    */
 
     wayland.windowManager.sway = {
       config = {
@@ -305,12 +326,13 @@ in
           "BOE NE135A1M-NY1 Unknown" = {
             mode = "2880x1920@120Hz";
             position = "1092,2160";
-            scale = toString 1.75;
+            scale = toString (5 / 3);
           };
 
           "Dell Inc. DELL U2720Q CWTM623" = {
             mode = "3840x2160@60Hz";
             position = "0,0";
+            scale = toString 1.25;
           };
 
           /*
@@ -342,12 +364,21 @@ in
     pkgs.vaapiVdpau
   ];
 
+  hardware.amdgpu = {
+    amdvlk = {
+      enable = true;
+      support32Bit = {
+        enable = true;
+      };
+    };
+  };
+
   networking.networkmanager.wifi.powersave = false;
 
   hardware.framework.amd-7040.preventWakeOnAC = true;
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
+    # kernelPackages = pkgs.linuxPackages_latest;
 
     # https://github.com/void-linux/void-packages/issues/50417#issuecomment-2131802836 fix framework 13 not shutting down
     /*
@@ -392,6 +423,20 @@ in
     # TODO: when resuming from hibernation, it would be nice if this would
     # simply resume the power state at the time of hibernation
     powerOnBoot = false;
+
+    package = pkgs.bluez.overrideAttrs (finalAttrs: previousAttrs: rec {
+      version = "5.78";
+      src = pkgs.fetchurl {
+        url = "mirror://kernel/linux/bluetooth/bluez-${version}.tar.xz";
+        sha256 = "sha256-gw/tGRXF03W43g9eb0X83qDcxf9f+z0x227Q8A1zxeM=";
+      };
+      patches = [];
+      buildInputs =
+        previousAttrs.buildInputs
+        ++ [
+          pkgs.python3Packages.pygments
+        ];
+    });
   };
   powerManagement.cpuFreqGovernor = "ondemand";
   /*
@@ -436,15 +481,19 @@ in
 
   networking.firewall.allowedTCPPorts = let
     stardewValley = 24642;
+    factorio = 34197;
   in [
     8000 # dev stuff
+    factorio
     stardewValley
     7777
   ];
   networking.firewall.allowedUDPPorts = let
     stardewValley = 24642;
+    factorio = 34197;
   in [
     8000 # dev stuff
+    factorio
     stardewValley
     7777
   ];

nixos/htpc.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   lib,
   ...

nixos/thablet.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -41,7 +42,18 @@
   boot.kernelModules = ["kvm-intel" "acpi_call"];
   boot.extraModulePackages = with config.boot.kernelPackages; [acpi_call];
 
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware = {
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        intel-media-driver
+        intel-ocl
+        intel-vaapi-driver
+      ];
+    };
+  };
 
   hardware.bluetooth = {
     enable = true;

templates/.gitignore

@@ -0,0 +1 @@
+flake.lock

templates/elixir/flake.nix

@@ -1,81 +1,16 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    git-hooks.url = "github:cachix/git-hooks.nix";
+    git-hooks.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = {
+  outputs = inputs: let
-    self,
+    inherit (import nix/boilerplate.nix inputs) call;
-    nixpkgs,
-    ...
-  }: let
-    inherit (self) outputs;
-
-    supportedSystems = [
-      "aarch64-linux"
-      "x86_64-linux"
-
-      "x86_64-darwin"
-      "aarch64-darwin"
-    ];
-
-    forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
-    overlay = final: prev: {
-      erlangPackages = prev.beam.packagesWith prev.erlang_26;
-      erlang = final.erlangPackages.erlang;
-      elixir = final.erlangPackages.elixir_1_16;
-
-      mixRelease = final.erlangPackages.mixRelease.override {
-        elixir = final.elixir;
-      };
-      fetchMixDeps = final.erlangPackages.fetchMixDeps.override {
-        elixir = final.elixir;
-      };
-
-      elixir-ls = prev.elixir-ls.override {elixir = final.elixir;};
-    };
-
-    nixpkgsFor = system: ((import nixpkgs {inherit system;}).extend overlay);
   in {
-    packages = forAllSystems (system: let
+    overlays = import nix/overlays.nix;
-      pkgs = nixpkgsFor system;
+    packages = call (import nix/packages.nix);
-
+    checks = call (import nix/checks.nix);
-      inherit (pkgs) beamPackages;
+    devShells = call (import nix/shells.nix);
-      inherit (beamPackages) mixRelease fetchMixDeps;
-
-      version = "0.1.0";
-      src = ./.;
-      pname = "api.lyte.dev";
-    in {
-      /*
-      this-package = mixRelease {
-        inherit pname version src;
-        mixFodDeps = fetchMixDeps {
-          inherit version src;
-          pname = "mix-deps-${pname}";
-          hash = pkgs.lib.fakeSha256;
-        };
-        buildInputs = with pkgs; [sqlite];
-        HOME = "$(pwd)";
-        MIX_XDG = "$HOME";
-      };
-
-      default = outputs.packages.${system}.this-package;
-      */
-    });
-
-    devShells = forAllSystems (system: let
-      pkgs = nixpkgsFor system;
-    in {
-      default = pkgs.mkShell {
-        shellHook = "export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive";
-        buildInputs = with pkgs; [
-          elixir
-          elixir-ls
-
-          inotify-tools
-        ];
-      };
-    });
   };
 }

templates/elixir/nix/boilerplate.nix

@@ -0,0 +1,16 @@
+inputs @ {
+  nixpkgs,
+  self,
+  ...
+}: let
+  forSelfOverlay =
+    if builtins.hasAttr "forSelf" self.overlays
+    then self.overlays.forSelf
+    else (_: p: p);
+in rec {
+  systems = ["aarch64-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin"];
+  forSystems = nixpkgs.lib.genAttrs systems;
+  pkgsFor = system: ((import nixpkgs {inherit system;}).extend forSelfOverlay);
+  genPkgs = func: (forSystems (system: func (pkgsFor system)));
+  call = imported: genPkgs (pkgs: imported (inputs // {inherit pkgs;}));
+}

templates/elixir/nix/checks.nix

@@ -0,0 +1,17 @@
+{
+  git-hooks,
+  pkgs,
+  ...
+}: {
+  git-hooks = git-hooks.lib.${pkgs.system}.run {
+    src = ./..;
+    hooks = {
+      alejandra.enable = true;
+      convco.enable = true;
+      credo.enable = true;
+      dialyzer.enable = true;
+      mix-format.enable = true;
+      mix-test.enable = true;
+    };
+  };
+}

templates/elixir/nix/overlays.nix

@@ -0,0 +1,9 @@
+{
+  forSelf = final: prev: {
+    erlang = prev.beam.packagesWith prev.beam.interpreters.erlang_27;
+    elixir = final.erlang.elixir_1_18;
+    mixRelease = final.erlang.mixRelease.override {elixir = final.elixir;};
+    fetchMixDeps = final.erlang.fetchMixDeps.override {elixir = final.elixir;};
+    elixir-ls = prev.elixir-ls.override {elixir = final.elixir;};
+  };
+}

templates/elixir/nix/packages.nix

@@ -0,0 +1,24 @@
+{
+  pkgs,
+  self,
+  ...
+}: let
+  version = "1.0.0";
+  src = ../.;
+  pname = "my-package";
+in {
+  ${pname} = pkgs.mixRelease {
+    inherit pname version src;
+    mixFodDeps = pkgs.fetchMixDeps {
+      inherit version src;
+      pname = "mix-deps-${pname}";
+      sha256 = pkgs.lib.fakeSha256;
+    };
+    # buildInputs = with pkgs; [];
+    # HOME = "$(pwd)";
+    # MIX_XDG = "$HOME";
+    # RELEASE_COOKIE = "test-cookie";
+  };
+
+  default = self.packages.${pkgs.system}.${pname};
+}

templates/elixir/nix/shells.nix

@@ -0,0 +1,15 @@
+{
+  pkgs,
+  # self,
+  ...
+}: {
+  elixir-dev = pkgs.mkShell {
+    shellHook = "export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive";
+    # inputsFrom = [self.packages.${pkgs.system}.my-package];
+    buildInputs = with pkgs; [
+      elixir
+      elixir-ls
+      inotify-tools
+    ];
+  };
+}

templates/rust/flake.nix

@@ -20,16 +20,12 @@
         src = ./.;
         hooks = {
           alejandra.enable = true;
-          # NOTE: These do not work well with `nix flake check` due to pure environments
-          # https://github.com/cachix/git-hooks.nix/issues/452
-          /*
           cargo-check.enable = true;
           clippy = {
             enable = true;
             packageOverrides.cargo = pkgs.cargo;
             packageOverrides.clippy = pkgs.rustPackages.clippy;
           };
-          */
           rustfmt = {
             enable = true;
             packageOverrides.rustfmt = pkgs.rustfmt;
@@ -40,7 +36,7 @@
 
     packages = genPkgs (pkgs: {
       my-package = pkgs.rustPlatform.buildRustPackage {
-        pname = "kodotag";
+        pname = "my-package";
         version = "0.1.0";
 
         /*