Merge branch 'upgrade-26.05'

flake.lock

@@ -60,16 +60,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1768256610,
+        "lastModified": 1780143400,
-        "narHash": "sha256-IyL6nZo242nDLoLQVwkqAZXp8FO5kBfjL6Fuh+gZO10=",
+        "narHash": "sha256-jN9RJ4OeuLdCxZ1G0d4zqy0HuHnqODxxgN6pQoYfAH8=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "0734ad8c91342df34f1a1e5c183d053d70ba87c7",
+        "rev": "096f4670cf078d810a931fae59b57db4cc3fb4d3",
         "type": "github"
       },
       "original": {
         "owner": "catppuccin",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "nix",
         "type": "github"
       }
@@ -98,11 +98,11 @@
     },
     "flake-file": {
       "locked": {
-        "lastModified": 1777679829,
+        "lastModified": 1781217157,
-        "narHash": "sha256-zQxY90pq7BDbeimAiOfuK2U0huzo6oHOiC8zEpRgsbQ=",
+        "narHash": "sha256-N3q/SP2Ropk336e9KSgLh7kpROY6P70dprYdbPIfd5c=",
         "owner": "vic",
         "repo": "flake-file",
-        "rev": "04ca28cf570276e70a9a5f694791ab2a60f1f300",
+        "rev": "ce63eaf7ebfe04a176653f66385a7f0a36380cee",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1777988971,
+        "lastModified": 1778716662,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -137,11 +137,11 @@
         ]
       },
       "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": {
@@ -150,24 +150,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -175,27 +157,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1777851538,
+        "lastModified": 1781319724,
-        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
+        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1773693634,
+        "lastModified": 1778781969,
-        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
+        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
         "type": "github"
       },
       "original": {
@@ -204,46 +186,18 @@
         "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"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778003029,
+        "lastModified": 1781216227,
-        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -265,11 +219,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1777954456,
+        "lastModified": 1781577229,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
         "type": "github"
       },
       "original": {
@@ -285,47 +239,23 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_2"
-        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1769049374,
+        "lastModified": 1781713927,
-        "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
+        "narHash": "sha256-U18jyPH/pIx/YZlGv3FbcFw95NRFjQv4aDjlvxhUxNY=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
+        "rev": "110376ed06939ee0ccbcfce11e748064c00e666d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixvim",
         "type": "github"
       }
     },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768249818,
-        "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
     "orly-covers": {
       "flake": false,
       "locked": {
@@ -369,11 +299,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778037418,
+        "lastModified": 1781752752,
-        "narHash": "sha256-EZnAOkPgEeOO2rCRhwkTvesCq/E6dbsyxhMyaefgIWM=",
+        "narHash": "sha256-kVG5tV9hddPviGAgqf9sGSuStvv+HAB9onfKqGptV0k=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "adf987c76af8d17b8256d23631bcf203f81e1a63",
+        "rev": "c06d86dabe5b92982b9d67acccb9990d58da3a0e",
         "type": "github"
       },
       "original": {
@@ -399,14 +329,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1777789800,
+        "lastModified": 1781425310,
-        "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=",
+        "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3",
+        "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441",
         "type": "github"
       },
       "original": {
@@ -460,21 +390,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "nixpkgs": [
@@ -482,11 +397,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777612697,
+        "lastModified": 1781761091,
-        "narHash": "sha256-h+tXBNMDrsKbD1UnYw0IeSIT4RalHtIJ1GLOviib7/8=",
+        "narHash": "sha256-WfgNo6W1U7dwWZsdaAnoG62CXvvJDL+dXfUxnAS7WhU=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "f9f70d14f9a57c7962c5cfe589461c1391044448",
+        "rev": "e843542efbb7405141659d47bef211c9a8efbc54",
         "type": "github"
       },
       "original": {

flake.nix

@@ -20,20 +20,20 @@
       flake = false;
     };
     catppuccin = {
-      url = "github:catppuccin/nix/release-25.11";
+      url = "github:catppuccin/nix/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-file.url = "github:vic/flake-file";
     flake-parts.url = "github:hercules-ci/flake-parts";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     import-tree.url = "github:vic/import-tree";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.11";
+      url = "github:nix-community/nixvim/nixos-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     orly-covers = {

modules/factory/autologin.nix

@@ -15,7 +15,7 @@
 
     programs.zsh.profileExtra = ''
       if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-      	exec hyprland
+      	exec start-hyprland
       fi
     '';
   };

modules/hosts/tux/users/weckyy702/backlight.nix

@@ -1,8 +0,0 @@
-{ inputs, ... }: {
-  flake.modules.nixos.tux = {
-    imports = with inputs.self.modules.nixos; [
-      backlight
-    ];
-    users.users.weckyy702.extraGroups = [ "video" ];
-  };
-}

modules/hosts/tux/users/weckyy702/hyprland.nix

@@ -3,10 +3,13 @@
     imports = with inputs.self.modules.homeManager; [
       ashell
     ];
-    wayland.windowManager.hyprland.settings = {
+    wayland.windowManager.hyprland.extraConfig = ''
-      monitor = [
+      hl.monitor({
-        "eDP-1,preferred,0x0,1.066666667"
+            output = "eDP-1",
-      ];
+            mode = "preferred",
-    };
+            position = "0x0",
+            scale = 1.066666667,
+      })
+    '';
   };
 }

