Update flake.lock 2025-04-28

.sops.yaml

@@ -1,17 +1,15 @@
 keys:
   - &primary age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg
   - &aspi-ssh age1q8lc5340gz5xw2f57nglrss68wv0j0hf36py2pdtrl6ky3yrq9qqk0njr4
-  - &pianonix-ssh age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c
   - &builder-ssh age1kw4kmdm45zprvdkrrpvgq966l7585vhusmum083qlwnr0xxgd3uqatcyja
   - &kardorf-ssh age15lxw97z03q40xrdscnxqqugh5ky5aqrerg2t2rphkcqm6rnllurq8v98q5
 
 creation_rules:
-  - path_regex: hosts/common/secrets.yaml$
+  - path_regex: hosts/secrets-common.yaml$
     key_groups:
     - age:
       - *primary
       - *aspi-ssh
-      - *pianonix-ssh
       - *kardorf-ssh
 
   - path_regex: hosts/builder/secrets.yaml$
@@ -19,9 +17,3 @@ creation_rules:
     - age:
       - *primary
       - *builder-ssh
-
-  - path_regex: hosts/pianonix/secrets*
-    key_groups:
-    - age:
-      - *primary
-      - *pianonix-ssh

features-nixos/global/sops.nix

@@ -1,4 +1,5 @@
 {
+  pwd,
   inputs,
   config,
   ...
@@ -18,5 +19,5 @@ in {
     generateKey = false; # TODO: building should not work without secrets!?
   };
 
-  sops.defaultSopsFile = ../secrets.yaml;
+  sops.defaultSopsFile = "${pwd}/hosts/secrets-common.yaml";
 }

features-nixos/users/julian/default.nix

@@ -1,4 +1,5 @@
 {
+  pwd,
   pkgs,
   config,
   lib,
@@ -29,7 +30,7 @@ in {
     ];
 
     openssh.authorizedKeys.keys = lib.splitString "\n" (
-      builtins.readFile ../../../../homes/julian/ssh.pub
+      builtins.readFile ./ssh.pub
     );
     # hashedPasswordFile = config.sops.secrets.julian-password.path;
     hashedPassword = "$y$j9T$N33kLJQbV8soUoCbDkpwA1$r/yahJDgOPo4GGOrAi6BUG5zLTzmaBrA5NQ4nno561A";
@@ -40,11 +41,11 @@ in {
   };
 
   sops.secrets.julian-password = {
-    sopsFile = ../../secrets.yaml;
+    sopsFile = "${pwd}/hosts/secrets-common.yaml";
     neededForUsers = true;
   };
 
-  home-manager.users.julian = import ../../../../homes/julian/${config.networking.hostName}.nix;
+  home-manager.users.julian = import "${pwd}/homes/julian/${config.networking.hostName}.nix";
 
   security.pam.services.swaylock = {}; # Make swaylock unlocking work
 }

flake.lock

@@ -1,5 +1,54 @@
 {
   "nodes": {
+    "alacritty-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1745230862,
+        "narHash": "sha256-TFomYP13Wa2VSoxKGKaTDyIj8K1/Oi4LOhR93z07Ot4=",
+        "owner": "alacritty",
+        "repo": "alacritty-theme",
+        "rev": "0520b1f8f3eb25678444c0817a97636b6601ac85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "alacritty",
+        "repo": "alacritty-theme",
+        "type": "github"
+      }
+    },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744289235,
+        "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "base16-schemes": {
       "flake": false,
       "locked": {
@@ -51,6 +100,48 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-topology",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "devshell_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -58,11 +149,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769524058,
+        "lastModified": 1745502102,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
+        "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
         "type": "github"
       },
       "original": {
@@ -196,6 +287,116 @@
         "type": "github"
       }
     },
+    "flake-utils_5": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_3",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "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_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-topology",
+          "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": [
+          "nixvim",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -203,11 +404,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770260404,
+        "lastModified": 1745557122,
-        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
         "type": "github"
       },
       "original": {
@@ -244,16 +445,306 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1769548169,
+        "lastModified": 1744743431,
-        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
         "owner": "nix-community",
-        "repo": "impermanence",
+        "repo": "home-manager",
-        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "impermanence",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742215578,
+        "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745015490,
+        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": "nixpkgs_2",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems_2",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1745795931,
+        "narHash": "sha256-i4zlEa2lnANuOZA1aA/X0cNGM7x9MLZqqmKP6fwfPEA=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "f5c5cfa960c157c8df50b496f621290234ac4505",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745610646,
+        "narHash": "sha256-R8rWH3oFV5/jwl87t7HyVoFgndrPw8QR/2pLwyKJLYM=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "61ab0385c8d9d456bf89539c76dd9e73becefde3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743714874,
+        "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-qt-support": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634706,
+        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "8810df502cdee755993cb803eba7b23f189db795",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048983,
+        "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744468525,
+        "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743950287,
+        "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739870480,
+        "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
         "type": "github"
       }
     },
@@ -345,7 +836,29 @@
         "type": "github"
       }
     },
-    "nix-gl": {
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743127615,
+        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "nix-darwin-24.11",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nix-ld": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
@@ -353,11 +866,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762090880,
+        "lastModified": 1744621833,
-        "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
+        "narHash": "sha256-II6a32kRc+KbLhU/jS8EbuXYt1PNCvsRvuBw2becgQM=",
-        "owner": "nix-community",
+        "owner": "Mic92",
-        "repo": "nixgl",
+        "repo": "nix-ld",
-        "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
+        "rev": "9a3812797e25def1d4aed62b517606b7b93989dc",
         "type": "github"
       },
       "original": {
@@ -394,11 +907,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754476755,
+        "lastModified": 1745506915,
-        "narHash": "sha256-vSF0VMEmPMzwNkrXIZwkhOSYmKES9BaDK/LlEe7/q8E=",
+        "narHash": "sha256-ZonLQ5fDqRRbvHVwf4P53ktwUG2e+OTexXvbxyxForI=",
         "owner": "doronbehar",
         "repo": "nix-matlab",
-        "rev": "0e9c9fb660f9e1a1e4d59fd083e0212a15b513e2",
+        "rev": "68da9ca66d2e6c51c45e71d624c8bf0ca20846fb",
         "type": "gitlab"
       },
       "original": {
@@ -407,49 +920,36 @@
         "type": "gitlab"
       }
     },
