Use different resolution at work

README.md

@@ -10,7 +10,6 @@ Each system has its own dedicated configuration module.
 | **gandalf** | Personal system configuration for `gandalf`. |
 | **frodo**   | Personal system configuration for `frodo`. |
 | **legolas** | Personal system configuration for `legolas`. |
-| **balrog**  | Personal system configuration for `balrog`. |
 | **work**    | Work-oriented system configuration for `work`. |
 
 
@@ -19,7 +18,7 @@ Each system has its own dedicated configuration module.
 To rebuild and switch to a specific system:
 
 ```bash
-# Replace <system> with gandalf, frodo, legolas, balrog or work
+# Replace <system> with gandalf, frodo, legolas, or work
 sudo nixos-rebuild switch --flake .#<system>
 ```
 

flake.lock

@@ -7,58 +7,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1781184346,
+        "lastModified": 1775425411,
-        "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
+        "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=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780902259,
+        "lastModified": 1776734388,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "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,
+        "lastModified": 1776329215,
-        "narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=",
+        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b503dde361500433ca25a32e8f4d218bf58fb659",
+        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
         "type": "github"
       },
       "original": {
@@ -71,7 +56,6 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }

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,12 +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";
-    };
-
-    nix-flatpak = {
-      url = "github:gmodena/nix-flatpak";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

outputs.nix

@@ -1,4 +1,4 @@
-{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
+{ nixpkgs, nixpkgs-unstable, home-manager, ... }:
 
 let
   mkPkgsUnstable = system: import nixpkgs-unstable {
@@ -13,10 +13,8 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/gandalf
       ];
@@ -25,10 +23,8 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/frodo
       ];
@@ -37,34 +33,18 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/legolas
       ];
     };
-    "balrog" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        home-manager.nixosModules.home-manager
-        ./systems/balrog
-      ];
-    };
     "work" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/work
       ];

systems/balrog/default.nix

@@ -1,57 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system. Help is available in the configuration.nix(5) man page, on
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../modules/home-manager.nix
-      ../modules/common.nix
-      ../modules/users.nix
-      ../modules/locales.nix
-      ../modules/services.nix
-      ../modules/programs.nix
-      ../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 = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
-    };
-    grub = {
-       efiSupport = true;
-       device = "nodev";
-    };
-  };
-
-  networking.hostName = "balrog";
-  networking.networkmanager.enable = true;
-  networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ];
-
-  hardware.enableAllFirmware = true;
-
-  boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
-
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    broadcom_sta
-  ];
-
-  nixpkgs.config = {
-    allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"]; 
-  };
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-  system.stateVersion = "25.11"; # Did you read the comment?
-}

systems/balrog/hardware-configuration.nix

@@ -1,31 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A202-E19C";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

systems/gandalf/default.nix

@@ -23,12 +23,8 @@
       ../modules/qbittorrent.nix
       ../modules/gimp.nix
       ../modules/openscad.nix
-      ../modules/bambu-studio-flatpak.nix
+      ../modules/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;
@@ -36,7 +32,6 @@
   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/bambu-studio-flatpak.nix

@@ -1,8 +0,0 @@
-{ pkgs, ...}:
-
-{
-  services.flatpak.enable = true;
-  services.flatpak.packages = [
-    "com.bambulab.BambuStudio"
-  ];
-}

systems/modules/bambu-studio.nix

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

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/flatpak.nix

@@ -0,0 +1,5 @@
+{ pkgs, ...}: 
+
+{
+  services.flatpak.enable = true;
+}

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/git.nix

@@ -1,4 +1,4 @@
-{ lib, pkgsUnstable, config, ... }:
+{ lib, pkgs, config, ... }:
 
 {
   options.home.git = {
@@ -18,7 +18,6 @@
   config = {
     programs.git = {
       enable = true;
-      package = pkgsUnstable.git;
       settings.user = {
         name = config.home.git.userName;
         email = config.home.git.userEmail;

systems/modules/home/programs/tmux.nix

@@ -1,8 +1,5 @@
 { pkgs, ... }:
 
 {
-  programs.tmux = { 
+  programs.tmux.enable = true;
-    enable = true;
-    mouse = 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
+      vscodevim.vim
-      continue.continue
     ];
 
     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/hyprland.nix

@@ -27,8 +27,7 @@ in
       settings = {
         ### MONITOR
         monitor = [
-          "eDP-1,1920x1200,auto,1"
+          "DP-3,1920x1080,auto,1"
-          "DP-3,2440x1440,auto,1"
           ",preferred,auto,1"
         ];
 
@@ -69,7 +68,7 @@ in
           shadow = {
             enabled = true;
             color = "rgba(00000055)";
-            #ignore_window = true;
+            ignore_window = true;
             offset = "0 15";
             range = 100;
             render_power = 2;

systems/modules/ollama.nix

@@ -1,8 +1,10 @@
-{ pkgsUnstable, ... }:
+{ pkgs, ... }:
 
 {
   services.ollama = {
     enable = true;
-    package = pkgsUnstable.ollama-cuda;
+    package = pkgs.ollama-cuda;
   };
+
+  services.open-webui.enable = true;
 }

systems/modules/users.nix

@@ -5,7 +5,7 @@
     initialPassword = "welcome";
     isNormalUser = true;
     description = "Armel van Ravels";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     packages = with pkgs; [
       home-manager
       legcord

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 = [