Install mise

.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/optional/binarycaches.nix

@@ -9,7 +9,7 @@
       "https://nix-community.cachix.org"
       "https://cache.nixos.org/"
       "https://hyprland.cachix.org"
-      "http://binarycache.julian-mutter.de"
+      # "http://binarycache.julian-mutter.de"
       "https://devenv.cachix.org"
     ];
     trusted-public-keys = [

features-nixos/optional/greetd.nix

@@ -1,7 +1,4 @@
-{config, ...}: let
+{
-  homeCfgs = config.home-manager.users;
-  julianCfg = homeCfgs.julian;
-in {
   users.extraUsers.greeter = {
     # For caching
     home = "/tmp/greeter-home";
@@ -10,12 +7,12 @@ in {
 
   programs.regreet = {
     enable = true;
-    iconTheme = julianCfg.gtk.iconTheme;
+    # iconTheme = julianCfg.gtk.iconTheme;
-    theme = julianCfg.gtk.theme;
+    # theme = julianCfg.gtk.theme;
-    # font = julianCfg.fontProfiles.regular; # TODO: do
+    # # font = julianCfg.fontProfiles.regular; # TODO: do
-    cursorTheme = {
+    # cursorTheme = {
-      inherit (julianCfg.gtk.cursorTheme) name package;
+    #   inherit (julianCfg.gtk.cursorTheme) name package;
-    };
+    # };
     cageArgs = [
       "-s"
       "-m"

features-nixos/optional/openssh.nix

@@ -15,7 +15,7 @@ in {
 
       # TODO: what does this do
       # Let WAYLAND_DISPLAY be forwarded
-      AcceptEnv = "WAYLAND_DISPLAY";
+      # AcceptEnv = "WAYLAND_DISPLAY";
       X11Forwarding = true;
     };
 

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,18 +1,70 @@
 {
   "nodes": {
-    "base16-schemes": {
+    "base16": {
+      "inputs": {
+        "fromYaml": "fromYaml"
+      },
+      "locked": {
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "base16.nix",
+        "type": "github"
+      }
+    },
+    "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1696158499,
+        "lastModified": 1765809053,
-        "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tomyun",
+        "repo": "base16-fish",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1776754714,
+        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
         "owner": "tinted-theming",
-        "repo": "base16-schemes",
+        "repo": "base16-helix",
-        "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
+        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
-        "repo": "base16-schemes",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732806396,
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
         "type": "github"
       }
     },
@@ -58,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769524058,
+        "lastModified": 1780290312,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
+        "rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
         "type": "github"
       },
       "original": {
@@ -71,6 +123,22 @@
         "type": "github"
       }
     },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1779670703,
+        "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -111,11 +179,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1768135262,
+        "lastModified": 1778716662,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -162,7 +251,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -178,21 +267,36 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "fromYaml": {
-      "inputs": {
+      "flake": false,
-        "systems": "systems_6"
-      },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1731966426,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "numtide",
+        "owner": "SenchoPens",
-        "repo": "flake-utils",
+        "repo": "fromYaml",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "SenchoPens",
-        "repo": "flake-utils",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767737596,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
         "type": "github"
       }
     },
@@ -203,16 +307,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1770260404,
+        "lastModified": 1780341248,
-        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
+        "narHash": "sha256-PPWavrpeQFqE3bEShp9xcWeh2xyVbUucjBbG64MLRl0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
+        "rev": "4baa8ac595f6122d2899093f575347af9c4e66d7",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -257,34 +361,6 @@
         "type": "github"
       }
     },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754860581,
-        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.1.1",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
     "music-reader": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -326,25 +402,6 @@
         "type": "github"
       }
     },
-    "nix-colors": {
-      "inputs": {
-        "base16-schemes": "base16-schemes",
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1707825078,
-        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
-        "owner": "misterio77",
-        "repo": "nix-colors",
-        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "misterio77",
-        "repo": "nix-colors",
-        "type": "github"
-      }
-    },
     "nix-gl": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -373,11 +430,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772945408,
+        "lastModified": 1780210899,
-        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
+        "narHash": "sha256-4axz3OBPTKa6LIkXV8n0lc63MQU+et2CB5DGobEAi6k=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
+        "rev": "97df9dc0b7c924344b793a15c1e8e4522ebb854e",
         "type": "github"
       },
       "original": {
@@ -444,12 +501,15 @@
       }
     },
     "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
       "locked": {
-        "lastModified": 1770882871,
+        "lastModified": 1780310866,
-        "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
+        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
+        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
         "type": "github"
       },
       "original": {
@@ -474,28 +534,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1697935651,
-        "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1770841267,
+        "lastModified": 1780243769,
-        "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -535,16 +580,29 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1770770419,
+        "lastModified": 1767892417,
-        "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1780203844,
+        "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
+        "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -555,44 +613,45 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_4"
-        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1769049374,
+        "lastModified": 1780214453,
-        "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
+        "narHash": "sha256-Bfq9y0X6Vs4UPb67u7hN3jt7fJKHtl3+g0lBSDebRNg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
+        "rev": "167da56c3ab1e51751a6ae4a997ed66587f9edae",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixvim",
         "type": "github"
       }
     },