-    "nixlib": {
+    "nix-topology": {
-      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixos-generators": {
       "inputs": {
-        "nixlib": "nixlib",
+        "devshell": "devshell",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1769813415,
+        "lastModified": 1744142264,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
+        "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=",
-        "owner": "nix-community",
+        "owner": "oddlama",
-        "repo": "nixos-generators",
+        "repo": "nix-topology",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
+        "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "oddlama",
-        "repo": "nixos-generators",
+        "repo": "nix-topology",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1770882871,
+        "lastModified": 1745503349,
-        "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
+        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
+        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
         "type": "github"
       },
       "original": {
@@ -491,11 +991,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1770841267,
+        "lastModified": 1745526057,
-        "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {
@@ -507,15 +1007,15 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768564909,
+        "lastModified": 1744932701,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -535,11 +1035,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1770770419,
+        "lastModified": 1745487689,
-        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
+        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
+        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
         "type": "github"
       },
       "original": {
@@ -559,11 +1059,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1769049374,
+        "lastModified": 1745068593,
-        "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
+        "narHash": "sha256-YuQRMvqLVu+ghl2XzqXyVg/YevH/t3XHVCl7w+UrCH8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
+        "rev": "d35dc6dfcae3ff1a0c72f2d59491a7d83e5505a3",
         "type": "github"
       },
       "original": {
@@ -583,11 +1083,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768249818,
+        "lastModified": 1745046075,
-        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
+        "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
+        "rev": "066afe8643274470f4a294442aadd988356a478f",
         "type": "github"
       },
       "original": {
@@ -596,6 +1096,56 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "nix-topology",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nix-topology",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730797577,
+        "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "deploy-rs": "deploy-rs",
@@ -647,11 +1197,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770683991,
+        "lastModified": 1745310711,
-        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
+        "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
+        "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
         "type": "github"
       },
       "original": {
@@ -761,7 +1311,58 @@
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744961264,
+        "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
         "type": "github"
       }
     },
@@ -783,6 +1384,47 @@
         "type": "github"
       }
     },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744644585,
+        "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
+    },
     "yazi-flavors": {
       "flake": false,
       "locked": {

flake.nix

@@ -76,10 +76,6 @@
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          config.permittedInsecurePackages = [
-            "olm-3.2.16"
-          ];
-          warn-dirty = false;
         }
     );
   in {
@@ -89,9 +85,8 @@
     homeManagerModules = import ./modules/home-manager;
 
     overlays = import ./overlays {inherit inputs outputs;};
-    # hydraJobs = import ./hydra.nix { inherit inputs outputs; }; # TODO add hydra jobs here?
 
-    packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;});
+    packages = forEachSystem (pkgs: import ./packages {inherit pkgs;});
     devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
     formatter = forEachSystem (pkgs: pkgs.alejandra); # nix fmt *
 
@@ -103,63 +98,27 @@
         ];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
-      # Piano raspberry pi
-      # pianonix = lib.nixosSystem {
-      #   modules = [./hosts/pianonix];
-      #   specialArgs = {
-      #     inherit inputs outputs;
-      #   };
-      # };
       kardorf = lib.nixosSystem {
         modules = [./hosts/kardorf];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       builder = lib.nixosSystem {
         modules = [./hosts/builder];
         specialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
     };
 
     # Standalone HM
     homeConfigurations = {
-      # Main laptop
-      "julian@aspi" = lib.homeManagerConfiguration {
-        modules = [
-          ./homes/julian/aspi.nix
-          ./homes/julian/hm-standalone-config.nix
-        ];
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {
-          inherit inputs outputs;
-        };
-      };
-      # Media server (RPi)
-      # "julian@pianonix" = lib.homeManagerConfiguration {
-      #   modules = [
-      #     ./homes/julian/pianonix.nix
-      #     ./homes/julian/hm-standalone-config.nix
-      #   ];
-      #   pkgs = pkgsFor.aarch64-linux;
-      #   extraSpecialArgs = {
-      #     inherit inputs outputs;
-      #   };
-      # };
-      "julian@kardorf" = lib.homeManagerConfiguration {
-        modules = [
-          ./homes/julian/kardorf.nix
-          ./homes/julian/hm-standalone-config.nix
-        ];
-        pkgs = pkgsFor.x86_64-linux;
-        extraSpecialArgs = {
-          inherit inputs outputs;
-        };
-      };
       "julian@v3ms" = lib.homeManagerConfiguration {
         modules = [
           ./homes/julian/v3ms
@@ -168,6 +127,7 @@
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       "julian@quickstart" = lib.homeManagerConfiguration {
@@ -178,22 +138,13 @@
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
     };
 
     # deploy-rs node configuration
     deploy.nodes = {
-      # pianonix = {
-      #   hostname = "pianonix.local";
-      #   profiles.system = {
-      #     sshUser = "root";
-      #     user = "root";
-      #     path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pianonix;
-      #     confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
-      #   };
-      # };
-
       builder = {
         hostname = "builder.julian-mutter.de";
         profiles.system = {
@@ -204,15 +155,5 @@
         };
       };
     };
-
-    # substitutes: nixos-generate --flake .#pianonix -f sd-aarch64 --system aarch64-linux
-    pianonix-image = inputs.nixos-generators.nixosGenerate {
-      system = "aarch64-linux";
-      format = "sd-aarch64";
-      modules = [./hosts/pianonix];
-      specialArgs = {
-        inherit inputs outputs;
-      };
-    };
   };
 }

homes/julian/features/suites/desktop/default.nix

@@ -52,7 +52,6 @@
     # rustdesk
     tor-browser
     rusty-path-of-building # Path of Building for poe1 and poe2
-    # frajul.pob-dev-version # Path of Building
     vlc
     wineWowPackages.stable # 32-bit and 64-bit wine
     winetricks
@@ -69,6 +68,5 @@
     ## My scripts
     frajul.open-messaging
     frajul.xwacomcalibrate
-    frajul.pob2-frajul
   ];
 }

homes/julian/pianonix.nix