modules/hosts/tux/users/weckyy702/wallpaper.nix

@@ -32,8 +32,8 @@
         })
       ];
 
-      wayland.windowManager.hyprland.settings.bind = [
+#     wayland.windowManager.hyprland.settings.bind = {
-        "$mod, i, exec, wpaperctl next"
+#       _args "$mod, i, exec, wpaperctl next"
-      ];
+#     };
     };
 }

modules/hosts/tux/users/weckyy702/weckyy702.nix

@@ -17,6 +17,7 @@
           nm-applet
           blueman-applet
           prusa-slicer
+          backlight
         ];
     };
   };

modules/nix/tools/home-manager.nix

@@ -4,7 +4,7 @@
 }: {
   # Add home-manager input
   flake-file.inputs = {
-    home-manager.url = "github:nix-community/home-manager/release-25.11";
+    home-manager.url = "github:nix-community/home-manager/release-26.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 

modules/programs/catppuccin.nix

@@ -1,6 +1,6 @@
 { inputs, ... }: {
   flake-file.inputs = {
-    catppuccin.url = "github:catppuccin/nix/release-25.11";
+    catppuccin.url = "github:catppuccin/nix/release-26.05";
     catppuccin.inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -38,9 +38,9 @@
         hyprcursor.size = size;
       };
 
-    wayland.windowManager.hyprland.settings.exec-once = [
+#   wayland.windowManager.hyprland.settings.exec-once = [
-      "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
+#     "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
-    ];
+#   ];
 
     catppuccin.enable = true;
     # Required for QT apps to use the catppuccin colors

modules/programs/hyprland/config.lua

@@ -0,0 +1,121 @@
+-- environment variables
+hl.env("XCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "24")
+
+-- General config
+
+hl.config({
+    general = {
+        border_size = 2,
+        gaps_in = 0,
+        gaps_out = 5,
+        layout = "dwindle",
+        allow_tearing = false,
+        resize_on_border = true,
+    },
+    decoration = {
+        shadow = { enabled = false, },
+        blur = { enabled = true, },
+        active_opacity = 0.8,
+        inactive_opacity = 0.8,
+    },
+    animations = { 
+        enabled = false,
+    },
+    misc = {
+        disable_hyprland_logo = true;
+    },
+    cursor = {
+        inactive_timeout = 3,
+    },
+    ecosystem = {
+        no_update_news = true,
+        no_donation_nag = true,
+    },
+})
+
+local mod = "SUPER"
+local term = "kitty"
+local browser = "zen"
+
+-- Input config
+
+hl.config({
+    input = {
+        kb_layout = "de",
+
+        follow_mouse = 1,
+    }
+})
+
+-- Keybinds
+
+--- Apps
+hl.bind(mod .. " + Return", hl.dsp.exec_cmd(term))
+hl.bind(mod .. " + D", hl.dsp.exec_cmd("rofi -show drun -modes drun,calc"))
+hl.bind(mod .. " + F2", hl.dsp.exec_cmd(browser))
+
+--- Window manipulation
+hl.bind(mod .. " + C", hl.dsp.window.close())
+hl.bind(mod .. " + f", hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'toggle'}))
+hl.bind(mod .. " + SHIFT + Space", hl.dsp.window.float({ action = "toggle" }))
+hl.bind(mod .. " + H",  hl.dsp.focus({ direction = "left" }))
+hl.bind(mod .. " + L", hl.dsp.focus({ direction = "right" }))
+hl.bind(mod .. " + K",    hl.dsp.focus({ direction = "up" }))
+hl.bind(mod .. " + J",  hl.dsp.focus({ direction = "down" }))
+hl.bind(mod .. " + mouse:272", hl.dsp.window.drag(),   { mouse = true })
+hl.bind(mod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
+
+--- Workspace handling
+for i = 1, 10 do
+    local key = i % 10 -- 10 maps to key 0
+    hl.bind(mod .. " + " .. key,             hl.dsp.focus({ workspace = i}))
+    hl.bind(mod .. " + SHIFT + " .. key,     hl.dsp.window.move({ workspace = i }))
+end
+
+hl.gesture({
+    fingers = 3,
+    direction = "horizontal",
+    action = "workspace"
+})
+
+--- Media handling
+hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
+hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),      { locked = true, repeating = true })
+hl.bind("XF86AudioMute",        hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),     { locked = true, repeating = true })
+hl.bind("XF86AudioMicMute",     hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),   { locked = true, repeating = true })
+hl.bind("XF86AudioNext",  hl.dsp.exec_cmd("playerctl next"),       { locked = true })
+hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPlay",  hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPrev",  hl.dsp.exec_cmd("playerctl previous"),   { locked = true })
+
+-- Window rules
+
+hl.window_rule({
+    -- Ignore maximize requests from all apps. You'll probably like this.
+    name  = "suppress-maximize-events",
+    match = { class = ".*" },
+
+    suppress_event = "maximize",
+})
+
+hl.window_rule({
+    -- Fix some dragging issues with XWayland
+    name  = "fix-xwayland-drags",
+    match = {
+        class      = "^$",
+        title      = "^$",
+        xwayland   = true,
+        float      = true,
+        fullscreen = false,
+        pin        = false,
+    },
+
+    no_focus = true,
+})
+
+-- Monitor handling
+
+-- automatically add new monitors and lay them out horizontally
+hl.monitor({ output = "", mode = "preferred", position = "auto", scale = 1 })
+

