Migrate Hyprland to Lua config, drop dead flake inputs, general cleanup

Hyprland
- Switch wayland.windowManager.hyprland to configType = "lua" (Hyprland 0.56)
- Convert settings, env, monitors, window rules, gesture, animations
  (hl.curve/hl.animation) and all keybinds to hl.* calls
- Add home/system/hyprland/lib.nix with exec/bind/execOnce helpers;
  every exec-once now runs from a hyprland.start hook
- Drop hard-coded default_monitor = "eDP-2"

Flake
- Remove blog, awesome-wallpapers and default-creds inputs (their repos
  no longer ship a flake.nix and broke `nix flake update`), along with
  the server modules and Glance links that used them
- Update flake.lock
- Replace removed `gcr` with `gcr_4`

Fixes
- Point configDirectory at /etc/nixos/nixy on home-pc and thinkpad
- Fix home-pc git email typo
- Remove conflicting openpgp signing format, make pull.rebase a boolean,
  replace hx/peco in git aliases with nvim/sk
- Fix zsh NUL alias (2>&1) and stop forcing bat colors in the cat alias
- Require a password for sudo again (nixos-rebuild stays NOPASSWD)
- Remove duplicate hardware.graphics block from home-pc flake
- Delete unused zen .old files, run alejandra on host files

.gitignore

@@ -3,3 +3,4 @@
 old/
 result/
 result
+backups/

flake.nix

@@ -9,11 +9,9 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     stylix.url = "github:danth/stylix";
     sops-nix.url = "github:Mic92/sops-nix";
     nvf.url = "github:notashelf/nvf";
-    notashelf-tuigreet.url = "github:NotAShelf/tuigreet";
     helium-browser.url = "github:oxcl/nix-flake-helium-browser";
     nur-anotherhadi.url = "github:anotherhadi/nur-packages";
     nix-citizen.url = "github:LovingMelody/nix-citizen";
@@ -43,9 +41,6 @@
 
     # Server
     nixarr.url = "github:rasmus-kirk/nixarr";
-    default-creds.url = "github:anotherhadi/default-creds";
-    blog.url = "github:anotherhadi/blog";
-    awesome-wallpapers.url = "github:anotherhadi/awesome-wallpapers";
     iknowyou.url = "github:anotherhadi/iknowyou";
   };
 

home/programs/git/default.nix

@@ -21,7 +21,7 @@ in {
       user.name = username;
       user.email = email;
       init.defaultBranch = "main";
-      pull.rebase = "false";
+      pull.rebase = false;
       push.autoSetupRemote = true;
       color.ui = "1";
       alias = {
@@ -43,10 +43,10 @@ in {
         af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
         st = "status";
         br = "branch";
-        df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
+        df = "!git hist | sk | awk '{print $2}' | xargs -I {} git diff {}^ {}";
         hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
         llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
-        edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
+        edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; nvim `f`";
       };
     };
   };

home/programs/git/signing.nix