@@ -1,62 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./global
-
-    ./features/fish
-    ./features/topgrade
-    ./features/neovim
-    ./features/wezterm
-    ./features/yazi
-    ./features/gtk
-  ];
-
-  hostName = "pianonix";
-  is-nixos = true;
-  terminal = "wezterm";
-
-  # services.syncthing.tray.enable = true;
-  # services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
-
-  home.packages = with pkgs; [
-    music-reader
-    sheet-organizer
-
-    xournalpp
-    musescore
-
-    onboard
-  ];
-
-  programs.firefox = {
-    enable = true;
-
-    profiles.default = {
-      isDefault = true;
-
-      settings = {
-        "browser.startup.homepage" = "https://sheets.julian-mutter.de";
-        "browser.startup.page" = 1; # 0=blank, 1=home page, 3=restore previous session
-      };
-    };
-  };
-
-  programs.chromium = {
-    enable = true;
-
-    # commandLineArgs = [
-    #   "--homepage=https://sheets.julian-mutter.de"
-    #   "--no-first-run"
-    # ];
-  };
-
-  # Autostart link
-  home.file = {
-    # ".config/autostart/sheet-organizer.desktop".source = "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
-    ".config/autostart/firefox.desktop".source = "${pkgs.firefox}/share/applications/firefox.desktop";
-    ".config/autostart/onboard.desktop".source = "${pkgs.onboard}/share/applications/onboard.desktop";
-    # ".config/autostart/chromium.desktop".source = "${pkgs.chromium}/share/applications/chromium.desktop";
-    ".config/sheet-organizer/config.toml".text = ''
-      working_directory = "/home/julian/Klavier"
-    '';
-  };
-}

hosts/aspi/default.nix

@@ -1,30 +1,28 @@
-{
+{pwd, ...}: {
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global
+    "${pwd}/features-nixos/global"
-    ../common/users/julian
+    "${pwd}/features-nixos/users/julian"
-    ../common/users/yukari
+    "${pwd}/features-nixos/optional/binarycaches.nix"
-    ../common/users/pob
-    ../common/optional/binarycaches.nix
 
-    ../common/optional/remote-builder.nix
+    "${pwd}/features-nixos/optional/remote-builder.nix"
-    ../common/optional/boot-efi.nix
+    "${pwd}/features-nixos/optional/boot-efi.nix"
 
-    ../common/optional/greetd.nix
+    "${pwd}/features-nixos/optional/greetd.nix"
-    ../common/optional/authentication.nix
+    "${pwd}/features-nixos/optional/authentication.nix"
-    ../common/optional/pcmanfm.nix
+    "${pwd}/features-nixos/optional/pcmanfm.nix"
-    ../common/optional/pipewire.nix
+    "${pwd}/features-nixos/optional/pipewire.nix"
 
-    ../common/optional/gamemode.nix
+    "${pwd}/features-nixos/optional/gamemode.nix"
-    ../common/optional/virtualbox.nix
+    "${pwd}/features-nixos/optional/virtualbox.nix"
 
-    ../common/optional/podman.nix
+    "${pwd}/features-nixos/optional/podman.nix"
-    ../common/optional/wireguard.nix
+    "${pwd}/features-nixos/optional/wireguard.nix"
-    ../common/optional/wireshark.nix
+    "${pwd}/features-nixos/optional/wireshark.nix"
-    ../common/optional/flatpak.nix
+    "${pwd}/features-nixos/optional/flatpak.nix"
 
-    ../common/optional/avahi.nix
+    "${pwd}/features-nixos/optional/avahi.nix"
   ];
 
   networking.hostName = "aspi";

hosts/builder/default.nix

@@ -2,6 +2,7 @@
 # or
 # deploy .#builder
 {
+  pwd,
   config,
   pkgs,
   ...
@@ -9,11 +10,11 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global/fish.nix # fish for admin
+    "${pwd}/features-nixos/global/fish.nix" # fish for admin
-    ../common/global/locale.nix
+    "${pwd}/features-nixos/global/locale.nix"
-    ../common/global/nix.nix
+    "${pwd}/features-nixos/global/nix.nix"
-    ../common/global/sops.nix
+    "${pwd}/features-nixos/global/sops.nix"
-    ../common/global/root.nix
+    "${pwd}/features-nixos/global/root.nix"
   ];
 
   networking.hostName = "builder";
@@ -176,7 +177,7 @@
     minimumDiskFreeEvaluator = 4; # in GB
   };
 
