flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/8cd5ce828d5d1d16feff37340171a98fc3bf6526?narHash=sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ%3D' (2025-09-10)
  → 'github:nixos/nixpkgs/9a094440e02a699be5c57453a092a8baf569bdad?narHash=sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs%3D' (2025-09-14)

flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740845322,
+        "lastModified": 1757809953,
-        "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
+        "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
+        "rev": "17a10049486f6698fca32097d8f52c0c895542b0",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736768383,
+        "lastModified": 1757017925,
-        "narHash": "sha256-CAe5foYgECRLIsq8ZwfnFCOayZpyzX7Q+dukYT1tJt0=",
+        "narHash": "sha256-QC1SkvyU5nQ32lju2GYK9ozuh/JYWXfWK/T7OC6dVls=",
         "ref": "master",
-        "rev": "322f4c6fb617e6abae9cb8ceb78c94464c462ab1",
+        "rev": "7723cb45020e1f561f527779540faa5901d34e4d",
-        "revCount": 26,
+        "revCount": 31,
         "type": "git",
         "url": "https://git.t-juice.club/torjus/nix-packages"
       },
@@ -109,11 +109,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740828860,
+        "lastModified": 1757745802,
-        "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -125,16 +125,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1740865531,
+        "lastModified": 1757810152,
-        "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
+        "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
+        "rev": "9a094440e02a699be5c57453a092a8baf569bdad",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -149,11 +149,11 @@
         "uv2nix": "uv2nix_2"
       },
       "locked": {
-        "lastModified": 1737753536,
+        "lastModified": 1748349633,
-        "narHash": "sha256-lZQ7lImQoCF3TDppnwsLCBVnrTrDNASI+tqwqSZAKKc=",
+        "narHash": "sha256-SyFF/p3G7YsJH0p5jgeOqdtc3ehzGuI05ZqiJbZNAZA=",
         "ref": "master",
-        "rev": "454a59b59bdb7f38076023b5c43f0f857ee605b5",
+        "rev": "ef55b5b9478390b535fe708edfa297729ac75572",
-        "revCount": 57,
+        "revCount": 60,
         "type": "git",
         "url": "https://git.t-juice.club/torjus/nixprstatus"
       },
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737338290,
+        "lastModified": 1744599653,
-        "narHash": "sha256-gnXlfFEHA+/jMH7R+7y3JxrI3WfOjgBhzzJNuFW70UU=",
+        "narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=",
         "owner": "pyproject-nix",
         "repo": "build-system-pkgs",
-        "rev": "e1487e5cefda0c7990bdd2e660bee20971680e45",
+        "rev": "7dba6dbc73120e15b558754c26024f6c93015dd7",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737718664,
+        "lastModified": 1746540146,
-        "narHash": "sha256-L/X8LdLW0jCAWrLukC63qdg8519IwMc6vkx+WZDj7r0=",
+        "narHash": "sha256-QxdHGNpbicIrw5t6U3x+ZxeY/7IEJ6lYbvsjXmcxFIM=",
         "owner": "pyproject-nix",
         "repo": "pyproject.nix",