@@ -4,7 +4,6 @@
   home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
 
   programs.git = {
-    signing.format = "openpgp";
     settings = {
       commit.gpgsign = true;
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";

home/programs/nvf/languages.nix

@@ -83,7 +83,7 @@
       go.enable = true;
       markdown = {
         enable = true;
-        format.type = ["prettierd"];
+        format.type = ["prettier"];
         extensions = {
           markview-nvim = {
             enable = true;

home/programs/proton/auto-start-vpn.nix

@@ -1,5 +1,7 @@
-{
-  wayland.windowManager.hyprland.settings.exec-once = [
+{lib, ...}: let
+  hl = import ../../system/hyprland/lib.nix {inherit lib;};
+in {
+  wayland.windowManager.hyprland.settings.on = hl.execOnce [
     "protonvpn-app --start-minimized &"
   ];
 }

home/programs/shell/zsh.nix

@@ -51,7 +51,7 @@
       cd = "z";
       ls = "eza --icons=always --no-quotes";
       tree = "eza --icons=always --tree --no-quotes";
-      cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
+      cat = "bat --theme=base16 --paging=never --tabs=2 --wrap=never --plain";
       mkdir = "mkdir -p";
 
       # Shortcuts
@@ -112,7 +112,7 @@
         alias -g C="| wl-copy"
         alias -g NE="2>/dev/null"
         alias -g ND=">/dev/null"
-        alias -g NUL=">/dev/null 2>1"
+        alias -g NUL=">/dev/null 2>&1"
 
         # search history based on what's typed in the prompt
         autoload -U history-search-end

home/programs/zen/default.nix.old

@@ -1,62 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  programs.zen-browser = {
-    enable = true;
-
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-
-      OfferToSaveLogins = false;
-      PasswordManagerEnabled = false;
-
-      AutofillAddressEnabled = false;
-      AutofillCreditCardEnabled = false;
-
-      DontCheckDefaultBrowser = true;
-
-      DNSOverHTTPS = {
-        Enabled = true;
-        ProviderURL = "https://dns.quad9.net/dns-query";
-        Locked = true;
-      };
-    };
-
-    profiles.default = {
-      search = {
-        force = true;
-        default = "Startpage";
-      };
-
-      settings = {
-        "browser.startup.homepage" = "https://duckduckgo.com";
-
-        "browser.newtabpage.enabled" = false;
-
-        "privacy.resistFingerprinting" = true;
-        "privacy.trackingprotection.enabled" = true;
-
-        "geo.enabled" = false;
-        "dom.webnotifications.enabled" = false;
-
-        "signon.rememberSignons" = false;
-
-        "toolkit.telemetry.enabled" = false;
-      };
-
-      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-        ublock-origin
-        firefox-multi-account-containers
-        noscript
-      ];
-    };
-  };
-
-  home.sessionVariables.BROWSER = "zen";
-}

home/programs/zen/system.nix.old

@@ -1,24 +0,0 @@
-{
-  programs.zen-browser = {
-    enable = true;
-
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-
-      OfferToSaveLogins = false;
-      PasswordManagerEnabled = false;
-
-      DNSOverHTTPS = {
-        Enabled = true;
-        ProviderURL = "https://dns.quad9.net/dns-query";
-        Locked = true;
-      };
-
-      Homepage = {
-        URL = "https://duckduckgo.com";
-        StartPage = "homepage";
-      };
-    };
-  };
-}

home/system/caelestia-shell/default.nix

@@ -5,7 +5,9 @@
   inputs,
   lib,
   ...
-}: {
+}: let
+  hl = import ../hyprland/lib.nix {inherit lib;};
+in {
   imports = [
     inputs.caelestia-shell.homeManagerModules.default
     ./bar.nix
@@ -50,7 +52,7 @@
     gpu-screen-recorder
   ];
 
-  wayland.windowManager.hyprland.settings.exec-once = [
+  wayland.windowManager.hyprland.settings.on = hl.execOnce [
     "uwsm app -- caelestia resizer -d"
     "uwsm app -- caelestia shell -d"
     "caelestia scheme set -n onedark"

home/system/hyprland/animations.nix

@@ -1,52 +1,67 @@
-{config, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
   animationSpeed = config.theme.animation-speed;
 
   animationDuration =
     if animationSpeed == "slow"
-    then "4"
+    then 4
     else if animationSpeed == "medium"
-    then "2.5"
-    else "1.5";
+    then 2.5
+    else 1.5;
   borderDuration =
     if animationSpeed == "slow"
-    then "10"
+    then 10
     else if animationSpeed == "medium"
-    then "6"
-    else "3";
+    then 6
+    else 3;
+  bezier = points: {
+    type = "bezier";
+    inherit points;
+  };
+  curves = {
+    linear = [[0 0] [1 1]];
+    md3_standard = [[0.2 0] [0 1]];
+    md3_decel = [[0.05 0.7] [0.1 1]];
+    md3_accel = [[0.3 0] [0.8 0.15]];
+    overshot = [[0.05 0.9] [0.1 1.1]];
+    crazyshot = [[0.1 1.5] [0.76 0.92]];
+    hyprnostretch = [[0.05 0.9] [0.1 1.0]];
+    menu_decel = [[0.1 1] [0 1]];
+    menu_accel = [[0.38 0.04] [1 0.07]];
+    easeInOutCirc = [[0.85 0] [0.15 1]];
+    easeOutCirc = [[0 0.55] [0.45 1]];
+    easeOutExpo = [[0.16 1] [0.3 1]];
+    softAcDecel = [[0.26 0.26] [0.15 1]];
+    md2 = [[0.4 0] [0.2 1]];
+  };
+
+  anim = leaf: speed: bezier: extra:
+    {
+      inherit leaf speed bezier;
+      enabled = true;
+    }
+    // extra;
 in {
   wayland.windowManager.hyprland.settings = {
-    animations = {
-      enabled = true;
-      bezier = [
-        "linear, 0, 0, 1, 1"
-        "md3_standard, 0.2, 0, 0, 1"
-        "md3_decel, 0.05, 0.7, 0.1, 1"
-        "md3_accel, 0.3, 0, 0.8, 0.15"
-        "overshot, 0.05, 0.9, 0.1, 1.1"
-        "crazyshot, 0.1, 1.5, 0.76, 0.92"
-        "hyprnostretch, 0.05, 0.9, 0.1, 1.0"
-        "menu_decel, 0.1, 1, 0, 1"
-        "menu_accel, 0.38, 0.04, 1, 0.07"
-        "easeInOutCirc, 0.85, 0, 0.15, 1"
-        "easeOutCirc, 0, 0.55, 0.45, 1"
-        "easeOutExpo, 0.16, 1, 0.3, 1"
-        "softAcDecel, 0.26, 0.26, 0.15, 1"
-        "md2, 0.4, 0, 0.2, 1"
-      ];
+    config.animations.enabled = true;
+
+    curve = lib.mapAttrsToList (name: points: {_args = [name (bezier points)];}) curves;
 
     animation = [
-        "windows, 1, ${animationDuration}, md3_decel, popin 60%"
-        "windowsIn, 1, ${animationDuration}, md3_decel, popin 60%"
-        "windowsOut, 1, ${animationDuration}, md3_accel, popin 60%"
-        "border, 1, ${borderDuration}, default"
-        "fade, 1, ${animationDuration}, md3_decel"
-        "layersIn, 1, ${animationDuration}, menu_decel, slide"
-        "layersOut, 1, ${animationDuration}, menu_accel"
-        "fadeLayersIn, 1, ${animationDuration}, menu_decel"
-        "fadeLayersOut, 1, ${animationDuration}, menu_accel"
-        "workspaces, 1, ${animationDuration}, menu_decel, slide"
-        "specialWorkspace, 1, ${animationDuration}, md3_decel, slidevert"
+      (anim "windows" animationDuration "md3_decel" {style = "popin 60%";})
+      (anim "windowsIn" animationDuration "md3_decel" {style = "popin 60%";})
+      (anim "windowsOut" animationDuration "md3_accel" {style = "popin 60%";})
+      (anim "border" borderDuration "default" {})
+      (anim "fade" animationDuration "md3_decel" {})
+      (anim "layersIn" animationDuration "menu_decel" {style = "slide";})
+      (anim "layersOut" animationDuration "menu_accel" {})
+      (anim "fadeLayersIn" animationDuration "menu_decel" {})
+      (anim "fadeLayersOut" animationDuration "menu_accel" {})
+      (anim "workspaces" animationDuration "menu_decel" {style = "slide";})
+      (anim "specialWorkspace" animationDuration "md3_decel" {style = "slidevert";})
     ];
   };
-  };
 }

home/system/hyprland/bindings.nix

@@ -4,12 +4,11 @@
   config,
   pkgs-nur-hadi,
   ...
-}:
-let
+}: let
+  hl = import ./lib.nix {inherit lib;};
   colors = config.lib.stylix.colors;
 
-  mkMenu = menu:
-    let
+  mkMenu = menu: let
     configFile = pkgs.writeText "config.yaml" (
       lib.generators.toYAML {} {
         anchor = "bottom-right";
@@ -220,18 +219,12 @@ let
       cmd = "systemctl reboot";
     }
   ];
-in
-{
+in {
   wayland.windowManager.hyprland.settings = {
-    "$mod" = "SUPER";
-    "$shiftMod" = "SUPER_SHIFT";
-
     bind =
       [
         # Applications
-        (
-          "$shiftMod, A, exec, "
-          + lib.getExe (mkMenu [
+        (hl.bind "SUPER + SHIFT + A" (hl.exec (lib.getExe (mkMenu [
             {
               key = "a";
               desc = "Apps";
@@ -257,15 +250,13 @@ in
               desc = "System";
               cmd = lib.getExe systemMenu;
             }
-          ])
-        )
+          ])))
+          null)
 
-        "$mod,B, exec, uwsm app -- ${config.programs.librewolf.package}/bin/helium" # Browser
+        (hl.bind "SUPER + B" (hl.exec "uwsm app -- ${config.programs.librewolf.package}/bin/helium") null) # Browser
 
         # Power
-        (
-          "$mod, X, exec, "
-          + lib.getExe (mkMenu [
+        (hl.bind "SUPER + X" (hl.exec (lib.getExe (mkMenu [
             {
               key = "l";
               desc = "Lock";
@@ -296,69 +287,100 @@ in
               desc = "Restart Waybar";
               cmd = "pkill -x waybar; waybar";
             }
-          ])
-        )
+          ])))
+          null)
 
         # Quick launch
-        "$mod,RETURN, exec, uwsm app -- ${pkgs.ghostty}/bin/ghostty" # Ghostty (terminal)
-        "$mod,E, exec,  uwsm app -- ${pkgs.thunar}/bin/thunar" # Thunar
-        "$mod, SPACE, exec, walker" # Launcher
-        "$mod, N, exec, ${lib.getExe pkgs.grimblast} save area" # Save screenshot
-        "$mod, D, exec, ${lib.getExe pkgs.grimblast} copy area" # Copy screenshot
+        (hl.bind "SUPER + RETURN" (hl.exec "uwsm app -- ${pkgs.ghostty}/bin/ghostty") null) # Ghostty (terminal)
+        (hl.bind "SUPER + E" (hl.exec "uwsm app -- ${pkgs.thunar}/bin/thunar") null) # Thunar
+        (hl.bind "SUPER + SPACE" (hl.exec "walker") null) # Launcher
+        (hl.bind "SUPER + N" (hl.exec "${lib.getExe pkgs.grimblast} save area") null) # Save screenshot
+        (hl.bind "SUPER + D" (hl.exec "${lib.getExe pkgs.grimblast} copy area") null) # Copy screenshot
 
         # Windows
-        "$mod,Q, killactive," # Close window
-        "$mod,F, fullscreen" # Toggle Fullscreen
-        "$shiftMod,F, togglefloating," # Toggle Floating
+        (hl.bind "SUPER + Q" (hl.mkLuaInline "hl.dsp.window.close()") null) # Close window
+        (hl.bind "SUPER + F" (hl.mkLuaInline ''hl.dsp.window.fullscreen({ mode = "fullscreen" })'') null) # Toggle Fullscreen
+        (hl.bind "SUPER + SHIFT + F" (hl.mkLuaInline ''hl.dsp.window.float({ action = "toggle" })'') null) # Toggle Floating
 
         # Focus Windows
-        "$mod,H, movefocus, l" # Move focus left
-        "$mod,J, movefocus, d" # Move focus Down
-        "$mod,K, movefocus, u" # Move focus Up
-        "$mod,L, movefocus, r" # Move focus Right
-        "$shiftMod,H, focusmonitor, -1" # Focus previous monitor
-        "$shiftMod,J, layoutmsg, removemaster" # Remove from master
-        "$shiftMod,K, layoutmsg, addmaster" # Add to master
-        "$shiftMod,L, focusmonitor, 1" # Focus next monitor
+        (hl.bind "SUPER + H" (hl.mkLuaInline ''hl.dsp.focus({ direction = "left" })'') null) # Move focus left
+        (hl.bind "SUPER + J" (hl.mkLuaInline ''hl.dsp.focus({ direction = "down" })'') null) # Move focus Down
+        (hl.bind "SUPER + K" (hl.mkLuaInline ''hl.dsp.focus({ direction = "up" })'') null) # Move focus Up
+        (hl.bind "SUPER + L" (hl.mkLuaInline ''hl.dsp.focus({ direction = "right" })'') null) # Move focus Right
+        (hl.bind "SUPER + SHIFT + H" (hl.mkLuaInline ''hl.dsp.focus({ monitor = "-1" })'') null) # Focus previous monitor
+        (hl.bind "SUPER + SHIFT + J" (hl.mkLuaInline ''hl.dsp.layout("removemaster")'') null) # Remove from master
+        (hl.bind "SUPER + SHIFT + K" (hl.mkLuaInline ''hl.dsp.layout("addmaster")'') null) # Add to master
+        (hl.bind "SUPER + SHIFT + L" (hl.mkLuaInline ''hl.dsp.focus({ monitor = "+1" })'') null) # Focus next monitor
 
         # Utilities
-        "$shiftMod, S, exec, ${lib.getExe pkgs.grimblast} copy area" # Capture region
-        ", Print, exec, ${lib.getExe pkgs.grimblast} copy area" # Capture region
-        "$shiftMod+Alt, S, exec, ${lib.getExe pkgs.grimblast} save area" # Capture region
+        (hl.bind "SUPER + SHIFT + S" (hl.exec "${lib.getExe pkgs.grimblast} copy area") null) # Capture region
+        (hl.bind "Print" (hl.exec "${lib.getExe pkgs.grimblast} copy area") null) # Capture region
+        (hl.bind "SUPER + SHIFT + ALT + S" (hl.exec "${lib.getExe pkgs.grimblast} save area") null) # Capture region
       ]
+      # Workspaces: keycodes 10-18 are the number row keys 1-9
       ++ (builtins.concatLists (
         builtins.genList (
           i: let
-            ws = i + 1;
+            ws = toString (i + 1);
           in [
-            "$mod,code:1${toString i}, workspace, ${toString ws}"
-            "$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}"
+            (hl.bind "SUPER + code:1${toString i}" (hl.mkLuaInline "hl.dsp.focus({ workspace = ${ws} })") null)
+            (hl.bind "SUPER + SHIFT + code:1${toString i}" (hl.mkLuaInline "hl.dsp.window.move({ workspace = ${ws} })") null)
           ]
         )
         9
-      ));
-
-    bindm = [
-      "$mod,mouse:272, movewindow" # Move Window (mouse)
-      "$mod,R, resizewindow" # Resize Window (mouse)
-    ];
-
-    bindl = [
+      ))
+      # Mouse
+      ++ [
+        (hl.bind "SUPER + mouse:272" (hl.mkLuaInline "hl.dsp.window.drag()") {mouse = true;}) # Move Window (mouse)
+        (hl.bind "SUPER + R" (hl.mkLuaInline "hl.dsp.window.resize()") {mouse = true;}) # Resize Window (mouse)
+      ]
+      # Locked (also work on the lockscreen)
+      ++ (map (b: hl.bind b.key (hl.exec b.cmd) {locked = true;}) [
         # Brightness
-      ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set 5%+"
-      ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-"
+        {
+          key = "XF86MonBrightnessUp";
+          cmd = "${lib.getExe pkgs.brightnessctl} set 5%+";
+        }
+        {
+          key = "XF86MonBrightnessDown";
+          cmd = "${lib.getExe pkgs.brightnessctl} set 5%-";
+        }
 
         # Media
-      ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause"
-      ", XF86AudioPause, exec, ${lib.getExe pkgs.playerctl} play-pause"
-      ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next"
-      ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous"
-      ", XF86AudioStop, exec, ${lib.getExe pkgs.playerctl} stop"
+        {
+          key = "XF86AudioPlay";
+          cmd = "${lib.getExe pkgs.playerctl} play-pause";
+        }
+        {
+          key = "XF86AudioPause";
+          cmd = "${lib.getExe pkgs.playerctl} play-pause";
+        }
+        {
+          key = "XF86AudioNext";
+          cmd = "${lib.getExe pkgs.playerctl} next";
+        }
+        {
+          key = "XF86AudioPrev";
+          cmd = "${lib.getExe pkgs.playerctl} previous";
+        }
+        {
+          key = "XF86AudioStop";
+          cmd = "${lib.getExe pkgs.playerctl} stop";
+        }
 
         # Sound
-      ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-      ", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
-      ", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-    ];
+        {
+          key = "XF86AudioMute";
+          cmd = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+        }
+        {
+          key = "XF86AudioRaiseVolume";
+          cmd = "wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+";
+        }
+        {
+          key = "XF86AudioLowerVolume";
+          cmd = "wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
+        }
+      ]);
   };
 }

home/system/hyprland/default.nix

@@ -14,6 +14,7 @@
   blur = config.theme.blur;
   keyboardLayout = config.var.keyboardLayout;
   background = "rgba(" + config.lib.stylix.colors.base00 + "EE)";
+  hl = import ./lib.nix {inherit lib;};
 in {
   imports = [
     ./animations.nix
@@ -48,7 +49,7 @@ in {
 
   wayland.windowManager.hyprland = {
     enable = true;
-    configType = "hyprlang";
+    configType = "lua";
     xwayland.enable = true;
     systemd = {
       enable = false;
@@ -60,58 +61,59 @@ in {
     portalPackage = null;
 
     settings = {
-      exec-once = [
+      on = hl.execOnce [
         "dbus-update-activation-environment --systemd --all &"
       ];
 
+      # default for every monitor without an explicit rule (hosts add their own)
       monitor = [
-        ",prefered,auto,1" # default
+        {
+          output = "";
+          mode = "preferred";
+          position = "auto";
+          scale = 1;
+        }
       ];
 
-      env = [
-        "XDG_CURRENT_DESKTOP,Hyprland"
-        "XDG_SESSION_TYPE,wayland"
-        "XDG_SESSION_DESKTOP,Hyprland"
-        "ANKI_WAYLAND,1"
-        "DISABLE_QT5_COMPAT,0"
-        "QT_AUTO_SCREEN_SCALE_FACTOR,1"
-        "QT_QPA_PLATFORM,wayland;xcb"
-        "QT_QPA_PLATFORMTHEME,gtk3"
-        "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
-        "ELECTRON_OZONE_PLATFORM_HINT,auto"
-        "DIRENV_LOG_FORMAT,"
-        "SDL_VIDEODRIVER,wayland"
-        "CLUTTER_BACKEND,wayland"
-      ];
-
-      cursor = {
-        no_hardware_cursors = true;
-        default_monitor = "eDP-2";
+      env = lib.mapAttrsToList (name: value: {_args = [name value];}) {
+        XDG_CURRENT_DESKTOP = "Hyprland";
+        XDG_SESSION_TYPE = "wayland";
+        XDG_SESSION_DESKTOP = "Hyprland";
+        ANKI_WAYLAND = "1";
+        DISABLE_QT5_COMPAT = "0";
+        QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+        QT_QPA_PLATFORM = "wayland;xcb";
+        QT_QPA_PLATFORMTHEME = "gtk3";
+        QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+        ELECTRON_OZONE_PLATFORM_HINT = "auto";
+        DIRENV_LOG_FORMAT = "";
+        SDL_VIDEODRIVER = "wayland";
+        CLUTTER_BACKEND = "wayland";
       };
 
+      config = {
+        cursor.no_hardware_cursors = true;
+
         general = {
           resize_on_border = true;
           gaps_in = gaps-in;
           gaps_out = gaps-out;
           border_size = border-size;
           layout = "master";
-        "col.inactive_border" = lib.mkForce background;
+          col.inactive_border = lib.mkForce background;
         };
 
         decoration = {
           active_opacity = active-opacity;
           inactive_opacity = inactive-opacity;
-        rounding = rounding;
+          inherit rounding;
           shadow = {
             enabled = true;
             range = 20;
             render_power = 3;
           };
           blur = {
-          enabled =
-            if blur
-            then "true"
-            else "false";
+            enabled = blur;
             size = 18;
           };
         };
@@ -122,26 +124,6 @@ in {
           mfact = 0.5;
         };
 
-      gesture = "3, horizontal, workspace";
-
-      windowrule = [
-        "match:class .*, suppress_event maximize"
-        "match:class helium, suppress_event fullscreen"
-        "match:class helium, sync_fullscreen false"
-
-        "match:class proton-authenticator, float on"
-        "match:class proton-authenticator, center on"
-        "match:class proton-authenticator, size 500 400"
-
-        "match:class protonvpn-app, float on"
-        "match:class protonvpn-app, center on"
-        "match:class protonvpn-app, size 500 400"
-
-        "match:title run-bg, float on"
-        "match:title run-bg, center on"
-        "match:title run-bg, size 700 80"
-      ];
-
         misc = {
           disable_hyprland_logo = true;
           disable_splash_rendering = true;
@@ -167,9 +149,49 @@ in {
           };
         };
 
-      ecosystem = {
-        no_update_news = true;
+        ecosystem.no_update_news = true;
       };
+
+      gesture = {
+        fingers = 3;
+        direction = "horizontal";
+        action = "workspace";
+      };
+
+      window_rule = [
+        {
+          name = "suppress-maximize";
+          match.class = ".*";
+          suppress_event = "maximize";
+        }
+        {
+          name = "helium-fullscreen";
+          match.class = "helium";
+          suppress_event = "fullscreen";
+          sync_fullscreen = false;
+        }
+        {
+          name = "proton-authenticator";
+          match.class = "proton-authenticator";
+          float = true;
+          center = true;
+          size = [500 400];
+        }
+        {
+          name = "protonvpn-app";
+          match.class = "protonvpn-app";
+          float = true;
+          center = true;
+          size = [500 400];
+        }
+        {
+          name = "run-bg";
+          match.title = "run-bg";
+          float = true;
+          center = true;
+          size = [700 80];
+        }
+      ];
     };
   };
 }

home/system/hyprland/keyboard-backlight.nix

@@ -3,8 +3,10 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }: let
+  hl = import ./lib.nix {inherit lib;};
   alert-when-low-battery = false;
   keyboard-backlight = pkgs.writeShellScriptBin "keyboard-backlight" ''
     function set_keyboard_backlight {
@@ -40,5 +42,5 @@
 
   command = "bash ${keyboard-backlight}/bin/keyboard-backlight &";
 in {
-  wayland.windowManager.hyprland.settings.exec-once = [command];
+  wayland.windowManager.hyprland.settings.on = hl.execOnce [command];
 }

home/system/hyprland/lib.nix

@@ -0,0 +1,25 @@
+# Small helpers for writing the Hyprland Lua config through home-manager's `settings`
+{lib}: rec {
+  inherit (lib.generators) mkLuaInline;
+  toLua = lib.generators.toLua {};
+
+  # hl.dsp.exec_cmd("...")
+  exec = cmd: mkLuaInline "hl.dsp.exec_cmd(${toLua cmd})";
+
+  # hl.bind(keys, dispatcher, opts?)
+  bind = keys: dsp: opts: {
+    _args = [keys dsp] ++ lib.optional (opts != null) opts;
+  };
+
+  # Run commands once at compositor start (replacement for `exec-once`)
+  execOnce = cmds: [
+    {
+      _args = [
+        "hyprland.start"
+        (mkLuaInline ''
+          function()
+          ${lib.concatMapStrings (c: "  hl.exec_cmd(${toLua c})\n") cmds}end'')
+      ];
+    }
+  ];
+}

home/system/hyprland/polkitagent.nix

@@ -1,6 +1,12 @@
 # HyprPolkitAgent is a simple polkit agent for wayland compositors
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  hl = import ./lib.nix {inherit lib;};
+in {
   home.packages = with pkgs; [hyprpolkitagent];
 
-  wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start hyprpolkitagent"];
+  wayland.windowManager.hyprland.settings.on = hl.execOnce ["systemctl --user start hyprpolkitagent"];
 }

home/system/hyprpaper/default.nix

@@ -1,5 +1,7 @@
 # Hyprpaper is used to set the wallpaper on the system
-{lib, ...}: {
+{lib, ...}: let
+  hl = import ../hyprland/lib.nix {inherit lib;};
+in {
   # The wallpaper is set by stylix
   services.hyprpaper = {
     enable = true;
@@ -10,7 +12,7 @@
   };
   systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
 
-  wayland.windowManager.hyprland.settings.exec-once = [
+  wayland.windowManager.hyprland.settings.on = hl.execOnce [
     "systemctl --user enable --now hyprpaper.service"
   ];
 }

home/system/walker/default.nix

@@ -1,6 +1,10 @@
-{ pkgs, ... }:
-
 {
+  pkgs,
+  lib,
+  ...
+}: let
+  hl = import ../hyprland/lib.nix {inherit lib;};
+in {
   home.packages = with pkgs; [
     walker
     elephant
@@ -35,7 +39,7 @@
     };
   };
 
-  wayland.windowManager.hyprland.settings.exec-once = [
+  wayland.windowManager.hyprland.settings.on = hl.execOnce [
     "dbus-update-activation-environment --systemd --all"
     "systemctl --user start elephant.service walker.service"
   ];

home/system/waybar/default.nix

@@ -7,6 +7,7 @@ let
   terminal = cmd: "uwsm app -- ${lib.getExe pkgs.ghostty} -e ${cmd}";
 
   radius = toString config.theme.bar-rounding;
+  hl = import ../hyprland/lib.nix {inherit lib;};
 in
 {
   home.packages = with pkgs; [
@@ -269,9 +270,5 @@ in
     }
   '';
 
-  wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      "waybar"
-    ];
-  };
+  wayland.windowManager.hyprland.settings.on = hl.execOnce ["waybar"];
 }

hosts/home-pc/flake.nix

@@ -3,7 +3,6 @@
   nixpkgs,
   ...
 }:
-
 nixpkgs.lib.nixosSystem {
   modules = [
     {
@@ -13,19 +12,16 @@ nixpkgs.lib.nixosSystem {
       };
     }
 
-    ({ config, pkgs, lib, ... }: {
+    ({
+      config,
+      pkgs,
+      lib,
+      ...
+    }: {
       # ─────────────────────────────────────────────────────────────
       # AMD Microcode
       # ─────────────────────────────────────────────────────────────
       hardware.cpu.amd.updateMicrocode = true;
-
-			# ─────────────────────────────────────────────────────────────
-			# Hardware accelaration
-			# ─────────────────────────────────────────────────────────────
-      hardware.graphics = {
-        enable = true;
-        enable32Bit = true;
-      };
     })
 
     inputs.home-manager.nixosModules.home-manager

hosts/home-pc/home.nix

@@ -55,8 +55,18 @@
   };
 
   wayland.windowManager.hyprland.settings.monitor = [
-    "DP-3,1920x1080@144.0,1920x0,1.0"
-    "HDMI-A-1,1920x1080@60.0,0x0,1.0"
+    {
+      output = "DP-3";
+      mode = "1920x1080@144.0";
+      position = "1920x0";
+      scale = 1;
+    }
+    {
+      output = "HDMI-A-1";
+      mode = "1920x1080@60.0";
+      position = "0x0";
+      scale = 1;
+    }
   ];
 
   programs = {

hosts/home-pc/variables.nix

@@ -11,7 +11,7 @@
   config.var = {
     hostname = "home-pc";
     username = "andi";
-    configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
+    configDirectory = "/etc/nixos/nixy"; # The path of the nixos configuration directory
 
     keyboardLayout = "de";
 
@@ -21,7 +21,7 @@
 
     git = {
       username = "kptltd00m";
-      email = "kptltd00m.doomlabs.de";
+      email = "kptltd00m@doomlabs.de";
     };
 
     autoUpgrade = false;

hosts/laptop/configuration.nix

@@ -22,7 +22,6 @@
     # You should let those lines as is
     ./hardware-configuration.nix
     ./variables.nix
-
   ];
 
   programs.nix-ld.enable = true; #Dynamic Linking

hosts/laptop/home.nix

@@ -60,7 +60,13 @@
   };
 
   wayland.windowManager.hyprland.settings.monitor = [
-    "eDP-1,1920x1080,0x0,1.5" # My internal laptop screen
+    # My internal laptop screen
+    {
+      output = "eDP-1";
+      mode = "1920x1080";
+      position = "0x0";
+      scale = 1.5;
+    }
   ];
 
   programs = {

hosts/laptop/variables.nix

@@ -11,7 +11,7 @@
   config.var = {
     hostname = "thinkpad";
     username = "andi";
-    configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
+    configDirectory = "/etc/nixos/nixy"; # The path of the nixos configuration directory
 
     keyboardLayout = "de";
 

hosts/server/configuration.nix

@@ -15,15 +15,12 @@
     ../../server-modules/glance
     ../../server-modules/adguardhome.nix
     ../../server-modules/arr.nix
-    ../../server-modules/blog.nix
-    ../../server-modules/awesome-wallpapers.nix
     ../../server-modules/iknowyou.nix
     ../../server-modules/stirling-pdf.nix
     ../../server-modules/cyberchef.nix
     ../../server-modules/mazanoke.nix
     ../../server-modules/kernel-hardening.nix
     ../../server-modules/fail2ban.nix
-    ../../server-modules/default-creds.nix
     ../../server-modules/umami.nix
     ../../server-modules/gitea.nix
     ../../server-modules/mealie.nix

hosts/server/flake.nix

@@ -11,7 +11,6 @@ nixpkgs.lib.nixosSystem {
     inputs.sops-nix.nixosModules.sops
     inputs.nixarr.nixosModules.default
     inputs.nix-index-database.nixosModules.default
-    inputs.default-creds.nixosModules.default
     ./configuration.nix
   ];
 }

hosts/work/home.nix

@@ -41,7 +41,12 @@
   };
 
   wayland.windowManager.hyprland.settings.monitor = [
-    "desc:Philips Consumer Electronics Company PHL 221B8L ZV02144013987,highres,0x0,1"
+    {
+      output = "desc:Philips Consumer Electronics Company PHL 221B8L ZV02144013987";
+      mode = "highres";
+      position = "0x0";
+      scale = 1;
+    }
   ];
 
   programs = {

hosts/work/secrets/default.nix

@@ -4,8 +4,10 @@
   inputs,
   pkgs,
   config,
+  lib,
   ...
 }: let
+  hl = import ../../../home/system/hyprland/lib.nix {inherit lib;};
   home = config.home.homeDirectory;
 in {
   imports = [inputs.sops-nix.homeManagerModules.sops];
@@ -54,5 +56,5 @@ in {
     age
   ];
 
-  wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
+  wayland.windowManager.hyprland.settings.on = hl.execOnce ["systemctl --user start sops-nix"];
 }

nixos/hyprland.nix

@@ -1,14 +1,7 @@
 # Hyprland is a dynamic tiling Wayland compositor.
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{...}: {
   programs.hyprland = {
     enable = true;
     withUWSM = true;
-    package = inputs.hyprland.packages."${pkgs.stdenv.hostPlatform.system}".hyprland;
-    portalPackage =
-      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   };
 }

nixos/systemd-boot.nix

@@ -1,7 +1,6 @@
 # Systemd-boot configuration for NixOS
 {pkgs, ...}: {
   boot = {
-    bootspec.enable = true;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot = {

nixos/tuigreet.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   c = config.lib.stylix.colors;
-  tuigreet = inputs.notashelf-tuigreet.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  tuigreet = pkgs.tuigreet;
 
   theme = lib.concatStringsSep ";" [
     "border=#${c.base0D}"

nixos/utils.nix

@@ -77,7 +77,7 @@ in {
       enable = true;
       implementation = "broker";
       packages = with pkgs; [
-        gcr
+        gcr_4
         gnome-settings-daemon
       ];
     };
@@ -144,8 +144,5 @@ in {
 
     # userland niceness
     rtkit.enable = true;
-
-    # don't ask for password for wheel group
-    sudo.wheelNeedsPassword = false;
   };
 }

server-modules/awesome-wallpapers.nix

@@ -1,41 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  ...
-}: let
-  inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
-in {
-  imports = [
-    (mkContainer {
-      name = "wallpapers";
-      hostIp = "10.233.4.1";
-      containerIp = "10.233.4.2";
-      nixosConfig = {pkgs, ...}: {
-        services.nginx = {
-          enable = true;
-          virtualHosts."wallpapers" = {
-            root = "${inputs.awesome-wallpapers.packages.${pkgs.stdenv.hostPlatform.system}.default}/share/awesome-wallpapers";
-            listen = [
-              {
-                addr = "0.0.0.0";
-                port = 8080;
-              }
-            ];
-            locations."/" = {
-              tryFiles = "$uri $uri/ /index.html";
-            };
-            extraConfig = ''
-              port_in_redirect off;
-              absolute_redirect off;
-            '';
-          };
-        };
-        networking.firewall.allowedTCPPorts = [8080];
-        system.stateVersion = "24.05";
-      };
-    })
-  ];
-
-  services.cloudflared.tunnels."${config.var.tunnelId}".ingress."wallpapers.${config.var.domain}" = "http://10.233.4.2:8080";
-}

server-modules/blog.nix

@@ -1,67 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  ...
-}: let
-  inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
-  domain = config.var.domain;
-in {
-  imports = [
-    (mkContainer {
-      name = "blog";
-      hostIp = "10.233.3.1";
-      containerIp = "10.233.3.2";
-      nixosConfig = {pkgs, ...}: {
-        services.nginx = {
-          enable = true;
-          virtualHosts = {
-            "blog" = {
-              root = "${inputs.blog.packages.${pkgs.stdenv.hostPlatform.system}.default}/share/blog";
-              listen = [
-                {
-                  addr = "0.0.0.0";
-                  port = 8080;
-                }
-              ];
-              locations."/" = {
-                tryFiles = "$uri $uri/ =404";
-              };
-              extraConfig = ''
-                port_in_redirect off;
-                absolute_redirect off;
-                error_page 403 /403.html;
-                error_page 404 /404.html;
-                error_page 500 /500.html;
-                error_page 503 /503.html;
-                add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.${domain}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.${domain}; connect-src 'self' https://umami.${domain};" always;
-                add_header X-Frame-Options "SAMEORIGIN" always;
-                add_header X-Content-Type-Options "nosniff" always;
-                add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
-              '';
-            };
-            "www-redirect" = {
-              listen = [
-                {
-                  addr = "0.0.0.0";
-                  port = 8081;
-                }
-              ];
-              extraConfig = "return 301 https://${domain}$request_uri;";
-            };
-          };
-        };
-        networking.firewall.allowedTCPPorts = [
-          8080
-          8081
-        ];
-        system.stateVersion = "24.05";
-      };
-    })
-  ];
-
-  services.cloudflared.tunnels."${config.var.tunnelId}".ingress = {
-    "${config.var.domain}" = "http://10.233.3.2:8080";
-    "www.${config.var.domain}" = "http://10.233.3.2:8081";
-  };
-}

server-modules/default-creds.nix

@@ -1,36 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  ...
-}: let
-  inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
-  domain = config.var.domain;
-in {
-  imports = [
-    (mkContainer {
-      name = "def-creds";
-      hostIp = "10.233.6.1";
-      containerIp = "10.233.6.2";
-      nixosConfig = {...}: {
-        imports = [inputs.default-creds.nixosModules.default];
-        services.default-creds = {
-          enable = true;
-          port = 8087;
-        };
-        networking.firewall.allowedTCPPorts = [8087];
-        systemd.services.default-creds.environment = {
-          HOST = lib.mkForce "0.0.0.0";
-          PUBLIC_UMAMI_URL = "https://umami.${domain}";
-          PUBLIC_UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
-          UMAMI_URL = "https://umami.${domain}";
-          UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";
-        };
-        system.stateVersion = "24.05";
-      };
-    })
-  ];
-
-  services.default-creds.enable = lib.mkForce false;
-  services.cloudflared.tunnels."${config.var.tunnelId}".ingress."default-creds.${config.var.domain}" = "http://10.233.6.2:8087";
-}

server-modules/glance/server.nix

@@ -33,11 +33,6 @@
                       url = "https://adguard.${domain}";
                       icon = "si:adguard";
                     }
-                    {
-                      title = "Blog";
-                      url = "https://${domain}";
-                      icon = "si:blogger";
-                    }
                     {
                       title = "Gitea";
                       url = "https://git.${domain}";
@@ -63,11 +58,6 @@
                       url = "https://iknowyou-prod.${domain}";
                       icon = "sh:iknowyou";
                     }
-                    {
-                      title = "Wallpapers";
-                      url = "https://wallpapers.${domain}";
-                      icon = "si:unsplash";
-                    }
                     {
                       title = "Mazanoke";
                       url = "https://mazanoke.${domain}";
@@ -78,11 +68,6 @@
                       url = "https://pdf.${domain}";
                       icon = "sh:stirling-pdf";
                     }
-                    {
-                      title = "Default-creds";
-                      url = "https://default-creds.${domain}";
-                      icon = "si:passbolt";
-                    }
                     {
                       title = "Cyberchef";
                       url = "https://cyberchef.${domain}";