-  # add builder itself as build machine so system emulation is properly supported
+  # add builder itpwd as build machine so system emulation is properly supported
   # nix.distributedBuilds = true;
   nix.buildMachines = [
     {

hosts/common/users/pob/default.nix

@@ -1,28 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in {
-  users.mutableUsers = false;
-  users.users.pob = {
-    description = "A helper user to use another profile for some applications";
-    group = "pob";
-    isNormalUser = true;
-    shell = pkgs.fish;
-    extraGroups = ifTheyExist [
-      "networkmanager"
-    ];
-    packages = with pkgs; [
-      firefox
-      wineWowPackages.stable # 32-bit and 64-bit wine
-      winetricks
-    ];
-  };
-  users.groups.pob = {};
-
-  security.sudo.extraConfig = ''
-    julian ALL=(pob) NOPASSWD: ALL
-  '';
-}

hosts/common/users/yukari/default.nix

@@ -1,97 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  outputs,
-  ...
-}: let
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in {
-  users.mutableUsers = false;
-  users.users.yukari = {
-    description = "Yukari";
-    group = "yukari";
-    isNormalUser = true;
-    shell = pkgs.fish;
-    extraGroups = ifTheyExist [
-      "networkmanager"
-      "audio"
-      "network"
-      "video"
-      "podman"
-      "docker"
-      "git"
-      "gamemode"
-    ];
-
-    createHome = true;
-    hashedPassword = "$y$j9T$rGuTL0rfiy7ht8L58BGCw0$fN.KwHjYlIitFEPHndKvV06ezgeWzP3/58o1kkviZwB";
-    packages = [pkgs.home-manager];
-  };
-  users.groups.yukari = {};
-
-  home-manager.users.yukari = {
-    imports =
-      [
-        ../../../../homes/julian/features/fonts
-        ../../../../homes/julian/features/suites/cli
-      ]
-      ++ (builtins.attrValues outputs.homeManagerModules);
-
-    home = {
-      username = lib.mkDefault "yukari";
-      homeDirectory = lib.mkDefault "/home/${config.home.username}";
-      stateVersion = lib.mkDefault "23.11";
-
-      sessionPath = ["$HOME/.local/bin"];
-
-      packages = with pkgs; [
-        arandr
-        calibre # ebook manager and viewer
-        # digikam
-        discord
-        discord-ptb # in case discord updates take their time
-        # dvdisaster
-        # element-desktop
-        # rocketchat-desktop
-        thunderbird
-        telegram-desktop # telegram
-        # schildichat-desktop # not updated regularly
-        nheko
-        evince # Simple pdf reader, good for focusing on document content
-        firefox
-        vivaldi
-        # geogebra
-        cheese
-        handbrake
-        # kitty # Terminal, already available as feature
-        libnotify
-        libreoffice
-        mate.engrampa
-        nomacs # Image viewer
-        kdePackages.okular # Pdf reader with many features, good for commenting documents
-        pavucontrol
-        qalculate-gtk # Nice gui calculator
-        qpdfview
-        # qutebrowser
-        # realvnc-vnc-viewer
-        # rustdesk
-        tor-browser
-        # frajul.pob-dev-version # Path of Building
-        vlc
-        wineWowPackages.stable # 32-bit and 64-bit wine
-        winetricks
-        xclip # x11 clipboard access from terminal
-        xfce.mousepad # simple text editor
-        xournalpp # Edit pdf files
-        zoom-us # Video conferencing
-        zotero # Manage papers and other sources
-        pdfpc # Present slides in pdf form
-      ];
-    };
-    programs = {
-      home-manager.enable = true;
-      git.enable = true;
-    };
-  };
-}

hosts/kardorf/default.nix

@@ -1,30 +1,31 @@
-{pkgs, ...}: {
+{
+  pwd,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
 
-    ../common/global
+    "${pwd}/features-nixos/global"
-    ../common/users/julian
+    "${pwd}/features-nixos/users/julian"
-    ../common/users/wolfi
+    "${pwd}/features-nixos/users/wolfi"
-    ../common/optional/binarycaches.nix
+    "${pwd}/features-nixos/optional/binarycaches.nix"
 
-    # ../common/optional/xserver.nix
+    "${pwd}/features-nixos/optional/remote-builder.nix"
-    ../common/optional/remote-builder.nix
+    "${pwd}/features-nixos/optional/boot-efi.nix"
-    ../common/optional/boot-efi.nix
 
-    ../common/optional/greetd.nix
+    "${pwd}/features-nixos/optional/greetd.nix"
-    ../common/optional/authentication.nix
+    "${pwd}/features-nixos/optional/authentication.nix"
-    ../common/optional/pcmanfm.nix
+    "${pwd}/features-nixos/optional/pcmanfm.nix"
-    ../common/optional/pipewire.nix
+    "${pwd}/features-nixos/optional/pipewire.nix"
 
-    ../common/optional/virtualbox.nix
+    "${pwd}/features-nixos/optional/openssh.nix"
 
-    # ../common/optional/gdm.nix
+    "${pwd}/features-nixos/optional/virtualbox.nix"
-    # ../common/optional/i3.nix
 
-    ../common/optional/openssh.nix
+    "${pwd}/features-nixos/optional/podman.nix"
-
+    "${pwd}/features-nixos/optional/wireshark.nix"
-    ../common/optional/podman.nix
+    "${pwd}/features-nixos/optional/flatpak.nix"
-    ../common/optional/flatpak.nix
   ];
 
   networking.hostName = "kardorf";

hosts/pianonix/default.nix

@@ -1,276 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  lib,
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    inputs.nixos-hardware.nixosModules.raspberry-pi-4
-
-    ./hardware-configuration.nix
-
-    ../common/global
-    ../common/users/julian
-    ../common/optional/binarycaches.nix
-
-    ../common/optional/pipewire.nix
-    ../common/optional/remote-builder.nix
-    ../common/optional/pcmanfm.nix
-    ../common/optional/redshift.nix
-    ../common/optional/authentication.nix
-
-    ../common/optional/avahi.nix
-  ];
-
-  environment.systemPackages = [
-    (pkgs.python3.withPackages (p:
-      with p; [
-        numpy
-        pillow
-        flask
-        rpi-gpio
-        webcolors
-        psutil
-        mido
-        rtmidi-python
-        spidev
-        waitress
-        websockets
-        werkzeug
-
-        pkgs.frajul.rpi-ws281x-python
-      ]))
-  ];
-
-  # disko.devices.disk.main.device = "/dev/mmcblk1";
-
-  # enabled by fish, disabling speeds up builds
-  documentation.man.generateCaches = false;
-
-  # networking.enableIPv6 = false; # This only leads to issues with avahi
-  # services.avahi.ipv6 = false;
-
-  hardware.raspberry-pi."4".bluetooth.enable = true;
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  services.blueman.enable = true; # bluetooth gui
-  # raspberry pi specific
-  # systemd.services.btattach = {
-  #   before = [ "bluetooth.service" ];
-  #   after = [ "dev-ttyAMA0.device" ];
-  #   wantedBy = [ "multi-user.target" ];
-  #   serviceConfig = {
-  #     ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000";
-  #   };
-  # };
-  # networking.wireless.enable = true;
-  # networking.wireless.secretsFile = config.sops.secrets."wifi/pianonix".path;
-  # networking.wireless.networks = {
-  #   "SMARTments".pskRaw = "ext:PSK";
-  # };
-
-  # networking.networkmanager.enable = lib.mkForce false;
-
-  services.gnome.at-spi2-core.enable = true; # for onboard
-
-  networking.hostName = "pianonix";
-  system.stateVersion = "22.11";
-
-  sops.secrets."vnc-passwd" = {
-    owner = config.users.users.julian.name;
-    sopsFile = ./secrets-vnc-passwd.bin;
-    format = "binary";
-  };
-  sops.secrets."wifi/pianonix" = {};
-  sops.secrets."syncthing/pianonix/key" = {};
-  sops.secrets."syncthing/pianonix/cert" = {};
-  # sops.secrets."syncthing/public-keys/aspi-nix" = { };
-  # sops.secrets."syncthing/public-keys/pianonix" = { };
-
-  sops.secrets."wg-config" = {
-    sopsFile = ./secrets-wg-config.bin;
-    format = "binary";
-  };
-
-  networking.wg-quick.interfaces = {
-    home = {
-      configFile = config.sops.secrets."wg-config".path;
-      autostart = true; # This interface is started on boot
-    };
-  };
-
-  modules = {
-    syncthing = {
-      enable = true;
-      overrideSettings = true;
-    };
-  };
-
-  # Enable the Desktop Environment.
-  # services.xserver.displayManager.lightdm.enable = true;
-  services.displayManager.defaultSession = "xfce";
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "julian";
-  };
-
-  systemd.services.x11vnc = {
-    description = "Run x11vnc server";
-    after = ["display-manager.service"];
-    wantedBy = ["multi-user.target"];
-    serviceConfig = {
-      ExecStart = "${pkgs.x11vnc}/bin/x11vnc -rfbauth ${
-        config.sops.secrets."vnc-passwd".path
-      } -forever -loop -noxdamage -repeat -rfbport 5900 -shared";
-      User = config.users.users.julian.name;
-      Restart = "on-failure";
-      Environment = "DISPLAY=:0";
-    };
-  };
-
-  boot.loader.timeout = lib.mkForce 1; # Set boot loader timeout to 1s
-
-  # De-facto disable network manager, which is enabled by gnome
-  # networking.networkmanager.unmanaged = [ "*" ];
-  services.xserver.enable = true;
-  services.xserver.desktopManager = {
-    xfce = {
-      enable = true;
-    };
-  };
-
-  services.xserver.displayManager.sessionCommands = ''
-    # Prevent screen from going blank or turning off (values in min)
-    ${pkgs.xfce.xfconf}/bin/xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/blank-on-ac -s 0
-    ${pkgs.xfce.xfconf}/bin/xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-ac-sleep -s 0
-    ${pkgs.xfce.xfconf}/bin/xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-ac-off -s 0
-  '';
-
-  services.xserver.xautolock.enable = false;
-  services.xserver.desktopManager.xfce.enableScreensaver = false;
-
-  # xdg.portal.lxqt.enable = true;
-
-  services.openssh = {
-    enable = true;
-    # require public key authentication for better security
-    settings.PasswordAuthentication = false;
-    settings.KbdInteractiveAuthentication = false;
-    settings.PermitRootLogin = "yes";
-  };
-  users.users."root".openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVk/m4ydcYXzHxTWeNw2MlwxKU+JirTVOeHsYR4wdTokwYyNWZ3/zPcU4+XekSRatwJW1LJYrZ1Y5IJkobzgnOvYVI7SXZ1Tbzb1kAcnChSt+Dp/pKdMPZ8yY3PTFZh+R5F3rWFA/YZqTRhh0vuxPIVbLl7zOPExWwYGn9crkZaYZvKHVvgE5660hXo9pxbUKsSs+DIy/AE7gfKiZLusY95nk9T/jZ7Vmhl0UsF0RiDsfxgE664/vEKe8b+82kKCDt5nJVe8THSrjaw4+NUhef6R8UoUO1/Pn4TKq3Gil3Z36wPEPdkw2lYzX+d1EFyaC3hZJedSUfdFliPOejIbNvvhPBBD1wAGxxyuJZB5KLwWN7/efwCgw45buLbVfUuwwug7K7GK84A3yzqClbZKKv8rYdO04UG64A+Taq2LeyxQIDjygTgGk/1j/0Neb1RO0FbjlbTeNMZ54P+u7BTEcikJCsbFeseWDtYzupQtLt96KMbcdRgHy0CTGqFHE+my8= julian@julian-aspi"
-  ];
-
-  services.syncthing.key = config.sops.secrets."syncthing/pianonix/key".path;
-  services.syncthing.cert = config.sops.secrets."syncthing/pianonix/cert".path;
-  services.syncthing.settings = {
-    devices = {
-      "aspi-nix" = {
-        id = "DM5QRYU-ILJ4XYB-4V6NZDG-RAMVOND-3RSDSYR-52TW6RW-3XIU333-T7FNAA3";
-      };
-      "pianonix" = {
-        id = "FD3XSFW-7LQSCIQ-KHZPLNQ-7VZYGKH-RJ2ZKTJ-BG67NRH-36TQIZM-CXDYWAH";
-      };
-    };
-    folders = {
-      "Klavier" = {
-        path = "/home/julian/Klavier";
-        id = "flc3m-q4gp2";
-        devices = [
-          "aspi-nix"
-          "pianonix"
-        ];
-      };
-    };
-  };
-
-  networking.firewall.enable = false;
-  networking.firewall.allowedTCPPorts = [
-    5900 # for vnc
-  ];
-
-  # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
-  # If no user is logged in, the machine will power down after 20 minutes.
-  systemd.targets.sleep.enable = false;
-  systemd.targets.suspend.enable = false;
-  systemd.targets.hibernate.enable = false;
-  systemd.targets.hybrid-sleep.enable = false;
-
-  ## Raspberry pi specific config
-  # hardware.raspberry-pi."4" = {
-  #   fkms-3d.enable = true;
-  #   touch-ft5406.enable = true;
-  # };
-  # Prevent host becoming unreachable on wifi after some time (for raspberry pi)
-  networking.networkmanager.wifi.powersave = false;
-  # Enable audio devices on raspberry pi
-  # boot.kernelParams = [
-  #   "snd_bcm2835.enable_hdmi=1"
-  #   "snd_bcm2835.enable_headphones=1"
-  # ];
-  # boot.loader.raspberryPi.firmwareConfig = ''
-  #   dtparam=audio=on
-  # '';
-
-  ## Enable SPI
-  hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = true;
-  hardware.deviceTree = {
-    enable = true;
-    filter = lib.mkForce "*-rpi-4*.dtb";
-    overlays = [
-      {
-        name = "spi";
-        dtboFile = ./spi0-0cs.dtbo;
-      }
-    ];
-  };
-
-  users.groups.spi = {};
-
-  # services.udev.extraRules = ''
-  #   SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
-  # '';
-
-  ## Use GPIO as non-root
-  # Create gpio group
-  users.groups.gpio = {};
-
-  # Change permissions gpio devices
-  services.udev.extraRules = ''
-    SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
-
-    SUBSYSTEM=="bcm2835-gpiomem", KERNEL=="gpiomem", GROUP="gpio",MODE="0660"
-    SUBSYSTEM=="gpio", KERNEL=="gpiochip*", ACTION=="add", RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys/class/gpio/export /sys/class/gpio/unexport ; chmod 220 /sys/class/gpio/export /sys/class/gpio/unexport'"
-    SUBSYSTEM=="gpio", KERNEL=="gpio*", ACTION=="add",RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value ; chmod 660 /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value'"
-  '';
-
-  # Add user to group
-  users.users.julian.extraGroups = ["gpio"];
-
-  ## My own Piano LED Visualizer
-  services.piano-led-visualizer.enable = true;
-
-  ## Crude fix for avahi
-  systemd.timers.avahiRestart = {
-    description = "Restart avahi-daemon every 5 minutes";
-    wantedBy = ["timers.target"];
-    timerConfig = {
-      OnBootSec = "5min";
-      OnUnitActiveSec = "5min";
-      Unit = "avahiRestart.service";
-    };
-  };
-
-  systemd.services.avahiRestart = {
-    description = "Restart avahi-daemon service";
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.systemd}/bin/systemctl restart avahi-daemon.service";
-    };
-  };
-}

