Use different resolution at work

flake.lock

@@ -7,27 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1781184346,
-        "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
+        "lastModified": 1775425411,
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1780908363,
-        "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=",
+        "lastModified": 1776625032,
+        "narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
+        "rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc",
         "type": "github"
       },
       "original": {
@@ -38,27 +38,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780902259,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "lastModified": 1776734388,
+        "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-26.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781141223,
-        "narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=",
+        "lastModified": 1776949667,
+        "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b503dde361500433ca25a32e8f4d218bf58fb659",
+        "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-26.05";
+      url = "github:nixos/nixpkgs/nixos-25.11";
     };
 
     nixpkgs-unstable = {
@@ -11,7 +11,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-26.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

systems/balrog/default.nix

@@ -17,13 +17,8 @@
       ../modules/docker.nix
       ../modules/printing.nix
       ../modules/bambu-studio-flatpak.nix
-      ../modules/arduino-ide.nix
-      ../modules/devenv.nix
-#      ../modules/bitwarden.nix
     ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.loader.systemd-boot.enable = false;
   boot.loader = {
     efi = {

systems/gandalf/default.nix

@@ -24,19 +24,14 @@
       ../modules/gimp.nix
       ../modules/openscad.nix
       ../modules/bambu-studio-flatpak.nix
-      ../modules/arduino-ide.nix
-      ../modules/bitwarden.nix
     ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "gandalf";
   networking.networkmanager.enable = true;
   networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
-  networking.firewall.enable = false;
 
   home-manager.users.avravels.home.hyprland.execOnce = [
     "waybar"

systems/modules/arduino-ide.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    arduino-ide
-  ];
-}
-

systems/modules/bitwarden.nix

@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-39.8.10"
-  ];
-
-  environment.systemPackages = with pkgs; [
-    bitwarden-desktop
-  ];
-}
-

systems/modules/devenv.nix

@@ -1,10 +0,0 @@
-
-{ config, pkgsUnstable, ... } :
-
-{
-  environment.systemPackages = with pkgsUnstable; [
-    devenv
-  ];
-
-  nix.settings.trusted-users = [ "root" "avravels" ];
-}

systems/modules/home/home.nix