-    "nuschtosSearch": {
+    "nur": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-parts": [
-        "ixx": "ixx",
+          "stylix",
+          "flake-parts"
+        ],
         "nixpkgs": [
-          "nixvim",
+          "stylix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1768249818,
+        "lastModified": 1779766384,
-        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
+        "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=",
-        "owner": "NuschtOS",
+        "owner": "nix-community",
-        "repo": "search",
+        "repo": "NUR",
-        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
+        "rev": "57800b7ab648725ccd33551d01484ee14952ad3f",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "owner": "nix-community",
-        "repo": "search",
+        "repo": "NUR",
         "type": "github"
       }
     },
@@ -603,17 +662,17 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "music-reader": "music-reader",
-        "nix-colors": "nix-colors",
         "nix-gl": "nix-gl",
         "nix-index-database": "nix-index-database",
         "nix-matlab": "nix-matlab",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "sheet-organizer": "sheet-organizer",
         "sops-nix": "sops-nix",
+        "stylix": "stylix",
         "systems": "systems_7",
         "yazi-flavors": "yazi-flavors"
       }
@@ -621,7 +680,7 @@
     "sheet-organizer": {
       "inputs": {
         "crane": "crane",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -647,11 +706,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770683991,
+        "lastModified": 1777944972,
-        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -660,6 +719,39 @@
         "type": "github"
       }
     },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-helix": "base16-helix",
+        "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-parts": "flake-parts_2",
+        "gnome-shell": "gnome-shell",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nur": "nur",
+        "systems": "systems_6",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
+      },
+      "locked": {
+        "lastModified": 1780256506,
+        "narHash": "sha256-wEXN/OoZt9HfsKBL6694p2Y9xRlwfUbdn/M107U8fVU=",
+        "owner": "nix-community",
+        "repo": "stylix",
+        "rev": "8ed48a41087feeb66372ff718021a9512fc552b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "stylix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -765,6 +857,70 @@
         "type": "github"
       }
     },