hosts/pianonix/hardware-configuration.nix

@@ -1,41 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-
-  boot.initrd.availableKernelModules = ["xhci_pci"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
-  boot.blacklistedKernelModules = ["snd_bcm2835"]; # Disables sound, required for ws281x to work
-  # boot.supportedFilesystems = lib.mkForce [
-  #   # remove zfs, since its incompatible with latest kernel
-  #   "vfat"
-  #   "ext4"
-  # ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXOS_SD";
-    fsType = "ext4";
-  };
-
-  swapDevices = [];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}

hosts/pianonix/secrets-vnc-passwd.bin

@@ -1,19 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:13hToequR4A=,iv:U7a6mIOYanQjozPrL92edFrhdyuSJj14pqVa2tGE/zA=,tag:uyeE3dj7NTKPi0jNLkFMLA==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXWEFYNThYQkpuTW10MjNM\nU3pWYmE5UnBPUzhQSTltc3hXdk9EWkg5czI0CmxnK3FuYitGci9ndnRCZms4a0lD\nOWh4alF1MEtJUis5YVNyYXRLbVppNnMKLS0tIEQ5WVVIMzlIV0pnc2ZWMnc5bjE4\nR3lpbzJiRmljcWI4SWlOS2svZVBSYnMKYIfhDjNZPDxmws3Z3P55K7V/NHiukQ0u\n00Kk603U+1JhgfJBk0Y3tMo//vKCHQj87wtZoqDLEN7Gu+ZtHhkhow==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjSVpBR1NPY0svSWNWYzFC\nZE1uTjZTRm9XM24wcXByajVDYUJ4Y3FmNUc0CkJMMXRtUE5mSjYwU25MYy9xNFlP\ndUNmYmJ5RVF0dG5LYjA4L1NnNEtCMVEKLS0tIFl0Slovd2NiWjg1VXJ1VDJwTWJQ\nTWFZeW1ZYisvenVycWYwZ1lkOXBaVVUKqGu6Q8IbiUAzazLKN95uAtmXJMPzx02u\nr/R8q7ugG8lX5pWX3H3P7vtBz57Oo3rWlRpUhN/4+PpijkJNUyr3XQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2024-12-01T16:14:57Z",
-		"mac": "ENC[AES256_GCM,data:zKz8OX1yi68Qn3X6HwdbgTCr/3ZVBh5Wz4KUACmWG3XhOEVi8uoDEdAxfKMDBqNzXLeDmxxTKj6TMLkk68ozDYJqu0OevVritnZqvBTr9VKGpMPBFN3DuaeqSZ6wjHGbce1iqO0kusnwopRbEWHmr/lZxiXTNgLPdN+p5Aszi54=,iv:resppfGPecKvKwqNwqecDBcXGhcTWSGZis8hf1jT0Us=,tag:V80P25Pr4HD9pUUrQHZSQg==,type:str]",
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.8.1"
-	}
-}