modules/programs/hyprland/settings.nix

@@ -1,85 +1,6 @@
 {
   flake.modules.homeManager.hyprland = {
-    wayland.windowManager.hyprland.settings = {
+    wayland.windowManager.hyprland.configType = "lua";
-      "$mod" = "SUPER";
+    wayland.windowManager.hyprland.extraConfig = builtins.readFile ./config.lua;
-      "$browser" = "zen";
-      "$term" = "kitty";
-
-      general = {
-        border_size = 2;
-        gaps_in = 0;
-        gaps_out = 5;
-        layout = "dwindle";
-        allow_tearing = false;
-        resize_on_border = true;
-      };
-
-      snap = { };
-
-      input = {
-        kb_layout = "de";
-        follow_mouse = 1;
-      };
-
-      bind =
-        [
-          "$mod, Q, exit"
-          "$mod, Return, exec, $term"
-          "$mod, D, exec, rofi -show drun -modes drun,calc"
-          "$mod, F2, exec, $browser"
-          "$mod, c, killactive"
-          "$mod, f, fullscreen"
-          "$mod, h, movefocus, l"
-          "$mod, j, movefocus, d"
-          "$mod, k, movefocus, u"
-          "$mod, l, movefocus, r"
-          "$mod+SHIFT, h, movewindow, l"
-          "$mod+SHIFT, j, movewindow, d"
-          "$mod+SHIFT, k, movewindow, u"
-          "$mod+SHIFT, l, movewindow, r"
-          ", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
-          "$mod+SHIFT, s, exec, hyprlock"
-        ]
-        ++
-        # Switch workspaces
-        (map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [ 0 1 2 3 4 5 6 7 8 9 ])
-        ++ (map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [ 0 1 2 3 4 5 6 7 8 9 ]);
-
-      bindm = [
-        "$mod, mouse:272, movewindow"
-      ];
-
-      bindel = [
-        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
-        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-      ];
-
-      bindl = [
-        ", XF86AudioNext, exec, playerctl position 5+"
-        ", XF86AudioPrev, exec, playerctl position 5-"
-        ", XF86AudioPlay, exec, playerctl play-pause"
-      ];
-
-      bindo = [
-        ", XF86AudioNext, exec, playerctl next"
-        ", XF86AudioPrev, exec, playerctl previous"
-      ];
-
-      decoration = {
-        shadow.enabled = false;
-        blur.enabled = true;
-        active_opacity = 0.8;
-        inactive_opacity = 0.8;
-      };
-
-      animations.enabled = false;
-
-      misc.disable_hyprland_logo = true;
-
-      cursor.inactive_timeout = 3;
-
-      ecosystem.no_update_news = true;
-      ecosystem.no_donation_nag = true;
-    };
   };
 }