@@ -9,7 +9,7 @@
 
   imports = [
     ./other/fonts.nix
-#    ./programs/bitwarden.nix
+    ./programs/bitwarden.nix
     ./programs/kitty.nix
     ./programs/zsh.nix
     ./programs/direnv.nix

systems/modules/home/programs/firefox.nix

@@ -1,9 +1,9 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   programs.firefox = {
     enable = true;
-    configPath = "${config.xdg.configHome}/mozilla/firefox";
+
     profiles.default = {
       settings = {
         "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";

systems/modules/home/programs/nvim.nix

@@ -3,8 +3,6 @@
 {
   programs.neovim = {
     enable = true;
-    withRuby = false;
-    withPython3 = false;
     defaultEditor = true;
     extraLuaPackages = ps: [ ps.magick ];
     extraPackages = [
@@ -29,7 +27,7 @@
       image-nvim
     ];
 
-    initLua = ''
+    extraLuaConfig = ''
       vim.cmd("colorscheme catppuccin-mocha")
       -- Basic settings
       vim.o.number = true

systems/modules/home/programs/tmux.nix

@@ -1,8 +1,5 @@
 { pkgs, ... }:
 
 {
-  programs.tmux = { 
-    enable = true;
-    mouse = true;
-  };
+  programs.tmux.enable = true;
 }

systems/modules/home/programs/vscode.nix

@@ -1,24 +1,22 @@
-{ pkgs, pkgsUnstable, ... }:
+{ pkgs, ... }:
 
 {
   programs.vscode = {
     enable = true;
 
-    package = pkgsUnstable.vscode.fhs;
+    package = pkgs.vscode.fhs;
     profiles.default.extensions = with pkgs.vscode-extensions; [
       ms-dotnettools.csharp
       ms-dotnettools.csdevkit
       ms-dotnettools.vscode-dotnet-runtime
       mkhl.direnv   # Direnv integration for VSCode
       catppuccin.catppuccin-vsc
-      bmewburn.vscode-intelephense-client
-      continue.continue
+      vscodevim.vim
     ];
 
     profiles.default.userSettings = {
       "editor.lineNumbers" = "relative";
       "workbench.colorTheme" = "Catppuccin Mocha";
-      "workbench.editor.enablePreview" = false;
       "direnv.restart.automatic" = true;
       "terminal.integrated.defaultProfile.linux" = "zsh";
       "terminal.integrated.profiles.linux" = {

systems/modules/home/wm/gtk.nix

@@ -15,7 +15,6 @@
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    gtk4.theme = null;
   };
 
   home.sessionVariables = {

systems/modules/home/wm/hyprland.nix

@@ -23,46 +23,26 @@ in
 
     wayland.windowManager.hyprland = {
       enable = true;
-      configType = "lua";
-      settings =
-      let
-        mkLuaInline = lib.generators.mkLuaInline;
-        toLua = lib.generators.toLua;
-        mkArgs = args: { _args = args; };
-        bind =
-          keys: dispatcher: options:
-          mkArgs [
-            keys
-            dispatcher
-            options
-          ];
-        dsp = {
-          exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
-          focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
-          window = {
-            move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
-            drag = mkLuaInline "hl.dsp.window.drag()";
-            resize = mkLuaInline "hl.dsp.window.resize()";
-            close = mkLuaInline "hl.dsp.window.close()";
-            kill = mkLuaInline "hl.dsp.window.kill()";
-            fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
-          };
-          exit = mkLuaInline "hl.dsp.exit()";
-          workspace = {
-            move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
-          };
-        };
-        mod = "SUPER";
-        workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
-      in
-      {
-        config = {
-          general = {
-            resize_on_border = true;
-            allow_tearing = true;
-          };
 
-          animations.enabled = true;
+      settings = {
+        ### MONITOR
+        monitor = [
+          "DP-3,1920x1080,auto,1"
+          ",preferred,auto,1"
+        ];
+
+        ### VARIABLES
+        "$mod" = "SUPER";
+        "$terminal" = "kitty";
+        "$menu" = "rofi -show drun";
+        "$bluetoothMenu" = "bzmenu --launcher rofi";
+        "$files" = "rofi -show filebrowser";
+
+        ### BASIC LAYOUT
+        general = {
+          layout = "dwindle";
+          resize_on_border = true;
+        };
 
         decoration = {
           inactive_opacity = 0.8;
@@ -84,9 +64,11 @@ in
             popups = true;
             popups_ignorealpha = 0.2;
           };
+
           shadow = {
             enabled = true;
             color = "rgba(00000055)";
+            ignore_window = true;
             offset = "0 15";
             range = 100;
             render_power = 2;
@@ -94,80 +76,79 @@ in
           };
         };
 
-          misc = {
-            focus_on_activate = true;
-          };
+        # Use the configurable option here (default `[ "waybar" ]`)
+        exec-once = (if cfg == null then { execOnce = [ "waybar" ]; } else cfg).execOnce;
+
+        ### INPUT
+        input = {
+          kb_layout = "us";
         };
 
-        bind = lib.flatten [
-          (bind "${mod} + Q" (dsp.window.kill) { })
-          (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
-          (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
-          (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
-          (bind "${mod} + F" (dsp.window.fullscreen) { })
-          (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
-          (bind "${mod} + M" (dsp.exit) { })
-          (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
-          (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
+        ### KEYBINDINGS
+        bind = [
+          # Apps
+          "$mod, RETURN, exec, $terminal"
+          "$mod, D, exec, $menu"
+          "$mod, B, exec, $bluetoothMenu"
+          "$mod, G, exec, $files"
+          "$mod, Q, killactive"
+          "$mod, F, fullscreen"
+          "$mod, M, exit"
+          "$mod, L, exec, hyprlock"
 
-          (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
-          (bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
-          (bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
-          (bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
+          # show/hide waybar
+          "$mod, W, exec, pkill -SIGUSR1 -f '^waybar$'"
 
-          (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
-          (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
-          (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
-          (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
+          # Focus
+          "$mod, LEFT,  movefocus, l"
+          "$mod, RIGHT, movefocus, r"
+          "$mod, UP,    movefocus, u"
+          "$mod, DOWN,  movefocus, d"
 
-          (bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
-          (bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
-          (bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
-          (bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
-          (bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
-          (bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
-          (bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
-          (bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
-          (bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
+          # Workspaces
+          "$mod, 1, workspace, 1"
+          "$mod, 2, workspace, 2"
+          "$mod, 3, workspace, 3"
+          "$mod, 4, workspace, 4"
+          "$mod, 5, workspace, 5"
+          "$mod, 6, workspace, 6"
+          "$mod, 7, workspace, 7"
+          "$mod, 8, workspace, 8"
+          "$mod, 9, workspace, 9"
 
-          (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
-          (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
-          (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
-          (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
-          (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
-          (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
-          (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
-          (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
-          (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
+          "$mod SHIFT, 1, movetoworkspace, 1"
+          "$mod SHIFT, 2, movetoworkspace, 2"
+          "$mod SHIFT, 3, movetoworkspace, 3"
+          "$mod SHIFT, 4, movetoworkspace, 4"
+          "$mod SHIFT, 5, movetoworkspace, 5"
+          "$mod SHIFT, 6, movetoworkspace, 6"
+          "$mod SHIFT, 7, movetoworkspace, 7"
+          "$mod SHIFT, 8, movetoworkspace, 8"
+          "$mod SHIFT, 9, movetoworkspace, 9"
 
-          (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
-            repeating = true;
-            locked = true;
-          })
-          (bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
-            repeating = true;
-            locked = true;
-          })
-          (bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
-          (bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
-          (bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
+          # Window movement
+          "$mod SHIFT, LEFT,  movewindow, l"
+          "$mod SHIFT, RIGHT, movewindow, r"
+          "$mod SHIFT, UP,    movewindow, u"
+          "$mod SHIFT, DOWN,  movewindow, d"
 
-          (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
-          (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
+          # Hyprshot
+          "$mod, Z, exec, hyprshot -m region"
+
+          # Media keys
+          ", XF86AudioPlay,        exec, playerctl play-pause"
+          ", XF86AudioMute,        exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+          ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+          ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+          ", XF86AudioNext,        exec, playerctl next"
+          ", XF86AudioPrev,        exec, playerctl previous"
+
+          ", XF86Calculator,       exec, speedcrunch"
         ];
 
-        on = mkArgs [
-          "hyprland.start"
-          (mkLuaInline ''
-            function()
-              hl.exec_cmd("waybar")
-              hl.monitor({
-                output = "",
-                mode = "preferred",
-                position = "auto",
-                scale = 1,
-              })
-            end'')
+        bindm = [
+          "$mod, mouse:272, movewindow"
+          "$mod, mouse:273, resizewindow"
         ];
       };
     };

systems/modules/home/wm/hyprpaper.nix

@@ -10,20 +10,14 @@ in
     enable = true;
 
     settings = {
-      splash = false;
       preload = [
         wallpaper
         wallpaper2
         wallpaper3
       ];
-
       wallpaper = [
-        {
-          monitor = "";
-          path = wallpaper3;
-        }
+        ",${wallpaper3}"
       ];
     };
   };
 }
-

systems/modules/ollama.nix

@@ -5,4 +5,6 @@
     enable = true;
     package = pkgsUnstable.ollama-cuda;
   };
+
+  services.open-webui.enable = true;
 }

systems/modules/users.nix

@@ -5,12 +5,12 @@
     initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     packages = with pkgs; [
       home-manager
       legcord
       spotify
-      proton-vpn
+      protonvpn-gui
     ];
     shell = pkgs.zsh;
   };

systems/work/default.nix

@@ -22,12 +22,8 @@
       ../modules/gimp.nix
       ../modules/jq.nix
       ../modules/enova.nix
-      ../modules/devenv.nix
-      ../modules/bitwarden.nix
     ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
@@ -36,6 +32,7 @@
   boot.initrd.systemd.enable = true;
 
   programs.nix-ld.enable = true;
+
   networking.hostName = "laptop-armel";
 
   home-manager.users.avravels.home.hyprland.execOnce = [