hosts/pianonix/secrets-wg-config.bin

@@ -1,19 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:SFc3K1hvBjeCS6ikLZl3vIPFJqsUrZZi9yO9tVuv14exKhOuK17HN/d+cYMtVxGwqQ/biFdXYdP8/sfTPwwZgd/wRLT2xRDMOg5ru7kj8sEhcOEYmrgYRLo3ImdWANFaxelWOmjEvzphTQ7guvXTo7BACUA9AygYa9Ou9bklYImWhOCsk8e9uz5afLZXscidiqUqqFuJNo3QGMDEAxFI2YC3OpLwEj5zlsI4AXEEHRVUxU1sVtspdolDaeiFIs/JW4jLu/2la6JyGJUluYXAThzL1LO39NA/MSNskMSedatz89vnCd9CP6Q3eT93vrUYAEY=,iv:e+tWIlHm4NH1w8AQAw6tvgCX9XOiroE1XmrSua3Bcg4=,tag:RwGpKtG9JzQ3TgcnzEV5Rg==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTYTFjRnpPVDAvQ0ZHZU0v\neEduOTVockFoZGhuMmZNd0w3bVFCVUQzUlI4CmZTaktOQWxrTDNpYXlPTm9SdlZZ\nN0dURmlHVFlHSjZpbkpGb09lTmVzWm8KLS0tIDhMWlFIRWFkQjcya0hjeUdUSklB\nbWlqNlVoR1BnWG9TM0RhWnI4a0J4YUEKGWIX77EVXYFVyA2u6CkF1cGfwd4Gq0Vb\nNqrlMUYEDZ5nO/eLWsAt2kj1/YFjkGw0iI02HLRHdxQ59vFyl3CS1Q==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tguyu2yd5xv8rgjjl50cq6dq5rr7umqgv098dgre4u9wyj30ea7sexw62c",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsNlZGdktzSGp0bzIyUjlR\nUU9LSXRrZTgxcEZwczhidWVOdGRnRFYrOVZZCmx3VzM4V2dsWmZpUWxNUG82MzU2\nT3dmQjRwdmRJbTJxVm9vQjJKU3JXSncKLS0tIFlhYy9uQW5aa1E0K3Q1RUFSQkZP\nR29sY3RCYVg5bGdqMU1uc0E3Szhmb0kKFzKHUVNDdHWfycb7xWeAyIVlC4ab7ivR\nVlfmbPAXq2THw/s4zk/ckfE5RP82a1aX4++XRa7fm5KXpI8vExjJ5A==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-10-14T06:56:31Z",
-		"mac": "ENC[AES256_GCM,data:DrcOET5U6veg0qhcBjQQ5neCdTUufMxhIz4ZQzvzd+YxKfAqaq8R1PW5VVlUjhDBaUH9i3J1Wj6X4E600uhayY0E9I5VqfO84hqlosfZWPiWPO8prK46Y7R3Ybdh9uvWQxiaSxy8KHXsdDgsBFLlmLe/QvsDSUv56rPofkm06vg=,iv:XBFP8ANpsszeXqQIE/v7+GmZGlFtxgE/EtgL/Cc3x+8=,tag:ZJgO+hLuwIatE55wo94RVw==,type:str]",
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.11.0"
-	}
-}