+    "tinted-kitty": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-kitty",
+        "type": "github"
+      }
+    },
+    "tinted-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777806186,
+        "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1778379944,
+        "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1778378178,
+        "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "9cd816033ff969415b190722cddf134e78a5665f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -786,11 +942,11 @@
     "yazi-flavors": {
       "flake": false,
       "locked": {
-        "lastModified": 1770522883,
+        "lastModified": 1780204176,
-        "narHash": "sha256-tCAJXPV7s1akc+zHGdWjmdMPG4NpBE92vcO7LAvI5TI=",
+        "narHash": "sha256-qWNArjWuxWL+rOjLzyIniW5hJgWiAWTCgXmMXJpaWZE=",
         "owner": "yazi-rs",
         "repo": "flavors",
-        "rev": "4c5753789ea535540e868e2764127be9230cef23",
+        "rev": "0f9204bc948c8313963f5c9d571a82edc201f8aa",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,20 +3,24 @@
 
   inputs = {
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     systems.url = "github:nix-systems/default-linux";
     nixos-hardware.url = "github:nixos/nixos-hardware";
     impermanence.url = "github:nix-community/impermanence";
-    nix-colors.url = "github:misterio77/nix-colors";
     deploy-rs.url = "github:serokell/deploy-rs";
 
+    stylix = {
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-index-database = {
@@ -42,7 +46,7 @@
       flake = false;
     };
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.11";
+      url = "github:nix-community/nixvim/nixos-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-matlab = {
@@ -76,10 +80,6 @@
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          config.permittedInsecurePackages = [
-            "olm-3.2.16"
-          ];
-          warn-dirty = false;
         }
     );
   in {
@@ -89,9 +89,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 +102,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 +131,7 @@
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;
+          pwd = "${self}";
         };
       };
       "julian@quickstart" = lib.homeManagerConfiguration {
@@ -178,22 +142,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 +159,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/direnv/default.nix

@@ -2,5 +2,6 @@
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
+    mise.enable = true;
   };
 }

homes/julian/features/emacs/default.nix

