Refactor modules into nixos and home-manager

Flake lock file updates:

• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8?narHash=sha256-uQ%2BNQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140%3D' (2025-01-14)
  → 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
• Updated input 'nixvim':
    'github:nix-community/nixvim/2004ff4547f11d25da78f393fe797dde2b831ce7?narHash=sha256-G6/9vT12RAxkNWQPEX9p8tTx/i8jJcmISpbVDGbEPGc%3D' (2025-01-11)
  → 'github:nix-community/nixvim/c2ee71c814c9427d4991b9d58d412add9c5a1c56?narHash=sha256-Lq7PWAD%2BedeIpZKM7aresrwON%2BTdo3OMu1S2YX8AjjM%3D' (2025-01-17)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2023 by Jordan Holt <jordan@vimium.com>
+Copyright (C) 2025 by Jordan Holt <jordan@vimium.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

README.md

@@ -6,8 +6,8 @@ System and user configuration for NixOS-based systems.
 |-|-|
 | **Shell:** | zsh |
 | **DE:** | GNOME |
-| **Theme:** | adwaita |
+| **Theme:** | Adwaita |
-| **Terminal:** | Console |
+| **Terminal:** | Ptyxis |
 
 ## Provisioning a new host
 > [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1722339003,
+        "lastModified": 1736955230,
-        "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1718194053,
+        "lastModified": 1727447169,
-        "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722113426,
+        "lastModified": 1735644329,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723080788,
+        "lastModified": 1737038063,
-        "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1723137499,
+        "lastModified": 1736899990,
-        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
+        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
+        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
         "type": "github"
       },
       "original": {
@@ -182,22 +182,6 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_4": {
-      "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-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -206,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722555600,
+        "lastModified": 1736143030,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -219,25 +203,42 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1722857853,
+        "lastModified": 1735882644,
-        "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
@@ -313,16 +314,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
+        "lastModified": 1736373539,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -335,20 +336,48 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
+        "lastModified": 1736373539,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.6",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "kvlibadwaita": {
       "flake": false,
       "locked": {
@@ -373,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722924007,
+        "lastModified": 1736370755,
-        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
+        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
+        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
         "type": "github"
       },
       "original": {
@@ -388,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723149858,
+        "lastModified": 1736978406,
-        "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=",
+        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988",
+        "rev": "b678606690027913f3434dea3864e712b862dde5",
         "type": "github"
       },
       "original": {
@@ -408,20 +437,18 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_05": "nixpkgs-24_05",
+        "nixpkgs-24_11": "nixpkgs-24_11"
-        "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1718084203,
+        "lastModified": 1735230346,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
@@ -442,28 +469,28 @@
         "type": "github"
       }
     },
-    "nixpkgs-24_05": {
+    "nixpkgs-24_11": {
       "locked": {
-        "lastModified": 1717144377,
+        "lastModified": 1734083684,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1722813957,
+        "lastModified": 1737062831,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
         "type": "github"
       },
       "original": {
@@ -490,16 +517,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1722987190,
+        "lastModified": 1736916166,
-        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
+        "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
+        "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "type": "indirect"
       }
     },
@@ -514,23 +541,47 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1722925293,
+        "lastModified": 1737141914,
-        "narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=",
+        "narHash": "sha256-Lq7PWAD+edeIpZKM7aresrwON+Tdo3OMu1S2YX8AjjM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2",
+        "rev": "c2ee71c814c9427d4991b9d58d412add9c5a1c56",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixvim",
         "type": "github"
       }
     },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735854821,