hosts/secrets-common.yaml

@@ -1,14 +1,8 @@
 #ENC[AES256_GCM,data:NSxfTl2hTXEoGl23aQnElG+df/1YzA==,iv:+oy9oITMGzdM2muDUPjwxJqUu1Bdyregl65/0hiulZ0=,tag:VKjforpyahKj0ktIN36gNw==,type:comment]
 julian-password: ENC[AES256_GCM,data:tgeu4uVI91j34+Gfzy2Uckmopj9bJNWiu65W0cdA76Kly3LH7RqXCq4rNM4DCwrsX3k9WdOlGX6T9edIjJgmbbe6MkeH7oQwiA==,iv:GE6zfSHymkAewjry7fofURz70az608+hja385LLeCIY=,tag:FqTopL5DyM3DTpa7AoGPDg==,type:str]
-wifi:
-    pianonix: ENC[AES256_GCM,data:Ty1wElfVj+CU9bTbpuYIk2dA4fgFm59PkQGqvODn51Q=,iv:bLomyTlOW2Z4rPbue7Klo6Jt5lR+44AuL+dIMFgDNAE=,tag:DuH2ayeb19dkPi9xmbAu3A==,type:str]
 syncthing:
     public-keys:
         aspi-nix: ENC[AES256_GCM,data:ZTykdQCyh4DMuQUCy1DSKsGNxxn1dinaqztpDdJY53pkWcW4YcWRHk94iGJQZgG1oLfr3AB2S3J6b9w2WuV3,iv:9z2ovHzq6JjRtHzNMIQtcUCinIjG/ImSGqqC7KPhpuw=,tag:No2LCjD+XXB77Su+s98MIA==,type:str]
-        pianonix: ENC[AES256_GCM,data:pUJPXH47VG363aIoxZwmbVe3uBoO7EO2TflK4f761C7PwD0tFNthZt9HRE6gQXAMQMF6qWzNK3CNGspSzKsE,iv:E89oz8BG5iQW/mRzdxSrYewGeVLiCrTcAF+c9ny6gPc=,tag:rLqwUmFDsaOMClR1tbE1sA==,type:str]
-    pianonix:
-        key: ENC[AES256_GCM,data:IaCXIRDMWCHj3lTKpkLg1Nd3pX4bktWg4WjZPGKgTBCLVkMi/SDtlaoNhDz+a+Vt6jYTXHS4exFnIVJ878nWSrA1sD2NHXmfsMh1kkLhub68qv0M33dBXvgX0vQ51Z1WMoti73yDUjJH8Ym5yF/SCg2+RbkVf+4pe2hSlAzwkGP6YC2rbCE5sZG31C55MkaGC6zwo2ZpZXdVhCW845SqAc11cF/OeEHb9B1FS3rd+El7rlJHrIEVQTkomNLshcspb13H0z3vNhtfu9pPkGxee8Hp/hEhFQ+waWBAg4w15yKihjHJmhzdjhDHCilvwYaceb7b5OwARuuiruQ+cJ40bdnStDpi2ouP8QJjEi7tmKWeplZ0X70PVZJFH/e/mTH5,iv:3hQMB4ka31w3chXXwjl/1IHF8ES/RobZVeugMC3ddlU=,tag:j8wwrNQUQbCEGtcriSpc4g==,type:str]
-        cert: ENC[AES256_GCM,data:v9LO8qpeGDDV6I+AJU5iTYKKBV6qgr1ddwLvBVEOYyvmtPNeqaatYaK6vMBCabBIhxQu2NC96pREvWu1UHbxaMWvSCT1TzrIPrcFm+gKCH6PIPhqcnQpdGa3OYn01ohThpLp8hEmVUpJ0FO/AnE1QHK0VfPqJ3S0uHLjSCBJtxLmcBWNVvlcTU/P68QIQkrYAQRAtz9aDS+JNpUKhwCJBgjpY1Thj8Lj/fpc1t0qWo3BKIL3eW5iSlUW0iEriFS0bkMr4Bi9mNqpO26l1eZ3IXFJy/7pkqhmXXW83qOaF9AFXgg41p1Kjw4G6isB/obuhR7Z4oQ/AtkSU0wxHP4mF0AWrvC7/YGlrDG9aPYUEWOexTTBHkm89PhgEa69sekbzac7mYYFi/MIdU34ks4oc8ZIChWpT+V66mbo4f+3mn7raih5SLnyEMS7ENBes9cQC7SghSpB7D8c/2+q74A5aEZHUWRhqiDEx9IggP43SiWuNnb/HyZw16RUB7xnQKPs7LzAVlLC6M7ZETUmyEDEWWOsDY8+0Li4wuD3z4WXLAD9nP43TMx4GNoafjG+0Gu05hSR8fWv8strRCtIWjzK3wMaD9VT/cbt2oqOBkJcaqIW8+lM+ktk1WsD4Kc1DQ4q5O2oMrdPOWI9xZOs7DQTFshLHuvxutN05vgEUovI1vbMOl7SIzUW8YUY9PN0ofC7zwQlEJxfOdqT0nwv9vmqikSMP6V3jXgP5OnPb4KVx8G27X0oCjN++dJgDxdkh2JiLR9JaJHNmYPtLlP7hU4NsBpRpd9ObxRlv+uIbF2o0I8PGXMo3IVnRjrFDrRyoth2UJ+YUMGCVuonoS+nZLMCNz1xwRMaZBYjSEESmxc2Ilwdu3XTzd1KF282UvumBpRwcNxvsmPhI84v/XV8TJE8Z7YxyO3RYBQHD5+OuHOHKTtlajnKpSp/m0p0QR7rrGFoDuDKp+Z81MKz8wz3/8GG+sDh0pgniUfNyrmLroLPdT6nj0brvSVWYmOIJHDHKqM+6HZok5PyS+uHlb5dzwnmrd9OmhmwPVdkP5s=,iv:X9VNz2nsN4ywu3E0c+agwZCl43I4bt6jHz0jMoMFTJQ=,tag:RZUWa4h5JoIiZaDrYgcAeg==,type:str]
 sops:
     age:
         - recipient: age1ee5udznhadk6m7jtglu4709rep080yjyd2ukzdl8jma4mm92y3psv0slpg