@@ -41,7 +41,7 @@ in {
       sqlite
 
       # Code formatters for use with doom emacs
-      nixfmt-rfc-style # nix
+      nixfmt # nix
       alejandra # nix
 
       nixd # nix lsp

homes/julian/features/fish/default.nix

@@ -5,7 +5,7 @@
 }:
 with lib; {
   home.file = {
-    ".config/starship.toml".source = ./starship.toml;
+    # ".config/starship.toml".source = ./starship.toml;
     ".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish;
   };
 

homes/julian/features/fonts/default.nix

@@ -7,6 +7,8 @@ with lib; {
   fonts.fontconfig.enable = true; # required to autoload fonts from packages
   home.packages = with pkgs; [
     nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
+
     font-awesome
     dejavu_fonts
     noto-fonts
@@ -16,5 +18,7 @@ with lib; {
     fira-code
     fira-code-symbols
     source-code-pro
+    source-sans
+    roboto
   ];
 }

homes/julian/features/gtk/default.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}: let
-  inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
-in {
-  # Do not make conditional, just toggle things on and off
-  imports = [inputs.nix-colors.homeManagerModules.default]; # TODO: what does this do
-
-  # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
-  gtk = {
-    enable = true;
-    theme = {
-      name = inputs.nix-colors.colorschemes.${config.colorscheme.name}.slug;
-      package = gtkThemeFromScheme {
-        scheme = inputs.nix-colors.colorschemes.${config.colorscheme.name};
-      };
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    cursorTheme = {
-      package = pkgs.apple-cursor;
-      name = "macOS";
-      size = 24;
-    };
-  };
-
-  xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
-}

homes/julian/features/hyprland/default.nix

@@ -4,12 +4,7 @@
   config,
   lib,
   ...
-}: let
+}: {
-  inherit
-    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
-    palette
-    ;
-in {
   imports = [
     # inputs.hyprland.homeManagerModules.default
     ./waybar
@@ -119,6 +114,8 @@ in {
     #   }
     # );
 
+    configType = "lua";
+
     systemd = {
       enable = true;
       # Same as default, but stop graphical-session too
@@ -183,6 +180,16 @@ in {
       };
     };
 
+    # Disable animations for selection, fixes screenshots
+    extraConfig = ''
+      # layerrule {
+      #   name = no_anim_for_selection
+      #   no_anim = on
+      #   match:namespace = selection
+      # }
+      layerrule = noanim, selection
+    '';
+
     settings = {
       "$mod" = "SUPER";
 
@@ -204,9 +211,6 @@ in {
         gaps_out = 5;
 
         layout = "dwindle";
-
-        # "col.active_border" = "0xff${palette.base0C} 0xff${palette.base0D} 270deg";
-        # "col.inactive_border" = "0xff${palette.base00}";
       };
 
       decoration = {
@@ -246,7 +250,7 @@ in {
       };
 
       exec = [
-        "hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
+        # "hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
         "correct-workspace-locations"
       ];
 
@@ -435,18 +439,6 @@ in {
               "$mod SHIFT,W,exec,${makoctl} restore"
             ]
         );
-
-      # plugin = {
-      #   hyprbars = {
-      #     bar_text_size = 10;
-      #     bar_height = 16;
-      #     bar_text_font = "Ubuntu Nerd Font";
-      #     bar_precedence_over_border = true;
-      #     bar_color = "rgb(${palette.base01})";
-
-      #     hyprbars-button = [ "rgb(${palette.base03}), 14, 󰖭, hyprctl dispatch killactive" ];
-      #   };
-      # };
     };
   };
 }

homes/julian/features/hyprland/hyprlock/default.nix

@@ -1,16 +1,4 @@
 {
-  options,
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: let
-  inherit
-    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
-    palette
-    ;
-in {
   programs.hyprlock.enable = true;
   programs.hyprlock.settings = {
     general = {
@@ -19,15 +7,6 @@ in {
       ignore_empty_input = true;
     };
 
-    background = [
-      {
-        color = "#${palette.base00}";
-        # path = "screenshot";
-        # blur_passes = 3;
-        # blur_size = 8;
-      }
-    ];
-
     input-field = [
       {
         size = "200, 50";
@@ -35,9 +14,6 @@ in {
         monitor = "";
         dots_center = true;
         fade_on_empty = false;
-        font_color = "#${palette.base0B}";
-        inner_color = "#${palette.base01}";
-        outer_color = "#${palette.base05}";
         outline_thickness = 5;
         placeholder_text = "Password...";
       }

homes/julian/features/hyprland/mako/default.nix

@@ -1,30 +1,10 @@
-{
+{pkgs, ...}: {
-  options,
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: let
-  inherit
-    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
-    palette
-    ;
-in {
   home.packages = with pkgs; [libnotify];
 
   services.mako = {
     enable = true;
     settings = {
       defaultTimeout = "5000"; # milliseconds, can be overwritten by notification sender
-      backgroundColor = "#${palette.base00}";
-      textColor = "#${palette.base05}";
-      borderColor = "#${palette.base0D}";
-      progressColor = "over #${palette.base02}";
-      extraConfig = ''
-          [urgency=high]
-          border-color=#${palette.base09}
-        # '';
     };
   };
 }

homes/julian/features/hyprland/swayidle.nix

@@ -31,7 +31,7 @@
 in {
   services.swayidle = {
     enable = true;
-    systemdTarget = "graphical-session.target";
+    systemdTargets = ["graphical-session.target"];
     timeouts =
       # Lock screen
       [

homes/julian/features/hyprland/swaylock.nix

@@ -1,14 +1,7 @@
 {
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (config.colorscheme) colors;
-in {
   programs.swaylock = {
     enable = true;
     settings = {
-      color = "000000";
       ignore-empty-password = true;
       indicator-idle-visible = false;
     };

homes/julian/features/hyprland/waybar/default.nix

@@ -1,12 +1,5 @@
-{
+{config, ...}: let
-  options,
+  palette = config.lib.stylix.colors;
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: let
-  palette = (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}).palette;
 in {
   programs.waybar = {
     enable = true;
@@ -14,23 +7,23 @@ in {
     settings.mainBar = builtins.fromJSON (builtins.readFile ./config.json);
   };
 
-  xdg.configFile."waybar/style.css".source = ./style.css;
+  # xdg.configFile."waybar/style.css".source = ./style.css;
-  xdg.configFile."waybar/theme.css".text = ''
+  # xdg.configFile."waybar/theme.css".text = ''
-    /*
+  #   /*
-    bg - background
+  #   bg - background
-    fg - foreground
+  #   fg - foreground
-    */
+  #   */
 
-    /* Main Colors */
+  #   /* Main Colors */
-    @define-color background        #${palette.base00};
+  #   @define-color background        #${palette.base00};
-    @define-color foreground        #${palette.base05};
+  #   @define-color foreground        #${palette.base05};
 
-    /* Workspace Button Colors */
+  #   /* Workspace Button Colors */
-    @define-color hover-bg          #${palette.base01};
+  #   @define-color hover-bg          #${palette.base01};
-    @define-color hover-fg          #${palette.base05};
+  #   @define-color hover-fg          #${palette.base05};
-    @define-color active-bg         #${palette.base02};
+  #   @define-color active-bg         #${palette.base02};
-    @define-color active-fg         #${palette.base0A};
+  #   @define-color active-fg         #${palette.base0A};
-    @define-color urgent-bg         #${palette.base08};
+  #   @define-color urgent-bg         #${palette.base08};
-    @define-color urgent-fg         #${palette.base00};
+  #   @define-color urgent-fg         #${palette.base00};
-  '';
+  # '';
 }

homes/julian/features/hyprland/wlogout/default.nix

@@ -1,39 +1,3 @@
-{
+{pkgs, ...}: {
-  options,
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: let
-  inherit
-    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
-    palette
-    ;
-in {
   home.packages = with pkgs; [wlogout];
-
-  # xdg.configFile."wlogout/style.css".text = ''
-  #    * {
-  #      all: unset;
-  #      font-family: JetBrains Mono Nerd Font;
-  #    }
-
-  #    window {
-  #      background-color: #${palette.base00};
-  #    }
-
-  #    button {
-  #      color: #${palette.base01};
-  #      font-size: 64px;
-  #      background-color: rgba(0,0,0,0);
-  #      outline-style: none;
-  #      margin: 5px;
-  #   }
-
-  #    button:focus, button:active, button:hover {
-  #      color: #${palette.base0D};
-  #      transition: ease 0.4s;
-  #    }
-  # '';
 }

homes/julian/features/hyprland/wofi/default.nix

@@ -1,86 +1,5 @@
-{
+{pkgs, ...}: {
-  options,
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: let
-  inherit
-    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
-    palette
-    ;
-in {
   home.packages = with pkgs; [wofi];
 
   xdg.configFile."wofi/config".source = ./config;
-  xdg.configFile."wofi/style.css".text = ''
-    window {
-        margin: 5px;
-        border: 5px solid #181926;
-        background-color: #${palette.base00};
-        border-radius: 15px;
-        font-family: "JetBrainsMono";
-        font-size: 14px;
-      }
-
-      #input {
-        all: unset;
-        min-height: 36px;
-        padding: 4px 10px;
-        margin: 4px;
-        border: none;
-        color: #${palette.base05};
-        font-weight: bold;
-        background-color: #${palette.base01};
-        outline: none;
-        border-radius: 15px;
-        margin: 10px;
-        margin-bottom: 2px;
-      }
-
-      #inner-box {
-        margin: 4px;
-        padding: 10px;
-        font-weight: bold;
-        border-radius: 15px;
-      }
-
-      #outer-box {
-        margin: 0px;
-        padding: 3px;
-        border: none;
-        border-radius: 15px;
-        border: 5px solid #${palette.base01};
-      }
-
-      #scroll {
-        margin-top: 5px;
-        border: none;
-        border-radius: 15px;
-        margin-bottom: 5px;
-      }
-
-      #text:selected {
-        color: #${palette.base01};
-        margin: 0px 0px;
-        border: none;
-        border-radius: 15px;
-      }
-
-      #entry {
-        margin: 0px 0px;
-        border: none;
-        border-radius: 15px;
-        background-color: transparent;
-      }
-
-      #entry:selected {
-        margin: 0px 0px;
-        border: none;
-        border-radius: 15px;
-        background: #${palette.base0D};
-        background-size: 400% 400%;
-      }
-  '';
 }

homes/julian/features/i3/default.nix

@@ -22,9 +22,9 @@
   # Prevent screen from going blank (check these settings with `xset q`)
   # And disable bell sound (b)
   xsession.initExtra = ''
-    ${pkgs.xorg.xset}/bin/xset s off
+    ${pkgs.xset}/bin/xset s off
-    ${pkgs.xorg.xset}/bin/xset -dpms
+    ${pkgs.xset}/bin/xset -dpms
-    ${pkgs.xorg.xset}/bin/xset b off
+    ${pkgs.xset}/bin/xset b off
   '';
   xsession.windowManager.i3 = {
     enable = true;

homes/julian/features/neovim/default.nix

@@ -18,7 +18,7 @@
     fd
     stylua
     black
-    nixfmt-rfc-style # nixfmt
+    nixfmt # nixfmt
   ];
 
   programs.nixvim = {

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

@@ -37,7 +37,7 @@
     usbutils # lsusb
     wget
     wireguard-tools # wg-quick
-    xorg.xkill
+    xkill
     zip
     dig
 

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

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [../../gtk];
+  imports = [./stylix.nix];
 
   services.blueman-applet.enable = true;
   services.nextcloud-client.enable = true;
@@ -39,7 +39,7 @@
     # kitty # Terminal, already available as feature
     libnotify
     libreoffice
-    mate.engrampa
+    engrampa
     nomacs # Image viewer
     kdePackages.okular # Pdf reader with many features, good for commenting documents
     pavucontrol
@@ -52,12 +52,11 @@
     # 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
+    wineWow64Packages.stable # 32-bit and 64-bit wine
     winetricks
     xclip # x11 clipboard access from terminal
-    xfce.mousepad # simple text editor
+    mousepad # simple text editor
     xournalpp # Edit pdf files
     zoom-us # Video conferencing
     zotero # Manage papers and other sources
@@ -69,6 +68,5 @@
     ## My scripts
     frajul.open-messaging
     frajul.xwacomcalibrate
-    frajul.pob2-frajul
   ];
 }

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

@@ -0,0 +1,10 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [inputs.stylix.homeModules.stylix];
+
+  stylix.enable = true;
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+}

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

@@ -65,9 +65,13 @@
     sops
     pandoc # markdown preview
     docker-compose
+    mise
+
+    mise
 
     ## My scripts
     frajul.deploy-to-pianopi
+    frajul.smath-studio
     # frajul.rtklib
 
     (pkgs.writeShellScriptBin "matlab-rsp" ''

homes/julian/features/yazi/default.nix

@@ -16,11 +16,8 @@
     xclip
   ];
 
-  home.shellAliases = {
-    y = "yy"; # Yazi shell wrapper (cd on quit)
-  };
-
   programs.yazi.enable = true;
+  programs.yazi.shellWrapperName = "y";
   programs.yazi.enableFishIntegration = true;
   programs.yazi.settings.manager = {
     sort_by = "mtime";

homes/julian/features/zsh/default.nix

@@ -3,9 +3,9 @@
   pkgs,
   ...
 }: {
-  home.file = {
+  # home.file = {
-    ".config/starship.toml".source = ./starship.toml;
+  #   ".config/starship.toml".source = ./starship.toml;
-  };
+  # };
 
   home.packages = with pkgs; [starship];
 

homes/julian/global/mimeapps.nix

@@ -20,8 +20,8 @@
     "text/calendar" = thunderbird;
     "application/x-extension-ics" = thunderbird;
     "x-scheme-handler/webcals" = thunderbird;
-    "application/zip" = mate.engrampa;
+    "application/zip" = engrampa;
-    "text/plain" = xfce.mousepad;
+    "text/plain" = mousepad;
     "image/jpeg" = nomacs;
     "application/pdf" = evince;
     "text/html" = firefox;

homes/julian/hm-standalone-config.nix

@@ -1,18 +1,5 @@
 # Only apply this to home-manager standalone
 {outputs, ...}: {
-  # Apply overlays
-  nixpkgs = {
-    overlays = builtins.attrValues outputs.overlays;
-    config = {
-      allowUnfree = true;
-      allowUnfreePredicate = _: true; # TODO: what is this
-      permittedInsecurePackages = [
-        "olm-3.2.16"
-      ];
-      warn-dirty = false;
-    };
-  };
-
   # Expire old hm generations
   hm-expire = {
     enable = true;

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"
-    '';
-  };
-}

homes/julian/v3ms/default.nix

@@ -14,6 +14,7 @@
     ../features/emacs
     ../features/nix-helper
     ../features/qt-distrobox
+    ../features/tmux
   ];
 
   hostName = "aspi";

homes/julian/v3ms/packages.nix

@@ -39,4 +39,5 @@ with pkgs; [
   devbox # reproducible dev envs based on nix
 
   mysql80
+  devenv
 ]

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,10 @@
   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 {};
+  smath-studio = pkgs.callPackage ./smath-studio.nix {};
 
   # rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {};
   # piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};

packages/open-messaging/default.nix

@@ -3,7 +3,7 @@
   element-desktop,
   telegram-desktop,
   thunderbird,
-  discord, # TODO: discord not available for aarch64, this leads to flake evaluation for this arch fail.
+  # discord, # TODO: discord not available for aarch64, this leads to flake evaluation for this arch fail.
 }:
 writeShellApplication {
   name = "open-messaging";
@@ -12,7 +12,7 @@ writeShellApplication {
     element-desktop
     telegram-desktop
     thunderbird
-    discord
+    # discord
   ];
 
   text = ''
@@ -21,7 +21,7 @@ writeShellApplication {
     element-desktop &
     sleep 0.1
     Telegram &
-    sleep 0.1
+    # sleep 0.1
-    discord &
+    # discord &
   '';
 }

packages/smath-studio.nix

@@ -0,0 +1,35 @@
+{
+  appimageTools,
+  fetchurl,
+  libgdiplus,
+}: let
+  pname = "smath-studio";
+  version = "1.3.0.9126";
+
+  src = fetchurl {
+    url = "https://smath.com/en-US/files/Download/cqSek/SMathStudioDesktop.1_3_0_9126.x86_64.ubuntu-22_04.glibc2.35.AppImage";
+    hash = "sha256-4FpdFGPFaPDK6WWSJHVtxcC8auaNkGmHyUtbegij6cQ=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+  appimageTools.wrapType2 {
+    inherit pname version src;
+
+    extraPkgs = pkgs:
+      with pkgs; [
+        gtk2
+      ];
+
+    profile = ''
+      export LD_PRELOAD="${libgdiplus}/lib/libgdiplus.so.0"
+    '';
+
+    extraInstallCommands = ''
+      install -m 444 -D ${appimageContents}/*.desktop -t $out/share/applications
+      sed -i "s|^Exec=.*|Exec=smath-studio %U|" $out/share/applications/*.desktop
+      cp -r ${appimageContents}/usr/share/icons $out/share
+    '';
+  }

packages/xwacomcalibrate/default.nix

@@ -1,7 +1,8 @@
 {
   writeShellApplication,
   xf86_input_wacom,
-  xorg,
+  xwininfo,
+  xrandr,
   xdotool,
   bc,
 }:
@@ -10,8 +11,8 @@ writeShellApplication {
 
   runtimeInputs = [
     xf86_input_wacom
-    xorg.xwininfo
+    xwininfo
-    xorg.xrandr
+    xrandr
     xdotool
     bc
   ];

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
-    };
-  }