-        "rev": "177aaaa370363e205e0d7b7cc7b3ea3e144aa065",
+        "rev": "e09c10c24ebb955125fda449939bfba664c467fd",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739262228,
+        "lastModified": 1757847158,
-        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+        "narHash": "sha256-TumOaykhZO8SOs/faz6GQhqkOcFLoQvESLSF1cJ4mZc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+        "rev": "ee6f91c1c11acf7957d94a130de77561ec24b8ab",
         "type": "github"
       },
       "original": {
@@ -333,11 +333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737716196,
+        "lastModified": 1747949765,
-        "narHash": "sha256-dC7J0Rua2UhP+EKlJY3jjQLzgzBnOo1iK/d2aIN0hAs=",
+        "narHash": "sha256-1v8SFHOwUCvHDXFmQRjHZYawY19nxmtZ7zH/kwAGgj0=",
         "owner": "pyproject-nix",
         "repo": "uv2nix",
-        "rev": "e47ec890012166425d1f90fb825eff208baaef4b",
+        "rev": "ec0502250b48116fd3aa8e1347a2d0254bacd05e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "Torjus nixos config flake";
 
   inputs = {
-    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-25.05";
     #nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     home-manager = {

home/editor/neovim/default.nix

@@ -5,6 +5,9 @@
       enable = true;
       defaultEditor = true;
       vimAlias = true;
+      extraPackages = with pkgs; [
+        nodePackages_latest.nodejs
+      ];
       plugins = with pkgs.vimPlugins; [
         vim-fugitive
         undotree

home/editor/neovim/plugins.lua

@@ -17,7 +17,7 @@ lsp_zero.format_on_save({
 		['gopls'] = { 'go' },
 		['nil_ls'] = { 'nix' },
 		['lua_ls'] = { 'lua' },
-		['ts_ls'] = { 'typescript', 'javascript' },
+		['ts_ls'] = { 'typescript', 'javascript', 'typescriptreact' },
 	},
 })
 -- LSP: go
@@ -120,6 +120,7 @@ lspconfig.ts_ls.setup({
 	filetypes = {
 		"typescript",
 		"javascript",
+		"typescriptreact",
 	},
 })
 

home/hyprland/hyprland_gunter.nix

@@ -4,6 +4,25 @@
   config,
   ...
 }:
+let
+  lockhelper = pkgs.callPackage ../scripts/lockhelper.nix { };
+  monitorTopDesc = "BNQ G2420HDBL T2B04424SL000";
+  monitorTopName = "desc:${monitorTopDesc}";
+  monitorTopHash = builtins.substring 0 8 (builtins.hashString "sha256" monitorTopDesc);
+
+  monitorLeftDesc = "Samsung Electric Company LS27A600U HNMT502389";
+  monitorLeftName = "desc:${monitorLeftDesc}";
+  monitorLeftHash = builtins.substring 0 8 (builtins.hashString "sha256" monitorLeftDesc);
+
+  monitorCenterDesc = "Acer Technologies XB271HU #ASPVEKfgZ8Dd";
+  monitorCenterName = "desc:${monitorCenterDesc}";
+  monitorCenterHash = builtins.substring 0 8 (builtins.hashString "sha256" monitorCenterDesc);
+
+  monitorRightDesc = "Samsung Electric Company LS27A600U HNMT502390";
+  monitorRightName = "desc:${monitorRightDesc}";
+  monitorRightHash = builtins.substring 0 8 (builtins.hashString "sha256" monitorRightDesc);
+
+in
 {
   options.hyprland.enable = lib.mkEnableOption "Hyprland";
   config = {
@@ -31,13 +50,13 @@
       enable = true;
       settings = {
         general = {
-          lock_cmd = "hyprlock";
+          lock_cmd = "${pkgs.hyprlock}/bin/hyprlock";
-          before_sleep_cmd = "lockhelper";
+          before_sleep_cmd = "${lockhelper}/bin/lockhelper";
           ignore_dbus_inhibit = false;
         };
         listener = {
           timeout = 240;
-          on-timeout = "lockhelper";
+          on-timeout = "${lockhelper}/bin/lockhelper";
         };
       };
     };
@@ -47,8 +66,10 @@
       settings = {
         background = [
           {
-            monitor = "DP-5";
+            monitor = monitorTopName;
-            path = "/tmp/lockscreen/DP-5.png";
+            # path = "/tmp/lockscreen/${monitorTopHash}.png";
+            path = "screenshot";
+            color = "rgba(17, 17, 17, 1.0)";
             blur_passes = 3;
             contrast = 0.8916;
             brightness = 0.8172;
@@ -56,8 +77,22 @@
             vibrancy_darkness = 0.0;
           }
           {
-            monitor = "DP-6";
+            monitor = monitorLeftName;
-            path = "/tmp/lockscreen/DP-6.png";
+            # path = "/tmp/lockscreen/${monitorLeftHash}.png";
+            path = "screenshot";
+            color = "rgba(17, 17, 17, 1.0)";
+            blur_passes = 3;
+            contrast = 0.8916;
+            brightness = 0.8172;
+            vibrancy = 0.1696;
+            vibrancy_darkness = 0.0;
+            zindex = 1;
+          }
+          {
+            monitor = monitorCenterName;
+            # path = "/tmp/lockscreen/${monitorCenterHash}.png";
+            path = "screenshot";
+            color = "rgba(17, 17, 17, 1.0)";
             blur_passes = 3;
             contrast = 0.8916;
             brightness = 0.8172;
@@ -65,17 +100,10 @@
             vibrancy_darkness = 0.0;
           }
           {
-            monitor = "DP-7";
+            monitor = monitorRightName;
-            path = "/tmp/lockscreen/DP-7.png";
+            # path = "/tmp/lockscreen/${monitorRightHash}.png";
-            blur_passes = 3;
+            path = "screenshot";
-            contrast = 0.8916;
+            color = "rgba(17, 17, 17, 1.0)";
-            brightness = 0.8172;
-            vibrancy = 0.1696;
-            vibrancy_darkness = 0.0;
-          }
-          {
-            monitor = "DP-8";
-            path = "/tmp/lockscreen/DP-8.png";
             blur_passes = 3;
             contrast = 0.8916;
             brightness = 0.8172;
@@ -85,9 +113,7 @@
         ];
 
         general = {
-          no_fade_in = false;
           grace = 0;
-          disable_loading_bar = true;
         };
 
         input-field = [
@@ -125,6 +151,7 @@
     };
 
     # streamcontroller service
+
     systemd.user.services = {
       streamcontroller = {
         Unit = {
@@ -148,32 +175,40 @@
     wayland.windowManager.hyprland = {
       enable = true;
       package = pkgs.hyprland;
+      systemd.enable = false;
       settings = {
         "$mainMod" = "SUPER";
         "$shiftMainMod" = "SUPER_SHIFT";
         "$term" = "kitty";
 
         # monitors
-        "$mon_top" = "desc:BNQ G2420HDBL T2B04424SL000";
+        "$mon_top" = monitorTopName;
-        "$mon_left" = "desc:Samsung Electric Company LS27A600U HNMT502389";
+        "$mon_left" = monitorLeftName;
-        "$mon_center" = "desc:Acer Technologies XB271HU #ASPVEKfgZ8Dd";
+        "$mon_center" = monitorCenterName;
-        "$mon_right" = "desc:Samsung Electric Company LS27A600U HNMT502390";
+        "$mon_right" = monitorRightName;
 
         monitor = [
-          # "$mon_top,1920x1080@60,2560x0,1" # top T2B04424SL000
+          "$mon_top,1920x1080@60,2560x0,1" # top T2B04424SL000
-          "DP-6,1920x1080@60,2560x0,1" # top T2B04424SL000 60
+          # "DP-8,1920x1080@60,2560x0,1" # top T2B04424SL000 60
-          # "$mon_left,2560x1440@75,0x1080,1" # left
+          "$mon_left,2560x1440@75,0x1080,1" # left
-          "DP-8,2560x1440@75,0x1080,1" # left 75hz
+          # "DP-6,2560x1440@75,0x1080,1" # left 75hz
-          # "$mon_center,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd
+          "$mon_center,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd
-          "DP-5,2560x1440@144,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
+          # "DP-4,2560x1440@144,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
-          # "$mon_right,2560x1440@75,5120x1080,1" # right
+          "$mon_right,2560x1440@75,5120x1080,1" # right
-          "DP-7,2560x1440@75,5120x1080,1" # right 75hz
+          # "DP-7,2560x1440@75,5120x1080,1" # right 75hz
         ];
         input = {
           kb_layout = "no";
           follow_mouse = 1;
         };
 
+        device = [
+          {
+            name = "wacom-one-by-wacom-m-pen";
+            output = "$mon_center";
+          }
+        ];
+
         cursor = {
           no_hardware_cursors = true;
         };
@@ -268,7 +303,7 @@
           "$mainMod,Return,exec,$term"
 
           # hyprlock
-          "$shiftMainMod,l,exec,lockhelper"
+          "$shiftMainMod,l,exec,${lockhelper}/bin/lockhelper"
 
           # rofi
           "$mainMod,D,exec,rofi-launcher"
@@ -331,12 +366,6 @@
         ];
 
         exec-once = [
-          "waybar"
-          # "hyprpaper & sleep 10 && randomwp"
-          # "easyeffects --gapplication-service"
-          # "hypridle"
-          # "streamcontroller -b"
-          # "dunst"
         ];
       };
     };

home/hyprland/hyprland_magicman.nix

@@ -4,10 +4,6 @@
   ...
 }:
 {
-  imports = [
-    ./hyprlock.nix
-    ./hypridle.nix
-  ];
   options.hyprland.enable = lib.mkEnableOption "Hyprland";
   config = {
     home.packages = with pkgs; [
@@ -26,6 +22,82 @@
       libsForQt5.qt5ct
     ];
 
+    services.hyprpaper = {
+      enable = true;
+      settings = {
+        splash = false;
+      };
+    };
+
+    services.hypridle = {
+      enable = true;
+      settings = {
+        general = {
+          lock_cmd = "${pkgs.hyprlock}/bin/hyprlock";
+          before_sleep_cmd = "${pkgs.hyprlock}/bin/hyprlock";
+          ignore_dbus_inhibit = false;
+        };
+        listener = {
+          timeout = 240;
+          on-timeout = "${pkgs.hyprlock}/bin/hyprlock";
+        };
+      };
+    };
+
+    programs.hyprlock = {
+      enable = true;
+      settings = {
+        background = [
+          {
+            monitor = "";
+            path = "screenshot";
+            color = "rgba(17, 17, 17, 1.0)";
+            blur_passes = 3;
+            contrast = 0.8916;
+            brightness = 0.8172;
+            vibrancy = 0.1696;
+            vibrancy_darkness = 0.0;
+          }
+        ];
+
+        general = {
+          grace = 0;
+        };
+
+        input-field = [
+          {
+            size = "250, 60";
+            outline_thickness = 2;
+            dots_size = 0.2;
+            dots_spacing = 0.2;
+            dots_center = true;
+            outer_color = "rgba(0, 0, 0, 0)";
+            inner_color = "rgba(0, 0, 0, 0.5)";
+            font_color = "rgb(200, 200, 200)";
+            fade_on_empty = false;
+            font_family = "JetBrains Mono Nerd Font Mono";
+            placeholder_text = "<i><span foreground=\"##cdd6f4\">Input Password...</span></i>";
+            hide_input = false;
+            position = "0, -120";
+            halign = "center";
+            valign = "center";
+          }
+        ];
+
+        label = [
+          {
+            text = "cmd[update:2000] echo \"$(date +\"%b %d %H:%M\")\"";
+            color = "rgba(255, 255, 255, 0.6)";
+            font_size = 120;
+            font_family = "JetBrains Mono Nerd Font Mono ExtraBold";
+            position = "0, -300";
+            halign = "center";
+            valign = "top";
+          }
+        ];
+      };
+    };
+
     wayland.windowManager.hyprland = {
       enable = true;
       package = pkgs.hyprland;
@@ -111,7 +183,7 @@
           "$mainMod,P,exec,rofi-rbw"
 
           # hyprlock
-          "$shiftMainMod,l,exec,lockhelper"
+          "$shiftMainMod,l,exec,${pkgs.hyprlock}/bin/hyprlock"
 
           # hyprland
           "$mainMod,Q,killactive,"
@@ -148,7 +220,6 @@
         ];
 
         exec-once = [
-          "waybar"
         ];
       };
     };

home/hyprland/waybar/default.nix

@@ -45,7 +45,7 @@ in
   programs.waybar = {
     enable = true;
     systemd = {
-      enable = false; # disable it,autostart it in hyprland conf
+      enable = true; # disable it,autostart it in hyprland conf
       target = "graphical-session.target";
     };
     style = ''

home/packages/default.nix

@@ -5,12 +5,11 @@ in
 {
   imports = [
     ./zoom.nix
+    ./tacl.nix
   ];
   home.packages = with pkgs; [
     # CLI utils
-    act
     age
-    aichat
     bat
     bzip2
     chromium
@@ -24,12 +23,8 @@ in
     ffmpeg
     file
     fzf
-    glib
     grimblast
     ijq
-    incus
-    jellyfin-media-player
-    jujutsu
     jq
     kitty
     kubectl
@@ -39,9 +34,9 @@ in
     nvd
     nurl
     nwg-look
+    mosh
     most
     pinentry
-    pre-commit
     pulseaudio
     pulsemixer
     rbw
@@ -55,7 +50,6 @@ in
     tldr
     tokei
     unzip
-    ventoy
     wtype
 
     # Non-CLI stuff
@@ -66,30 +60,18 @@ in
     mpv
     mumble
     pamixer
+    pwvucontrol
+    prismlauncher
     rofi-rbw-wayland
-    spicetify-cli
     spotify
     virt-manager
-    vmware-horizon-client
+    # omnissa-horizon-client
     yt-dlp
 
-    # k8s tools
-    cilium-cli
-    cmctl
-    k9s
-    krew
-    kubernetes-helm
-    talosctl
-
     # Go stuff
     go
-    delve
     gopls
-
+    delve
-    # js/ts
-    nodejs
-    nodePackages.pnpm
-    typescript
 
     # Py stuff
     (python312.withPackages (
@@ -98,7 +80,7 @@ in
         ipython
       ]
     ))
-    poetry
+    uv
     ruff
 
     # rust stuff
@@ -112,16 +94,9 @@ in
     nixprstatus
 
     # Stuff with overrides
-    # Btop
     (btop.override { cudaSupport = withCuda; })
-    # PrismLauncher
-    prismlauncher
 
-    # From nix-packages flake
+    # Extract logcli from grafana-loki
-    path-of-building-beta
-    awakened-poe-trade
-
-    (pkgs.callPackage ./vintagestory.nix { })
     (pkgs.linkFarm "logcli" [
       {
         name = "bin/logcli";

home/packages/tacl.nix

@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+{
+  home.packages = [
+    (pkgs.python3Packages.buildPythonApplication rec {
+      pname = "tacl";
+      version = "3.9.0";
+      pyproject = true;
+
+      src = pkgs.fetchFromGitHub {
+        owner = "unioslo";
+        repo = "tsd-api-client";
+        rev = "v${version}";
+        sha256 = "sha256-R8fSAhpdjspIoLy3m6NnHZBCBTSLQGWOqAiDkBZlWOc=";
+      };
+
+      build-system = with pkgs.python3Packages; [
+        poetry-core
+        poetry-dynamic-versioning
+      ];
+      dependencies = with pkgs.python3Packages; [
+        pyyaml
+        click
+        humanfriendly
+        libnacl
+        requests
+        rich
+      ];
+    })
+  ];
+}

home/programs/dunst/default.nix

@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:
@@ -14,13 +12,12 @@
     };
     settings = {
       global = {
-        rounded = "yes";
         origin = "top-right";
         monitor = "4";
         alignment = "left";
         vertical_alignment = "center";
-        width = "400";
+        width = "(0, 400)";
-        height = "400";
+        height = "(0, 400)";
         scale = 0;
         gap_size = 0;
         progress_bar = true;
@@ -44,7 +41,7 @@
         format = "<b>%s</b>\\n%b"; # format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b"
         frame_color = "#232323";
         frame_width = 1;
-        offset = "15x15";
+        offset = "(15, 15)";
         horizontal_padding = 10;
         icon_position = "left";
         indicate_hidden = "yes";
@@ -54,7 +51,6 @@
         mouse_middle_click = "close_current";
         mouse_right_click = "close_all";
         padding = 10;
-        plain_text = "no";
         separator_height = 2;
         show_indicators = "yes";
         shrink = "no";

home/programs/obs-studio/default.nix

@@ -7,11 +7,7 @@
 let
   withCuda = osConfig.system.name == "gunter";
 
-  onnxruntime-gpu = (pkgs.onnxruntime.override { cudaSupport = withCuda; }).overrideAttrs (old: {
+  onnxruntime-gpu = (pkgs.onnxruntime.override { cudaSupport = withCuda; });
-    # TODO: Remove when fixed in nixpkgs
-    # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/development/libraries/onnxruntime/default.nix#L154
-    buildInputs = old.buildInputs ++ [ pkgs.cudaPackages.nccl ];
-  });
 
   obs-backgrounremoval-gpu = (
     (pkgs.obs-studio-plugins.obs-backgroundremoval.override { onnxruntime = onnxruntime-gpu; })
@@ -35,6 +31,9 @@ in
 {
   programs.obs-studio = {
     enable = true;
+    package = pkgs.obs-studio.override {
+      cudaSupport = withCuda;
+    };
     plugins =
       with pkgs.obs-studio-plugins;
       [

home/programs/vscode/default.nix

@@ -7,17 +7,23 @@
       enableExtensionUpdateCheck = true;
       userSettings = {
         "window.titleBarStyle" = "custom";
+        "rust-analyzer.testExplorer" = true;
+        "rust-analyzer.restartServerOnConfigChange" = true;
+        "direnv.restart.automatic" = true;
       };
       extensions = with pkgs.vscode-extensions; [
+        bbenoist.nix
         catppuccin.catppuccin-vsc
         catppuccin.catppuccin-vsc-icons
+        github.copilot
+        github.copilot-chat
         golang.go
-        vscodevim.vim
+        mkhl.direnv
         ms-python.python
         ms-vscode-remote.remote-ssh
-        bbenoist.nix
+        rooveterinaryinc.roo-cline
-        mkhl.direnv
         rust-lang.rust-analyzer
+        vscodevim.vim
       ];
     };
   };

home/scripts/default.nix

@@ -1,6 +1,8 @@
 { pkgs, config, ... }:
 {
-  imports = [ ./lockhelper.nix ];
+  imports = [
+    ./noita-helper.nix
+  ];
   home.file.".local/bin/hl-no-opacity" = {
     source = ./hl-no-opacity.sh;
     executable = true;

home/scripts/lockhelper.nix

@@ -1,14 +1,21 @@
-{ pkgs, ... }:
-let
-  lockhelper = pkgs.writeShellApplication {
-    name = "lockhelper";
-    runtimeInputs = with pkgs; [
-      grim
-      jq
-    ];
-    text = (builtins.readFile ./lockhelper.sh);
-  };
-in
 {
-  home.packages = [ lockhelper ];
+  writeShellApplication,
+  grim,
+  jq,
+  gawk,
+  hyprland,
+  hyprlock,
+  procps,
+}:
+writeShellApplication {
+  name = "lockhelper";
+  runtimeInputs = [
+    grim
+    jq
+    gawk
+    hyprland
+    hyprlock
+    procps
+  ];
+  text = (builtins.readFile ./lockhelper.sh);
 }

home/scripts/lockhelper.sh

@@ -3,11 +3,14 @@ set -eo pipefail
 
 mkdir -p /tmp/lockscreen || true
 
-monitors=$(hyprctl monitors -j | jq -r '.[] | select( .name | contains ("DP")) | .name')
+monitor_lines=$(hyprctl monitors -j | jq -r '.[] | select (.name | contains ("DP")) | [.name, .description]| @tsv')
 
 while IFS= read -r m; do
-    grim -o "$m" "/tmp/lockscreen/$m.png" || true
+    name=$(echo "$m" | awk -F $'\t' '{print $1}')
-done <<< "$monitors"
+    sum=$(echo "$m" | awk -F $'\t' '{printf $2}' | sha256sum | awk '{print substr($1,1,8)}')
+
+    grim -o "$name" "/tmp/lockscreen/$sum.png" || true
+done <<< "$monitor_lines"
 
 # Only lock if not already running
 if [ -z "$(pgrep hyprlock)" ] 

home/scripts/noita-helper.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+let
+  noita-helper = pkgs.writeShellApplication {
+    name = "noita-helper";
+    runtimeInputs = with pkgs; [
+      grim
+      jq
+    ];
+    text = (builtins.readFile ./noita-helper.sh);
+  };
+in
+{
+  home.packages = [ noita-helper ];
+}

home/scripts/noita-helper.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+SAVE_DIR="/home/torjus/.local/share/Steam/steamapps/compatdata/881100/pfx/drive_c/users/steamuser/AppData/LocalLow/Nolla_Games_Noita"
+
+RESTIC_REPOSITORY="/home/$(whoami)/tmp/noita-backup"
+export RESTIC_REPOSITORY
+export RESTIC_PASSWORD="noita"
+
+function start {
+    echo "Doing initial backup"
+    restic backup -q "$SAVE_DIR"
+    echo "Backup done"
+
+    echo "Mounting tmpfs for save folder..."
+    sudo mount -o size=2G,noswap -t tmpfs none "$SAVE_DIR"
+
+    echo "Restoring initial backup..."
+    restic restore "latest:$SAVE_DIR" --target "$SAVE_DIR"
+
+    echo "Ready to play Noita!"
+    echo "Remember to run $0 stop when done."
+
+    while true
+    do
+        restic backup -q "$SAVE_DIR"
+        echo "Periodic backup done..."
+        sleep 10m
+    done
+}
+
+function stop {
+    restic backup -q $SAVE_DIR
+    sudo umount $SAVE_DIR
+    restic restore latest:$SAVE_DIR --target $SAVE_DIR
+    echo "Backup and unmount done..."
+}
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 {start|stop}"
+    exit 1
+fi
+
+if [ "$1" == "start" ]; then
+    start
+elif [ "$1" == "stop" ]; then
+    stop
+else
+    echo "Usage: $0 {start|stop}"
+    exit 1
+fi

home/ssh/config.nix

@@ -18,26 +18,34 @@ in
 {
   programs.ssh = {
     enable = true;
-    controlMaster = "auto";
+    enableDefaultConfig = false;
 
     matchBlocks = {
       "bmo.uio.no-on-eduroam" = (
         lib.mkIf (osConfig.system.name == "magicman") (
-          lib.hm.dag.entryBefore [ "bmo.uio.no" ] {
+          lib.hm.dag.entryBefore [ "bmo.uio.no" "*" ] {
             match = "host bmo.uio.no exec \"nmcli -g GENERAL.STATE c s eduroam|grep -q -E '\\bactiv'\"";
             hostname = "bmo.uio.no";
             forwardAgent = false;
+            serverAliveInterval = 30;
+            controlMaster = "auto";
+            controlPath = "/run/user/%i/ssh-cm-%C";
           }
         )
       );
 
-      "bmo.uio.no" = {
+      "bmo.uio.no" = lib.hm.dag.entryBefore [ "*" ] {
-        setEnv = {
-          # TERM = "xterm-256color";
-        };
         hostname = "bmo.uio.no";
         forwardAgent = false;
         proxyJump = "torjus@rlogin.uio.no";
+        serverAliveInterval = 30;
+        controlMaster = "auto";
+        controlPath = "/run/user/%i/ssh-cm-%C";
+      };
+
+      "*" = {
+        serverAliveInterval = 30;
+        controlMaster = "auto";
       };
     };
   };

home/zsh/default.nix

@@ -24,7 +24,7 @@
       nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/nixos";
       ndiffbuild = "sudo nixos-rebuild build --flake /home/${user}/nixos && nvd diff /run/current-system /home/${user}/nixos/result";
     };
-    initExtra = ''
+    initContent = ''
       bindkey -v
       bindkey '^R' history-incremental-search-backward
 

hosts/gunter/configuration.nix

@@ -25,7 +25,7 @@
   boot = {
     # Kernel stuff
     kernelPackages = pkgs.linuxPackages_latest;
-    # kernelPackages = lib.warn "Pinned to kernel 6.12 due to nvidia! Fixed in 375838" pkgs.linuxPackages_6_12;
+    # kernelPackages = lib.warn "Pinned to kernel 6.14 due to nvidia issues" pkgs.linuxPackages_6_14;
     kernelParams = [
       "quiet"
       "splash"
@@ -53,6 +53,9 @@
   networking.nftables.enable = true;
   networking.firewall = {
     enable = true;
+    allowedTCPPorts = [
+      8989
+    ];
   };
 
   # Set time stuff
@@ -75,15 +78,18 @@
     open = true;
     nvidiaSettings = false;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    # package = config.boot.kernelPackages.nvidiaPackages.beta;
-    # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+    package =
-    #   version = "560.28.03";
+      lib.warn "nvidia driver override to use 580.82.07"
-    #   sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
+        config.boot.kernelPackages.nvidiaPackages.mkDriver
-    #   sha256_aarch64 = lib.fakeHash;
+        {
-    #   openSha256 = "sha256-asGpqOpU0tIO9QqceA8XRn5L27OiBFuI9RZ1NjSVwaM=";
+          version = "580.82.07";
-    #   settingsSha256 = lib.fakeHash;
+          sha256_64bit = "sha256-Bh5I4R/lUiMglYEdCxzqm3GLolQNYFB0/yJ/zgYoeYw=";
-    #   persistencedSha256 = lib.fakeSha256;
+          sha256_aarch64 = lib.fakeHash;
-    # };
+          openSha256 = "sha256-8/7ZrcwBMgrBtxebYtCcH5A51u3lAxXTCY00LElZz08=";
+          settingsSha256 = lib.fakeHash;
+          persistencedSha256 = lib.fakeSha256;
+        };
   };
 
   # Setup hyprland
@@ -94,14 +100,13 @@
   #     };
   #   })
   # ];
+  services.displayManager.gdm.wayland = true;
+
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
-  services.xserver.displayManager.gdm.wayland = true;
-  services.xserver.displayManager.lightdm.enable = false;
-  services.xserver.displayManager.startx.enable = true;
-  services.xserver.windowManager.i3.enable = true;
   programs.hyprland = {
     enable = true;
+    withUWSM = true;
     xwayland.enable = true;
     portalPackage = pkgs.xdg-desktop-portal-hyprland;
   };

hosts/gunter/default.nix

@@ -13,6 +13,7 @@
     ./ollama.nix
     ./streamdeck.nix
     ./alvr.nix
+    ./ratbagd.nix
     ../../system
     ../../home/gunter.nix
   ];

hosts/gunter/hardware-configuration.nix

@@ -25,7 +25,9 @@
     "kvm-amd"
     "v4l2loopback"
   ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    v4l2loopback
+  ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a7d4b697-fffa-4bcb-9dd7-cbbd6121a50c";

hosts/gunter/ollama.nix

@@ -6,6 +6,7 @@
   };
   services.open-webui = {
     enable = true;
+    package = pkgs.stable.open-webui;
     # enable = lib.warn "Open WebUI is disabled" false;
     environment = {
       VECTOR_DB = "pgvector";

hosts/gunter/ratbagd.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+{
+  services.ratbagd.enable = true;
+  environment.systemPackages = with pkgs; [ piper ];
+}

hosts/gunter/streamdeck.nix

@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  programs.streamcontroller.enable = true;
+  programs.streamcontroller.enable = pkgs.lib.warn "streamcontroller broken due to textual" false;
 }

hosts/magicman/configuration.nix

@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:
@@ -24,6 +22,7 @@
     enable = true;
     configurationLimit = 3;
   };
+
   boot.loader.efi = {
     canTouchEfiVariables = true;
   };
@@ -49,14 +48,19 @@
   # Set time stuff
   time.timeZone = "Europe/Oslo";
 
-  # Enable opengl
+  hardware = {
-  hardware.graphics = {
+    enableRedistributableFirmware = true;
-    enable = true;
+    enableAllFirmware = true;
-    extraPackages = with pkgs; [
+
-      intel-media-driver
+    # Enable opengl
-      vaapiVdpau
+    graphics = {
-      libvdpau-va-gl
+      enable = true;
-    ];
+      extraPackages = with pkgs; [
+        intel-media-driver
+        vaapiVdpau
+        libvdpau-va-gl
+      ];
+    };
   };
 
   # Bluetooth stuff
@@ -78,12 +82,13 @@
 
   # Setup hyprland
   services.xserver.enable = true;
-  services.xserver.displayManager = {
+  services.displayManager.gdm.wayland = {
     gdm.wayland = true;
     lightdm.enable = false;
   };
   programs.hyprland = {
     enable = true;
+    withUWSM = true;
     xwayland.enable = true;
     portalPackage = pkgs.xdg-desktop-portal-hyprland;
   };
@@ -91,12 +96,6 @@
   # TRIM
   services.fstrim.enable = true;
 
-  # TLP
-  services.tlp.enable = true;
-
-  # Brillo
-  hardware.brillo.enable = true;
-
   # Setup common XDG env vars
   environment.sessionVariables = rec {
     XDG_CACHE_HOME = "$HOME/.cache";

hosts/magicman/default.nix

@@ -8,6 +8,7 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
+    ./laptop.nix
     ../../system
     ../../home/magicman.nix
   ];

hosts/magicman/laptop.nix

@@ -0,0 +1,21 @@
+{ ... }:
+{
+  hardware.brillo.enable = true;
+  powerManagement.enable = true;
+
+  services.tlp.enable = true;
+
+  services.auto-cpufreq = {
+    enable = true;
+    settings = {
+      battery = {
+        governor = "powersave";
+        turbo = "never";
+      };
+      charger = {
+        governor = "performance";
+        turbo = "auto";
+      };
+    };
+  };
+}

system/default.nix

@@ -6,6 +6,7 @@
     ./git.nix
     ./greetd.nix
     ./libvirt.nix
+    ./locale.nix
     ./podman.nix
     ./security.nix
     ./services.nix

system/greetd.nix

@@ -4,7 +4,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd \"dbus-run-session Hyprland\"";
+        command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd \"uwsm start default\"";
         user = "greeter";
       };
     };

system/locale.nix

@@ -0,0 +1,12 @@
+{ ... }:
+{
+  i18n = {
+    supportedLocales = [
+      "en_US.UTF-8/UTF-8"
+      "nb_NO.UTF-8/UTF-8"
+    ];
+    extraLocaleSettings = {
+      LC_TIME = "nb_NO.UTF-8";
+    };
+  };
+}

system/monitoring/metrics.nix

@@ -1,11 +1,18 @@
 { ... }:
 {
-  services.prometheus.exporters.node = {
+  services.prometheus.exporters = {
-    enable = true;
+    node = {
-    openFirewall = true;
+      enable = true;
-    enabledCollectors = [
+      openFirewall = true;
-      "systemd"
+      enabledCollectors = [
-      "logind"
+        "systemd"
-    ];
+        "logind"
+      ];
+    };
+    smartctl = {
+      enable = true;
+      openFirewall = true;
+      devices = [ "/dev/nvme0n1" ];
+    };
   };
 }