modules/programs/nixvim/nixvim.nix

@@ -1,6 +1,6 @@
 { inputs, ... }: {
   flake-file.inputs = {
-    nixvim.url = "github:nix-community/nixvim/nixos-25.11";
+    nixvim.url = "github:nix-community/nixvim/nixos-26.05";
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
   };
 

modules/services/backlight.nix

@@ -1,18 +1,12 @@
 { inputs, ... }: {
-  flake.modules.nixos.backlight = { pkgs, ... }: {
+  flake.modules.homeManager.backlight = { pkgs, ... }:
-    environment.systemPackages = with pkgs; [
+    let
-      brightnessctl
+      brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
-    ];
+    in
-
+    {
-    home-manager.sharedModules = [
+      wayland.windowManager.hyprland.extraConfig = ''
-      inputs.self.modules.homeManager.backlight
+        hl.bind("XF86MonBrightnessUp",  hl.dsp.exec_cmd("${brightnessctl} -e4 -n2 set 5%+"),                  { locked = true, repeating = true })
-    ];
+        hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("${brightnessctl} -e4 -n2 set 5%-"),                  { locked = true, repeating = true })
-  };
+      '';
-
-  flake.modules.homeManager.backlight = {
-    wayland.windowManager.hyprland.settings.bind = [
-      ", code:232, exec, brightnessctl set 5%-"
-      ", code:233, exec, brightnessctl set +5%"
-    ];
     };
 }

modules/system-settings/home-vpn.nix

@@ -5,10 +5,11 @@
       resolved
     ];
 
-    services.resolved.extraConfig = ''
+    services.resolved.settings = {
-      [Resolve]
+      Resolve = {
-      DNS=10.10.0.1
+        DNS = "10.10.0.1";
-      Domains=~veltnet
+        Domains = "~veltnet";
-    '';
+      };
+    };
   };
 }

modules/system-types/base/nixos.nix

@@ -1,6 +1,6 @@
 { inputs, ... }: {
   flake-file.inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
   };