+        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "plasma-manager": {
       "inputs": {
         "home-manager": [
@@ -541,11 +592,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723232379,
+        "lastModified": 1736549395,
-        "narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=",
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
         "type": "github"
       },
       "original": {
@@ -576,11 +627,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1722712220,
+        "lastModified": 1730732927,
-        "narHash": "sha256-gEmbk/DROfVZ+v/BAZHDloHzS0KdqIzxtW7z9g2eH4Y=",
+        "narHash": "sha256-t3MTEgi6O7DMxMjdi3xcTAztLDQmEtqQ+oU+ZbWz2AI=",
         "ref": "refs/heads/master",
-        "rev": "dfe0e95be5ef539bf28602ff47beeea26cc4d1b8",
+        "rev": "4ae2ac777c38f60a29384b70c456f41847cdf1b5",
-        "revCount": 22,
+        "revCount": 28,
         "type": "git",
         "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
       },
@@ -637,11 +688,11 @@
     "thunderbird-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1721874544,
+        "lastModified": 1732643121,
-        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
+        "narHash": "sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU=",
         "owner": "rafaelmardojai",
         "repo": "thunderbird-gnome-theme",
-        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
+        "rev": "1994e7ec0649053e2a0811973245758d41e33f5f",
         "type": "github"
       },
       "original": {
@@ -658,11 +709,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722330636,
+        "lastModified": 1736154270,
-        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
         "type": "github"
       },
       "original": {
@@ -688,24 +739,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,7 +2,7 @@
   description = "NixOS system configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     # nixpkgs-master.url = "nixpkgs";
     agenix.url = "github:ryantm/agenix";
@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     firefox-gnome-theme = {
@@ -29,11 +29,11 @@
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.05";
+      url = "github:nix-community/nixvim/nixos-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     plasma-manager = {
@@ -112,7 +112,12 @@
         magicRollback = true;
         autoRollback = true;
         sshUser = "root";
-        nodes = lib.genAttrs [ "mail" "pi" "skycam" "vps1" ] mkDeployNode;
+        nodes = lib.genAttrs [
+          "mail"
+          # "pi"
+          # "skycam"
+          "vps1"
+        ] mkDeployNode;
       };
 
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;

hosts/atlas/default.nix

@@ -22,29 +22,22 @@
   users.extraGroups.vboxusers.members = [ "jordan" ];
 
   modules = {
-    desktop = {
+    programs = {
-      apps = {
+      dev = {
-        qbittorrent.enable = true;
+        node.enable = true;
-        thunderbird.enable = true;
       };
-      browsers = {
+      firefox.enable = true;
-        firefox.enable = true;
+      git.enable = true;
-      };
+      gpg.enable = true;
-      media.graphics = {
+      graphics = {
         raster.enable = true;
         vector.enable = true;
       };
-      office.libreoffice.enable = true;
+      libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
       neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
+      thunderbird.enable = true;
     };
     services = {
       borgmatic = {
@@ -56,7 +49,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/common.nix

@@ -4,7 +4,8 @@
   imports = [
     self.inputs.agenix.nixosModules.age
     self.inputs.home-manager.nixosModule
-    ../modules
+    ../modules/home-manager
+    ../modules/nixos
   ];
 
   nixpkgs.overlays = [
@@ -54,7 +55,7 @@
   programs.zsh.enable = true;
 
   nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';

hosts/desktop.nix

@@ -9,10 +9,9 @@
     (import ../overlays/gnome.nix)
   ];
 
-  services.printing.enable = true;
+  services.printing.enable = false;
   services.openssh.startWhenNeeded = true;
 
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -53,8 +52,8 @@
   ];
 
   modules = {
-    desktop.gnome.enable = true;
+    system.desktop.gnome.enable = true;
-    networking.tailscale.enable = true;
+    services.tailscale.enable = true;
   };
 
   environment.systemPackages = with pkgs; [

hosts/eos/default.nix

@@ -25,24 +25,18 @@
   };
 
   modules = {
-    desktop = {
+    programs = {
-      apps.qbittorrent.enable = true;
+      dev = {
-      browsers = {
+        node.enable = true;
-        firefox.enable = true;
       };
-    };
+      firefox.enable = true;
-    dev = {
+      git.enable = true;
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/eos/hardware-configuration.nix

@@ -7,11 +7,12 @@
 
   boot = {
     initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-    initrd.kernelModules = [ ];
     initrd.supportedFilesystems = [ "zfs" ];
-    kernelModules = [ ];
+    kernel.sysctl = {
+      "kernel.nmi_watchdog" = 0;
+      "vm.laptop_mode" = 5;
+    };
     kernelParams = [ "elevator=none" ];
-    extraModulePackages = [ ];
     supportedFilesystems = [ "zfs" ];
   };
 

hosts/helios/default.nix

@@ -22,21 +22,16 @@
   };
 
   modules = {
-    desktop = {
+    programs = {
-      apps.qbittorrent.enable = true;
+      dev = {
-      browsers = {
+        node.enable = true;
-        firefox.enable = true;
       };
-    };
+      firefox.enable = true;
-    dev = {
+      git.enable = true;
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     services = {
       borgmatic = {
@@ -48,7 +43,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/hypnos/default.nix

@@ -30,7 +30,7 @@
       videoDrivers = [ "nvidia" ];
     };
     displayManager = {
-      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
       sddm.wayland.enable = lib.mkForce false;
     };
   };
@@ -39,26 +39,20 @@
   environment.sessionVariables.GSK_RENDERER = "gl";
 
   modules = {
-    desktop = {
+    programs = {
-      browsers = {
+      dev = {
-        firefox.enable = true;
+        node.enable = true;
       };
-      media.recording = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      neovim.enable = true;
+      pass.enable = true;
+      recording = {
         audio.enable = true;
       };
     };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/hypnos/hardware-configuration.nix

@@ -7,6 +7,10 @@
 
   boot = {
     initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    kernel.sysctl = {
+      "kernel.nmi_watchdog" = 0;
+      "vm.laptop_mode" = 5;
+    };
     kernelModules = [ "applesmc" "kvm-intel" "wl" ];
     extraModulePackages = [
       config.boot.kernelPackages.broadcom_sta
@@ -25,13 +29,12 @@
       modesetting.enable = true;
       powerManagement.enable = true;
     };
-    opengl = {
+    graphics = {
       enable = true;
       extraPackages = with pkgs; [
         libvdpau-va-gl
       ];
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
     };
   };
 }

hosts/library/default.nix

@@ -156,23 +156,23 @@
     };
   };
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       vaapiVdpau
     ];
-    driSupport = true;
   };
   users.users.jellyfin.extraGroups = [ "video" "render" ];
   services.jellyfin = {
     enable = true;
+    package = pkgs.unstable.jellyfin;
     cacheDir = "/var/cache/jellyfin";
     dataDir = "/var/lib/jellyfin";
   };
 
   modules = {
     podman.enable = true;
-    security = {
+    programs = {
       gpg.enable = true;
     };
     shell = {

hosts/odyssey/default.nix

@@ -50,44 +50,37 @@
   };
 
   modules = {
-    desktop = {
+    programs = {
-      apps.qbittorrent.enable = true;
+      dev = {
-      browsers = {
+        node.enable = true;
-        firefox.enable = true;
       };
-      gaming = {
+      emulators = {
-        emulators = {
+        gamecube.enable = true;
-          gamecube.enable = true;
+        ps2.enable = true;
-          ps2.enable = true;
+        ps3.enable = true;
-          ps3.enable = true;
+        psp.enable = true;
-          psp.enable = true;
+        wii.enable = true;
-          wii.enable = true;
+        xbox.enable = true;
-          xbox.enable = true;
-        };
-        lutris.enable = true;
       };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
         modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };
-      media.recording = {
+      libreoffice.enable = true;
+      lutris.enable = true;
+      pass.enable = true;
+      neovim.enable = true;
+      qbittorrent.enable = true;
+      recording = {
         audio.enable = true;
         video.enable = true;
       };
-      office.libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
     };
     hardware.presonus-studio.enable = true;
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
     services = {
       borgmatic = {
         enable = true;
@@ -105,7 +98,6 @@
       gitea-runner.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/odyssey/hardware-configuration.nix

@@ -19,6 +19,7 @@
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
     nvidia = {
       modesetting.enable = true;
+      open = true;
       package = config.boot.kernelPackages.nvidiaPackages.beta;
       powerManagement.enable = true;
     };

hosts/pi/default.nix

@@ -100,8 +100,6 @@
 
   networking.hostId = "731d1660";
 
-  sound.enable = true;
-
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -216,7 +214,7 @@
   };
 
   modules = {
-    networking = {
+    system = {
       wireless = {
         enable = true;
         interfaces = [ "wlan0" ];

hosts/pi/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, pkgs, modulesPath, ... }:
 
 {
   imports = [
@@ -6,6 +6,40 @@
   ];
 
   boot = {
+    kernelPackages = let
+      version = "6.1.73";
+      tag = "stable_20240124";
+      srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
+      in pkgs.linuxPackagesFor (pkgs.linux_rpi4.override {
+        argsOverride = {
+          src = pkgs.fetchFromGitHub {
+            owner = "raspberrypi";
+            repo = "linux";
+            rev = tag;
+            hash = srcHash;
+          };
+          version = version;
+          modDirVersion = version;
+          structuredExtraConfig = {};
+          kernelPatches = [
+            {
+              name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
+              patch = pkgs.fetchpatch {
+                url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
+                hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
+              };
+            }
+            {
+              name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
+              patch = pkgs.fetchpatch {
+                url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
+                hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
+              };
+            }
+          ];
+        };
+      });
+
     # Stop ZFS kernel being built
     supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
     tmp.cleanOnBoot = true;
@@ -14,9 +48,24 @@
   # Fix missing modules
   # https://github.com/NixOS/nixpkgs/issues/154163
   nixpkgs.overlays = [
-    (final: super: {
+    (final: prev: {
       makeModulesClosure = x:
-        super.makeModulesClosure (x // { allowMissing = true; });
+        prev.makeModulesClosure (x // { allowMissing = true; });
+    })
+    (final: prev: {
+      raspberrypifw = let
+        version = "1.20240529";
+        srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
+        in pkgs.raspberrypifw.override {
+          argsOverride = {
+            src = prev.fetchFromGitHub {
+              owner = "raspberrypi";
+              repo = "firmware";
+              rev = "${version}";
+              hash = srcHash;
+            };
+          };
+        };
     })
   ];
 

hosts/server.nix

@@ -54,7 +54,7 @@
     ];
   };
 
-  modules.networking.tailscale = {
+  modules.services.tailscale = {
     enable = true;
     restrictSSH = false;
   };

hosts/vps1/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [
@@ -37,12 +37,48 @@
     groups = {
       jellyfin = { };
     };
+    extraGroups.acme.members = [ "kanidm" "nginx" ];
   };
 
   services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
 
+  security.acme.certs."auth.vimium.com" = {
+    postRun = "systemctl restart kanidm.service";
+    group = "acme";
+  };
+
+  services.kanidm = let
+    baseDomain = "vimium.com";
+    domain = "auth.${baseDomain}";
+    uri = "https://${domain}";
+  in {
+    package = pkgs.unstable.kanidm;
+    enableClient = true;
+    enableServer = true;
+    clientSettings = {
+      inherit uri;
+    };
+    serverSettings = {
+      bindaddress = "[::1]:3013";
+      ldapbindaddress = "[::1]:636";
+      domain = baseDomain;
+      origin = uri;
+      tls_chain = "${config.security.acme.certs.${domain}.directory}/full.pem";
+      tls_key = "${config.security.acme.certs.${domain}.directory}/key.pem";
+    };
+  };
+
+  services.nginx.virtualHosts = {
+    "auth.vimium.com" = {
+      useACMEHost = "auth.vimium.com";
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "https://[::1]:3013";
+      };
+    };
+  };
+
   modules = rec {
-    databases.postgresql.enable = true;
     services = {
       borgmatic = {
         enable = true;
@@ -66,10 +102,11 @@
           signal = true;
           whatsapp = true;
         };
-        usePostgresql = databases.postgresql.enable;
+        usePostgresql = services.postgresql.enable;
       };
       nginx.enable = true;
       photoprism.enable = true;
+      postgresql.enable = true;
     };
   };
 

modules/default.nix

@@ -1,52 +0,0 @@
-{
-  imports = [
-    ./options.nix
-    ./podman.nix
-    ./databases/postgresql.nix
-    ./desktop/gnome.nix
-    ./desktop/forensics.nix
-    ./desktop/hyprland.nix
-    ./desktop/kde.nix
-    ./desktop/mimeapps.nix
-    ./desktop/apps/qbittorrent.nix
-    ./desktop/apps/slack.nix
-    ./desktop/apps/thunderbird.nix
-    ./desktop/apps/zoom.nix
-    ./desktop/browsers/brave.nix
-    ./desktop/browsers/firefox.nix
-    ./desktop/gaming/emulators.nix
-    ./desktop/gaming/lutris.nix
-    ./desktop/gaming/steam.nix
-    ./desktop/media/graphics.nix
-    ./desktop/media/recording.nix
-    ./desktop/office/libreoffice.nix
-    ./dev/cc.nix
-    ./dev/java.nix
-    ./dev/lua.nix
-    ./dev/node.nix
-    ./dev/python.nix
-    ./dev/rust.nix
-    ./dev/scala.nix
-    ./dev/shell.nix
-    ./dev/zig.nix
-    ./editors/neovim
-    ./editors/vscode.nix
-    ./hardware/presonus-studio.nix
-    ./networking/tailscale.nix
-    ./networking/wireless.nix
-    ./security/gpg.nix
-    ./security/pass.nix
-    ./services/borgmatic
-    ./services/chrony
-    ./services/coturn
-    ./services/gitea
-    ./services/gitea-runner
-    ./services/headscale
-    ./services/mail
-    ./services/matrix
-    ./services/nginx
-    ./services/photoprism
-    ./shell/git
-    ./shell/zsh
-  ];
-}

modules/home-manager/default.nix

@@ -0,0 +1,33 @@
+{
+  imports = [
+    ./options.nix
+    ./programs/brave.nix
+    ./programs/dev/cc.nix
+    ./programs/dev/java.nix
+    ./programs/dev/lua.nix
+    ./programs/dev/node.nix
+    ./programs/dev/python.nix
+    ./programs/dev/rust.nix
+    ./programs/dev/scala.nix
+    ./programs/dev/shell.nix
+    ./programs/dev/zig.nix
+    ./programs/emulators.nix
+    ./programs/firefox.nix
+    ./programs/forensics.nix
+    ./programs/git
+    ./programs/gpg.nix
+    ./programs/graphics.nix
+    ./programs/libreoffice.nix
+    ./programs/lutris.nix
+    ./programs/neovim.nix
+    ./programs/pass.nix
+    ./programs/qbittorrent.nix
+    ./programs/recording.nix
+    ./programs/slack.nix
+    ./programs/steam.nix
+    ./programs/thunderbird.nix
+    ./programs/vscode.nix
+    ./programs/zoom.nix
+    ./shell/zsh
+  ];
+}

modules/home-manager/programs/brave.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.browsers.brave;
+let cfg = config.modules.programs.brave;
 in {
-  options.modules.desktop.browsers.brave = {
+  options.modules.programs.brave = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/cc.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.cc;
+let cfg = config.modules.programs.dev.cc;
 in {
-  options.modules.dev.cc = {
+  options.modules.programs.dev.cc = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/java.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.java;
+let cfg = config.modules.programs.dev.java;
 in {
-  options.modules.dev.java = {
+  options.modules.programs.dev.java = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/lua.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.lua;
+let cfg = config.modules.programs.dev.lua;
 in {
-  options.modules.dev.lua = {
+  options.modules.programs.dev.lua = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/node.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.node;
+let cfg = config.modules.programs.dev.node;
 in {
-  options.modules.dev.node = {
+  options.modules.programs.dev.node = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -11,7 +11,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      nodejs_latest
+      nodejs_22
     ];
   };
 }

modules/home-manager/programs/dev/python.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.python;
+let cfg = config.modules.programs.dev.python;
 in {
-  options.modules.dev.python = {
+  options.modules.programs.dev.python = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/rust.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.rust;
+let cfg = config.modules.programs.dev.rust;
 in {
-  options.modules.dev.rust = {
+  options.modules.programs.dev.rust = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/scala.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.scala;
+let cfg = config.modules.programs.dev.scala;
 in {
-  options.modules.dev.scala = {
+  options.modules.programs.dev.scala = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/shell.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.shell;
+let cfg = config.modules.programs.dev.shell;
 in {
-  options.modules.dev.shell = {
+  options.modules.programs.dev.shell = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/zig.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.zig;
+let cfg = config.modules.programs.dev.zig;
 in {
-  options.modules.dev.zig = {
+  options.modules.programs.dev.zig = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/emulators.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.emulators;
+let cfg = config.modules.programs.emulators;
 in {
-  options.modules.desktop.gaming.emulators = {
+  options.modules.programs.emulators = {
     ds.enable       = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/firefox.nix

@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.desktop.browsers.firefox;
+let cfg = config.modules.programs.firefox;
 in {
-  options.modules.desktop.browsers.firefox = {
+  options.modules.programs.firefox = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/forensics.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.forensics;
+let cfg = config.modules.programs.forensics;
 in {
-  options.modules.desktop.forensics = {
+  options.modules.programs.forensics = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/git/default.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.shell.git;
+let cfg = config.modules.programs.git;
 in {
-  options.modules.shell.git = {
+  options.modules.programs.git = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/gpg.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.security.gpg;
+let cfg = config.modules.programs.gpg;
 in {
-  options.modules.security.gpg = {
+  options.modules.programs.gpg = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/graphics.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.media.graphics;
+let cfg = config.modules.programs.graphics;
 in {
-  options.modules.desktop.media.graphics = {
+  options.modules.programs.graphics = {
     modeling.enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/libreoffice.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.desktop.office.libreoffice;
+  cfg = config.modules.programs.libreoffice;
   # libreoffice-gtk4 = pkgs.libreoffice.override {
   #   extraMakeWrapperArgs = [
   #     "--set SAL_USE_VCLPLUGIN gtk4"
@@ -20,7 +20,7 @@ let
   #   });
   # };
 in {
-  options.modules.desktop.office.libreoffice = {
+  options.modules.programs.libreoffice = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -29,7 +29,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
       hunspell
       hunspellDicts.en-gb-large
       hunspellDicts.en-us-large

modules/home-manager/programs/lutris.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.lutris;
+let cfg = config.modules.programs.lutris;
 in {
-  options.modules.desktop.gaming.lutris = {
+  options.modules.programs.lutris = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -21,10 +21,9 @@ in {
       vulkan-tools
     ];
 
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
     };
   };
 }

modules/home-manager/programs/neovim.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.editors.neovim;
+  cfg = config.modules.programs.neovim;
 in {
-  options.modules.editors.neovim = {
+  options.modules.programs.neovim = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -11,7 +11,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    home.programs.nixvim = {
+    home.programs.nixvim.config = {
       enable = true;
       defaultEditor = true;
 
@@ -59,15 +59,15 @@ in {
           eslint.enable = true;
           gopls.enable = true;
           html.enable = true;
-          lua-ls.enable = true;
+          lua_ls.enable = true;
           pylsp.enable = true;
           nixd.enable = true;
-          rust-analyzer = {
+          rust_analyzer = {
             enable = true;
             installCargo = true;
             installRustc = true;
           };
-          tsserver.enable = true;
+          ts_ls.enable = true;
         };
       };
 
@@ -108,7 +108,7 @@ in {
         nixvimInjections = true;
 
         folding = true;
-        indent = true;
+        settings.indent.enable = true;
       };
 
       plugins.treesitter-refactor = {
@@ -121,6 +121,8 @@ in {
 
       plugins.undotree.enable = true;
 
+      plugins.web-devicons.enable = true;
+
       # plugins.gitsigns.enable = true;
       # plugins.gitgutter.enable = true;
       # plugins.goyo.enable = true;

modules/home-manager/programs/pass.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.security.pass;
+let cfg = config.modules.programs.pass;
 in {
-  options.modules.security.pass = {
+  options.modules.programs.pass = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/qbittorrent.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.qbittorrent;
+let cfg = config.modules.programs.qbittorrent;
 in {
-  options.modules.desktop.apps.qbittorrent = {
+  options.modules.programs.qbittorrent = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/recording.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.media.recording;
+let cfg = config.modules.programs.recording;
 in {
-  options.modules.desktop.media.recording = {
+  options.modules.programs.recording = {
     audio.enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/slack.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.slack;
+let cfg = config.modules.programs.slack;
 in {
-  options.modules.desktop.apps.slack = {
+  options.modules.programs.slack = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/steam.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.steam;
+let cfg = config.modules.programs.steam;
 in {
-  options.modules.desktop.gaming.steam = {
+  options.modules.programs.steam = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/thunderbird.nix

@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.desktop.apps.thunderbird;
+let cfg = config.modules.programs.thunderbird;
 in {
-  options.modules.desktop.apps.thunderbird = {
+  options.modules.programs.thunderbird = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/vscode.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.editors.vscode;
+let cfg = config.modules.programs.vscode;
 in {
-  options.modules.editors.vscode = {
+  options.modules.programs.vscode = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/zoom.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.zoom;
+let cfg = config.modules.programs.zoom;
 in {
-  options.modules.desktop.apps.zoom = {
+  options.modules.programs.zoom = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/default.nix

@@ -0,0 +1,24 @@
+{
+  imports = [
+    ./hardware/presonus-studio
+    ./podman.nix
+    ./services/borgmatic.nix
+    ./services/chrony.nix
+    ./services/coturn.nix
+    ./services/gitea.nix
+    ./services/gitea-runner.nix
+    ./services/headscale.nix
+    ./services/mail.nix
+    ./services/matrix.nix
+    ./services/netbird.nix
+    ./services/nginx.nix
+    ./services/photoprism.nix
+    ./services/postgresql.nix
+    ./services/tailscale.nix
+    ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
+    ./system/desktop/kde.nix
+    ./system/desktop/mimeapps.nix
+    ./system/wireless.nix
+  ];
+}

modules/nixos/services/headscale.nix

@@ -1,19 +1,17 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   cfg = config.modules.services.headscale;
   fqdn = "headscale.vimium.net";
 in {
   options.modules.services.headscale = {
-    enable = mkOption {
+    enable = lib.mkOption {
       default = false;
       example = true;
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.headscale ];
 
     services.headscale = {
@@ -22,12 +20,17 @@ in {
       port = 8080;
 
       settings = {
+        policy.path = null;
         ip_prefixes = [
           "100.64.0.0/10"
         ];
         server_url = "https://${fqdn}";
-        dns_config = {
+        derp = {
-          base_domain = "vimium.net";
+          auto_update_enable = false;
+          update_frequency = "24h";
+        };
+        dns = {
+          base_domain = "mesh.vimium.net";
           extra_records = [
             {
               name = "grafana.mesh.vimium.net";
@@ -40,6 +43,10 @@ in {
               value = "100.64.0.7";
             }
           ];
+          magic_dns = true;
+          nameservers.global = [
+            "9.9.9.9"
+          ];
         };
         logtail.enabled = false;
       };

modules/nixos/services/matrix.nix

@@ -28,9 +28,6 @@ in {
       default = "vimium.com";
       example = "vimium.com";
     };
-    slidingSync = {
-      enable = lib.mkEnableOption "sliding-sync";
-    };
     usePostgresql = lib.mkEnableOption "postgresql";
   };
 
@@ -42,10 +39,9 @@ in {
         base_url = "https://${matrixSubdomain}";
         server_name = cfg.serverName;
       };
-      "m.identity_server" = {};
+      "m.identity_server" = {
-      "org.matrix.msc3575.proxy" = if cfg.slidingSync.enable then {
+        "base_url" = "https://vector.im";
-        "url" = "https://${matrixSubdomain}";
+      };
-      } else { };
     };
     matrixServerConfig."m.server" = "${matrixSubdomain}:443";
     commonBridgeSettings = bridge: {
@@ -134,13 +130,6 @@ in {
             '';
           };
           "/_synapse/client".proxyPass = "http://localhost:8008";
-          "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = lib.mkIf cfg.slidingSync.enable {
-            priority = 100;
-            proxyPass = "http://localhost:8009";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $remote_addr;
-            '';
-          };
         };
       };
       "${cfg.serverName}" = let
@@ -171,6 +160,11 @@ in {
       };
     } else {});
 
+    nixpkgs.config.permittedInsecurePackages = [
+      "jitsi-meet-1.0.8043"
+      "olm-3.2.16"
+    ];
+
     services.matrix-synapse = {
       enable = true;
       enableRegistrationScript = true;
@@ -181,26 +175,12 @@ in {
         max_upload_size = "100M";
         report_stats = false;
         server_name = cfg.serverName;
-        app_service_config_files = (lib.optional cfg.bridges.whatsapp
-          "/var/lib/mautrix-whatsapp/whatsapp-registration.yaml");
       };
     };
     systemd.services.matrix-synapse.serviceConfig.SupplementaryGroups =
       (lib.optional cfg.bridges.whatsapp
         config.systemd.services.mautrix-whatsapp.serviceConfig.Group);
 
-    age.secrets = if cfg.slidingSync.enable then {
-      "files/services/matrix/sliding-sync" = {
-        file = "${self.inputs.secrets}/files/services/matrix/sliding-sync.age";
-      };
-    } else {};
-
-    services.matrix-sliding-sync = lib.mkIf cfg.slidingSync.enable {
-      enable = true;
-      environmentFile = config.age.secrets."files/services/matrix/sliding-sync".path;
-      settings = { SYNCV3_SERVER = "https://${matrixSubdomain}"; };
-    };
-
     services.postgresql = lib.mkIf cfg.usePostgresql {
       ensureUsers = [
         {

modules/nixos/services/netbird.nix

@@ -0,0 +1,70 @@
+{ config, lib, self, ... }:
+
+let
+  cfg = config.modules.services.netbird;
+  hostname = config.networking.hostName;
+in {
+  options.modules.services.netbird = {
+    enable = lib.mkEnableOption "netbird";
+    coordinatorDomain = lib.mkOption {
+      type = lib.types.str;
+      default = "netbird.vimium.net";
+    };
+    meshDomain = lib.mkOption {
+      type = lib.types.str;
+      default = "mesh.vimium.net";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."passwords/services/netbird/data-store-encryption-key" = {
+      file = "${self.inputs.secrets}/passwords/services/netbird/data-store-encryption-key.age";
+    };
+
+    services.netbird = {
+      enable = true;
+    };
+
+    services.netbird.server = {
+      domain = cfg.coordinatorDomain;
+      enable = true;
+      enableNginx = true;
+      dashboard.settings = {
+        AUTH_AUTHORITY = "https://auth.vimium.com/oauth2/openid/netbird";
+      };
+      management = rec {
+        disableAnonymousMetrics = true;
+        dnsDomain = cfg.meshDomain;
+        oidcConfigEndpoint = "https://auth.vimium.com/oauth2/openid/netbird/.well-known/openid-configuration";
+        settings = {
+          DataStoreEncryptionKey = {
+            _secret = config.age.secrets."passwords/services/netbird/data-store-encryption-key".path;
+          };
+          HttpConfig = {
+            AuthAudience = "netbird";
+          };
+          StoreConfig = { Engine = "sqlite"; };
+          TURNConfig = {
+            Secret._secret = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
+            TimeBasedCredentials = true;
+          };
+          PKCEAuthorizationFlow.ProviderConfig = {
+            AuthorizationEndpoint = "https://auth.vimium.com/ui/oauth2";
+            TokenEndpoint = "https://auth.vimium.com/oauth2/token";
+          };
+        };
+        singleAccountModeDomain = dnsDomain;
+        turnDomain = config.services.coturn.realm;
+        turnPort = config.services.coturn.listening-port;
+      };
+    };
+
+    systemd.services.netbird-signal.serviceConfig.RestartSec = "60";
+    systemd.services.netbird-management.serviceConfig.RestartSec = "60";
+
+    services.nginx.virtualHosts."netbird.vimium.net" = {
+      enableACME = true;
+      forceSSL = true;
+    };
+  };
+}

modules/nixos/services/nginx.nix

@@ -118,8 +118,12 @@ in {
           serverAliases = [ "www.jdholt.com" ];
           extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
           locations."/skycam/snapshot.jpg" = {
-            proxyPass = "http://skycam.mesh.vimium.net:8080/snapshot";
             extraConfig = ''
+              set $backend "skycam.mesh.vimium.net:8080";
+
+              resolver 100.100.100.100;
+
+              proxy_pass http://$backend/snapshot;
               proxy_cache skycam_cache;
               proxy_cache_valid any 10s;
               proxy_ignore_headers Cache-Control Expires Set-Cookie;

modules/nixos/services/postgresql.nix

@@ -5,9 +5,9 @@
 }:
 
 let
-  cfg = config.modules.databases.postgresql;
+  cfg = config.modules.services.postgresql;
 in {
-  options.modules.databases.postgresql = {
+  options.modules.services.postgresql = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/services/tailscale.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, self, ... }:
 
 let
-  cfg = config.modules.networking.tailscale;
+  cfg = config.modules.services.tailscale;
   headscale = "https://headscale.vimium.net";
   hostname = config.networking.hostName;
 in {
-  options.modules.networking.tailscale = {
+  options.modules.services.tailscale = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/gnome.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, self, ... }:
 
-let cfg = config.modules.desktop.gnome;
+let cfg = config.modules.system.desktop.gnome;
 in {
-  options.modules.desktop.gnome = {
+  options.modules.system.desktop.gnome = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -24,6 +24,11 @@ in {
       "io/github/celluloid-player/celluloid" = {
         draggable-video-area-enable = true;
       };
+      "org/gnome/Console" = {
+        font-scale = 1.4;
+        use-system-font = false;
+        custom-font = "ComicShannsMono Nerd Font 10";
+      };
       "org/gnome/desktop/interface" = {
         color-scheme = "prefer-dark";
         cursor-theme = "Adwaita";
@@ -61,6 +66,11 @@ in {
         edge-tiling = true;
         experimental-features = [ "scale-monitor-framebuffer" ];
       };
+      "org/gnome/Ptyxis" = {
+        use-system-font = false;
+        font-name = "ComicShannsMono Nerd Font 11";
+        audible-bell = false;
+      };
       "org/gnome/settings-daemon/plugins/media-keys" = {
         volume-up = [
           "<Shift>F12"
@@ -77,7 +87,6 @@ in {
           "appindicatorsupport@rgcjonas.gmail.com"
           # "arcmenu@arcmenu.com"
           "blur-my-shell@aunetx"
-          # "browser-tabs@com.github.harshadgavali"
           "burn-my-windows@schneegans.github.com"
           "clipboard-indicator@tudmotu.com"
           "CoverflowAltTab@palatis.blogspot.com"
@@ -89,14 +98,13 @@ in {
           # "forge@jmmaranan.com"
           "gsconnect@andyholmes.github.io"
           # "gSnap@micahosborne"
-          # "hidetopbar@mathieu.bidon.ca"
+          "hidetopbar@mathieu.bidon.ca"
           "just-perfection-desktop@just-perfection"
           # "mediacontrols@cliffniff.github.com"
           # "mousefollowsfocus@matthes.biz"
           # "pano@elhan.io"
           # "paperwm@hedning:matrix.org"
           "pip-on-top@rafostar.github.com"
-          # "rounded-window-corners@yilozt"
           # "search-light@icedman.github.com"
           # "smart-auto-move@khimaros.com"
           "space-bar@luchrioh"
@@ -110,6 +118,7 @@ in {
         favorite-apps = [
           "firefox.desktop"
           "org.gnome.Nautilus.desktop"
+          "org.gnome.Ptyxis.desktop"
         ];
       };
       "org/gnome/shell/extensions/blur-my-shell/panel" = {
@@ -183,11 +192,6 @@ in {
         outer-gaps = 8;
         enable-blur-snap-assistant = true;
       };
-      "org/gnome/Console" = {
-        font-scale = 1.4;
-        use-system-font = false;
-        custom-font = "ComicShannsMono Nerd Font 10";
-      };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
         sort-directories-first = true;
@@ -218,8 +222,8 @@ in {
       # d-spy
       # drawing
       # fragments
-      gnome.dconf-editor
+      dconf-editor
-      gnome.ghex
+      ghex
       # gnome-builder
       gnome-decoder
       gnome-firmware
@@ -227,9 +231,10 @@ in {
       # gnome-obfuscate
       gnome-podcasts
       identity
-      mission-center
+      # mission-center
       mousam
       newsflash
+      ptyxis
       # schemes
       shortwave
       sysprof
@@ -250,7 +255,6 @@ in {
       gnomeExtensions.appindicator
       gnomeExtensions.arcmenu
       gnomeExtensions.blur-my-shell
-      gnomeExtensions.browser-tabs
       gnomeExtensions.burn-my-windows
       gnomeExtensions.clipboard-indicator
       gnomeExtensions.coverflow-alt-tab
@@ -266,10 +270,9 @@ in {
       gnomeExtensions.just-perfection
       gnomeExtensions.media-controls
       gnomeExtensions.mouse-follows-focus
-      gnomeExtensions.pano
+      # gnomeExtensions.pano (disabled due to: https://github.com/NixOS/nixpkgs/issues/369438)
       gnomeExtensions.paperwm
       gnomeExtensions.pip-on-top
-      gnomeExtensions.rounded-window-corners
       gnomeExtensions.search-light
       gnomeExtensions.smart-auto-move
       gnomeExtensions.space-bar

modules/nixos/system/desktop/hyprland.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.hyprland;
+let cfg = config.modules.system.desktop.hyprland;
 in {
-  options.modules.desktop.hyprland = {
+  options.modules.system.desktop.hyprland = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/kde.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.kde;
+let cfg = config.modules.system.desktop.kde;
 in {
-  options.modules.desktop.kde = {
+  options.modules.system.desktop.kde = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/mimeapps.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.desktop.mimeapps;
+  cfg = config.modules.system.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
 in {
-  options.modules.desktop.mimeapps = {
+  options.modules.system.desktop.mimeapps = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/wireless.nix

@@ -2,9 +2,9 @@
 
 with lib;
 
-let cfg = config.modules.networking.wireless;
+let cfg = config.modules.system.wireless;
 in {
-  options.modules.networking.wireless = {
+  options.modules.system.wireless = {
     enable = mkOption {
       default = false;
       example = true;
@@ -26,9 +26,9 @@ in {
       wireless = {
         enable = true;
         interfaces = cfg.interfaces;
-        environmentFile = config.age.secrets."passwords/networks".path;
+        secretsFile = config.age.secrets."passwords/networks".path;
         networks = {
-          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+          "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
         };
       };
       networkmanager.ensureProfiles.profiles = {

overlays/gnome.nix

@@ -1,11 +1,22 @@
 final: prev:
 {
-  gnome = prev.gnome.overrideScope' (gself: gsuper: {
+  gvdb = prev.fetchgit {
-    mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
+    url = "https://gitlab.gnome.org/GNOME/gvdb.git";
-      src = prev.fetchurl {
+    rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
-        url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-46/mutter-triple-buffering-v4-46.tar.gz";
+    sha256 = "c56yOepnKPEYFcU1B1TrDl8ydU0JU+z6R8siAQP4d2A=";
-        sha256 = "mmFABDsRMzYnLO3+Cf3CJ60XyUBl3y9NAUj+vs7nLqE=";
+  };
-      };
+
-    });
+  mutter = prev.mutter.overrideAttrs (attrs: {
+    src = prev.fetchurl {
+      url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
+      sha256 = "oeykTJRcG/SY83U8RYnyFFZ8zKqoyXvtbaS2f/s503U=";
+    };
+
+    postPatch = ''
+      mkdir -p subprojects/gvdb
+      cp -r ${final.gvdb}/* subprojects/gvdb/
+
+      ${attrs.postPatch or ""}
+    '';
   });
 }