@@ -47,7 +41,7 @@ sops:
             VXhoN0VyWkVxMEJPQ3orVUNDK21rRU0KvnmuFxcCpP+LZg7v5jaStw9F0owVrQl9
             AkIq7GUJh7xewLxcVZfiBRpXMhw/mM8LYnd2KGP8R/TfYg+v0//+5A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-23T07:00:17Z"
+    lastmodified: "2026-03-23T19:37:41Z"
-    mac: ENC[AES256_GCM,data:JgaTIRbzD0hs2o86xUlQrPN2cPXvsuTH/zKG5xbQIDaYcEvD/mkuVa3hfnYKrA91kWg2Y1DgEi9583+o6UCl/+ldY4ptu+xpnYfyQFdhM4rB+KoP/pDt8vQKQ3zAX8fpAkugCgTTbuvm3TfQ1nt98V8boyhCn4JHNC1T0j7ZtZI=,iv:G3YJOLeDWDKuANo2mxS2JAdrRaonD87CU9BpCZZrlRs=,tag:mcKIdP5cSQUwNL2tcv/o6g==,type:str]
+    mac: ENC[AES256_GCM,data:nd4HHv/KfoLj5qGINngvWZX9XdYqtmJnUREo0BOO2JZgYR3AVw0ppmGhj1RFy1bVKdfll/fMoD5tGNc3UQJPB0j2g/1pj47AF44V0d1J79RP6dwov30rr0QnsXVt7P9EOFL/W6TRugYO9J7LZs+tpsSALfwNPTfnulSJQtaJdG4=,iv:EKfq4eKyv1HeMy/zS+V3OKpdL9IVjE5mg8iuz8OPgso=,tag:W8+CZLnYuNbnKRS1kqhY0w==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.1
+    version: 3.11.0

overlays/default.nix

@@ -22,7 +22,7 @@
   };
 
   # Adds my custom packages, available as pkgs.frajul.xyz
-  my-pkgs = final: prev: {frajul = import ../pkgs {pkgs = final;};};
+  frajul-pkgs = final: prev: {frajul = import ../packages {pkgs = final;};};
 
   nixpkgs-stable-unstable = final: prev: {
     unstable = import inputs.nixpkgs-unstable {

packages/default.nix

@@ -10,11 +10,9 @@
   sos = pkgs.callPackage ./sos {};
   xwacomcalibrate = pkgs.callPackage ./xwacomcalibrate {};
   acer-battery-health-mode = pkgs.callPackage ./acer-battery-health-mode {};
-  pob2 = pkgs.callPackage ./pob2 {};
   wl-ocr = pkgs.callPackage ./wl-ocr {};
   rtklib = pkgs.qt6Packages.callPackage ./rtklib {};
   typst-languagetool = pkgs.callPackage ./typst-languagetool {};
-  pob2-frajul = pkgs.callPackage ./pob2-frajul {};
 
   # rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {};
   # piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};

pkgs/pob2-frajul/default.nix

@@ -1,16 +0,0 @@
-{
-  writeShellApplication,
-  xhost,
-}:
-writeShellApplication {
-  name = "pob2-frajul";
-
-  runtimeInputs = [
-    xhost
-  ];
-
-  text = ''
-    xhost +
-    sudo -u pob -i sh /home/pob/pob2.sh
-  '';
-}

pkgs/pob2/default.nix

@@ -1,88 +0,0 @@
-{
-  pkgs,
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  unzip,
-  ...
-}: let
-  data = stdenv.mkDerivation (finalAttrs: {
-    pname = "path-of-building-data";
-    version = "dev-version";
-
-    src = fetchFromGitHub {
-      owner = "PathOfBuildingCommunity";
-      repo = "PathOfBuilding-PoE2";
-      rev = "3c579af5612d2137d37558d40d797801b5bbaa69";
-      hash = "sha256-hRS4k2V9Ze6dc7BMA0iZxjCOZgqPa3Cu7gRZiVLrFR4=";
-    };
-
-    nativeBuildInputs = [unzip];
-
-    buildCommand = ''
-      # I have absolutely no idea how this file is generated
-      # and I don't think I want to know. The Flatpak also does this.
-      unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua
-
-      # Install the actual data
-      cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out
-
-      # Pretend this is an official build so we don't get the ugly "dev mode" warning
-      substituteInPlace $out/manifest.xml --replace '<Version' '<Version platform="nixos"'
-      touch $out/installed.cfg
-
-      # Completely stub out the update check
-      chmod +w $out/src/UpdateCheck.lua
-      echo 'return "none"' > $out/src/UpdateCheck.lua
-    '';
-  });
-in
-  stdenv.mkDerivation {
-    pname = "path-of-building-2";
-    version = "${data.version}-unstable-2023-04-09";
-
-    src = fetchFromGitHub {
-      owner = "ernstp";
-      repo = "pobfrontend";
-      rev = "9faa19aa362f975737169824c1578d5011487c18";
-      hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk=";
-    };
-
-    nativeBuildInputs = with pkgs; [
-      meson
-      ninja
-      pkg-config
-      kdePackages.qttools
-      kdePackages.wrapQtAppsHook
-    ];
-    buildInputs = with pkgs; [
-      kdePackages.qtbase
-      luajit
-      luajit.pkgs.lua-curl
-    ];
-
-    installPhase = ''
-      runHook preInstall
-      install -Dm555 pobfrontend $out/bin/pobfrontend
-      runHook postInstall
-    '';
-
-    preFixup = ''
-      qtWrapperArgs+=(
-        --set LUA_PATH "$LUA_PATH"
-        --set LUA_CPATH "$LUA_CPATH"
-        --chdir "${data}"
-      )
-    '';
-
-    passthru.data = data;
-
-    meta = {
-      description = "Offline build planner for Path of Exile";
-      homepage = "https://pathofbuilding.community/";
-      license = lib.licenses.mit;
-      maintainers = [lib.maintainers.k900];
-      mainProgram = "pobfrontend";
-      broken = stdenv.isDarwin; # doesn't find uic6 for some reason
-    };
-  }