add freecad

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1767520119,
-        "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=",
+        "lastModified": 1774186997,
+        "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "5720d3282844b6b23b26dfac075a5f1f58ea8844",
+        "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1769201405,
-        "narHash": "sha256-k/KQL7J9ZnLlF28E6ywGpfo5dxkuxCcEtJ/XEZDTw3M=",
+        "lastModified": 1776608760,
+        "narHash": "sha256-ehDv8bF7k/2Kf4b8CCoSm51U/MOoFuLsRXqe5wZ57sE=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "ff53672af48a106f52857d62c9275b165cc452ef",
+        "rev": "7e06e29005853bbaaa3b1c1067f915d6e0db728a",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1769199354,
-        "narHash": "sha256-y1DKMryOr1w4xcZnDkaZjvENIPmr3j/YB4Srtfd3I2Y=",
+        "lastModified": 1776680283,
+        "narHash": "sha256-wSHtct0KwbhFh9xYYp1ABaBsHE/K/1+oyrqHbIdiWFE=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "c8b990198baf3c34b64e4e5c5ffeb7c068eede1a",
+        "rev": "21c93f820124a8e7046f1e358739e1a14f6b700b",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1768135262,
-        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -248,7 +248,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728511087,
-        "narHash": "sha256-CvO74jwMjUUPySy0QCt7sPImbxKlhWcSAet93Fkt6iU=",
+        "lastModified": 1771895942,
+        "narHash": "sha256-2G212O6uoBCjmyIBux/Kfy/FVlsAY+3mTT4JRstYRZ0=",
         "owner": "local-interloper",
         "repo": "game-of-life",
-        "rev": "c39d37e394f5da79a6a7d198e1d7e505aa5298a7",
+        "rev": "dd5cba5d873ece0ca5c8a7d74243b3b0199a2194",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769450270,
-        "narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=",
+        "lastModified": 1776777932,
+        "narHash": "sha256-0R3Yow/NzSeVGUke5tL7CCkqmss4Vmi6BbV6idHzq/8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a10c1e8f5ad2589414407f4851c221cb66270257",
+        "rev": "5d5640599a0050b994330328b9fd45709c909720",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768434960,
-        "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=",
+        "lastModified": 1776184304,
+        "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b",
+        "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
         "type": "github"
       },
       "original": {
@@ -347,27 +347,6 @@
         "type": "github"
       }
     },
-    "kwin-effects-forceblur": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1755098995,
-        "narHash": "sha256-6FN7XEf27DenQHDIKjrjOW3tGIaJlyqRlXarmt1v+M0=",
-        "owner": "taj-ny",
-        "repo": "kwin-effects-forceblur",
-        "rev": "51a1d49d7fd7df3ce40ccf6ba4c4410cf6f510e1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "taj-ny",
-        "repo": "kwin-effects-forceblur",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -403,11 +382,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1769363279,
-        "narHash": "sha256-XJCuB8GWkFLRFBR6GQoxRB9/lobB45ERp0JN0Lo2nvs=",
+        "lastModified": 1776710308,
+        "narHash": "sha256-rrdCcEXukj2CDjsiOVPYb9LpTKzB89sIicBqoOBK3Xs=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "4aa98db78c1d663c3dad59775e95ad93fe58a844",
+        "rev": "8c8219b1f4822932baea710948da7963f50e9739",
         "type": "github"
       },
       "original": {
@@ -425,11 +404,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769217863,
-        "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=",
+        "lastModified": 1776692876,
+        "narHash": "sha256-7Q05rUgwbkJnjxIJyi8bHUG+XnyZqLxFJz7c8RncpeU=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "38a5250e57f583662eac3b944830e4b9e169e965",
+        "rev": "51b302c28dbf904a5c341be005eebe0779cf4f16",
         "type": "github"
       },
       "original": {
@@ -457,11 +436,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
         "type": "github"
       },
       "original": {
@@ -472,11 +451,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1769300497,
-        "narHash": "sha256-W7NbQnQGqUPRnpHOlLXk3g52TSQDkFVzhax9YNv9K+U=",
+        "lastModified": 1776635459,
+        "narHash": "sha256-3UVWm751p/8VAY1Mq+DgSTCv9HpMmdB2byhnRrVKflk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "60f9d776547020ff3be5a2cfbd0a457fddd88ecc",
+        "rev": "8d8538e67e516362d9d09ee5d3ce73dce944612b",
         "type": "github"
       },
       "original": {
@@ -488,11 +467,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1769170682,
-        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {
@@ -534,7 +513,6 @@
         "anikki": "anikki",
         "game-of-life": "game-of-life",
         "home-manager": "home-manager",
-        "kwin-effects-forceblur": "kwin-effects-forceblur",
         "lanzaboote": "lanzaboote",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nixos-wsl": "nixos-wsl",
@@ -550,11 +528,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1764470739,
-        "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=",
+        "lastModified": 1770952264,
+        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a",
+        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
         "type": "github"
       },
       "original": {
@@ -613,11 +591,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769469829,
-        "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
+        "lastModified": 1776771786,
+        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
+        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
         "type": "github"
       },
       "original": {
@@ -656,21 +634,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "trilium-next-pr": {
       "locked": {
         "lastModified": 1736678965,
@@ -687,24 +650,6 @@
         "type": "github"
       }
     },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
@@ -713,11 +658,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769431876,
-        "narHash": "sha256-FnOW+ulwocxfYGVKV2H/7MlSbn52+hfX9oaRR6FClZ4=",
+        "lastModified": 1776790993,
+        "narHash": "sha256-TxDU/PFKoOYm+ncWXyI2vurKQPqu54gMlCRzx5sGnZc=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "d5ef79d18dca7617aefe511db8267d47f7cf953f",
+        "rev": "3f4f36b17ceeda27fc4953e8bc29637333508c05",
         "type": "github"
       },
       "original": {

flake.nix

@@ -42,10 +42,10 @@
       url = "github:nix-community/lanzaboote/v0.4.3";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    kwin-effects-forceblur = {
-      url = "github:taj-ny/kwin-effects-forceblur";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # kwin-effects-forceblur = { Archived.
+    #   url = "github:taj-ny/kwin-effects-forceblur";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
     aagl = {
       url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";

homes/x86_64-linux/andreas@drivebystation-nix/default.nix

@@ -32,7 +32,7 @@ in
       # pkgs.vesktop
       pkgs.obsidian
       inputs.zen-browser.packages.x86_64-linux.default    
-      inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default
+      # inputs.kwin-effects-forceblur.packages.${pkgs.stdenv.hostPlatform.system}.default # Archived.
     ];
   };
   
@@ -41,7 +41,7 @@ in
     [Desktop Entry]
     Type=Application
     Name=Wallpaper Engine
-    Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 -f 12 --screen-root DP-2 --bg 2935872330 -f 12
+    Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330 -f 12
     X-KDE-autostart-after=panel
     X-KDE-StartupNotify=false
   '';

modules/home/home/default.nix

@@ -34,7 +34,7 @@ in
     home = {
       packages = with pkgs; [
         inetutils
-        neofetch
+        hyfetch
         tmux
         # nerdfonts
         p7zip

modules/nixos/cs-tools/default.nix

@@ -0,0 +1,24 @@
+{ lib, pkgs, config, namespace, ... }:
+
+let
+  cfg = config.${namespace}.cs-tools;
+in
+{
+  options.${namespace}.cs-tools = {
+    enable = lib.mkEnableOption "CS tools including CS Demo Manager and PostgreSQL";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.postgresql = {
+      enable = true;
+      ensureDatabases = [ "csdm" ];
+      ensureUsers = [{
+        name = "csdm";
+      }];
+    };
+    environment.systemPackages = with pkgs; [
+      my-namespace.cs-demo-manager
+      postgresql
+    ];
+  };
+}

modules/nixos/desktop-environment/default.nix

@@ -48,11 +48,48 @@ in {
         enable = true;
       };
       services.desktopManager.gnome.enable = true;
+      services.gnome.gnome-remote-desktop.enable = true;
+      systemd.services.gnome-remote-desktop = { 
+        wantedBy = [ "graphical.target" ]; # for starting the unit automatically at boot
+      };
+      services.displayManager.autoLogin.enable = false;
+      networking.firewall.allowedTCPPorts = [ 
+        3389 
+        3390
+      ];
+
+      # users.users.andreas.extraGroups = [ "sambashare" ];    
+      # Enable Avahi (mDNS/DNS-SD) for discovery
+      services.avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+      };
+      # Enable GNOME sharing services
+      services.gnome.gnome-user-share.enable = true;
+
       environment.systemPackages = with pkgs; [
         gnome-tweaks
         gnome-software
         gnomeExtensions.pop-shell
         gnome-remote-desktop
+        glib-networking # Required gnome-remote-desktop dependency
+      ];
+      systemd.user.services.gnome-remote-desktop.environment = {
+        VK_ICD_FILENAMES = "/dev/null";
+        LIBGL_ALWAYS_SOFTWARE = "1";
+      };
+
+      systemd.services.gnome-remote-desktop.environment = {
+        VK_ICD_FILENAMES = "/dev/null";
+        LIBGL_ALWAYS_SOFTWARE = "1";
+      };
+      environment.sessionVariables.XDG_DATA_DIRS = lib.mkAfter [
+        "${pkgs.gnome-remote-desktop}/share"
+      ];
+      environment.pathsToLink = [
+        "/share/gsettings-schemas"
+        "/share"
       ];
     })
 

modules/nixos/nixos/default.nix

@@ -43,7 +43,7 @@ in
           age
           wget
           sops
-          bitwarden-desktop #replaced bitwarden
+          # bitwarden-desktop #replaced bitwarden
           bitwarden-cli
           cowsay
           remmina

modules/nixos/steam/default.nix

@@ -52,14 +52,15 @@
         "-r" "172"
         "-e" # Enable steam integration
         "--steam"
+        "--prefer-outpout DP-4"
         "--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
       ];
       env = {
-        WLR_RENDERER = "vulkan";
-        DXVK_HDR = "0 ";
-        ENABLE_GAMESCOPE_WSI = "0";
-        WINE_FULLSCREEN_FSR = "1";
-        SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
+        # WLR_RENDERER = "vulkan";
+        # DXVK_HDR = "0 ";
+        # ENABLE_GAMESCOPE_WSI = "0";
+        # WINE_FULLSCREEN_FSR = "1";
+        # SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
       };
     };
     
@@ -71,7 +72,7 @@
         ];
         extraEnv = {
           # SDL_VIDEODRIVER = "wayland,x11";
-          SDL_VIDEODRIVER = "x11";
+          # SDL_VIDEODRIVER = "x11,wayland";
         };
       };
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play

overlays/mesa-gcc/default.nix

@@ -2,13 +2,13 @@
 
 final: prev: {
   mesa = (prev.mesa.overrideAttrs (old: rec {
-    version = "git-unstable-2026-02-12";
+    version = "git-unstable-2026-04-02";
     src = prev.fetchFromGitLab {
       domain = "gitlab.freedesktop.org";
       owner = "mesa";
       repo = "mesa";
-      rev = "main";
-      hash = "sha256-5gpLORvbV3skALrQa0VxTJJarYjuq+KyTxDm9HtZNbQ=";
+      rev = "72e9f9a760a5dd81a74497f1daef054af1b6b827";
+      hash = "sha256-81V5RdLSLYeGJ/wh5H8L6vq+QdR6yMkJxDV+6Yf5FPk=";
     };
     patches = [];
     buildInputs = old.buildInputs ++ (with prev.llvmPackages_21; [ 
@@ -33,8 +33,6 @@ final: prev: {
       ) old.mesonFlags) ++ [
       "-Dsysconfdir=${placeholder "out"}/etc"
     ] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
-  })).override {
-    stdenv = prev.gcc14Stdenv;
-  };
+  }));
 }
 

overlays/synergy-fix/default.nix

@@ -1,17 +0,0 @@
-{ ... }:
-
-final: prev: {
-  synergy = prev.synergy.overrideAttrs (oldAttrs: {
-    postPatch = (oldAttrs.postPatch or "") + ''
-      # Fix deprecated Qt endl usage in QTextStream contexts only
-      # Don't touch cerr/cout which use std::endl
-      find . -name "*.cpp" -type f -exec sed -i \
-        's/\(outStream.*<<.*\)endl/\1Qt::endl/g; s/\(QTextStream.*<<.*\)endl/\1Qt::endl/g' {} +
-      find . -name "*.h" -type f -exec sed -i \
-        's/\(outStream.*<<.*\)endl/\1Qt::endl/g; s/\(QTextStream.*<<.*\)endl/\1Qt::endl/g' {} +
-      
-      # Fix missing SIZE_MAX include
-      sed -i '/#include <cstring>/a#include <cstdint>' src/lib/server/InputFilter.cpp
-    '';
-  });
-}

packages/cs-demo-manager/default.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchurl
+, appimageTools
+, postgresql
+, procps
+, ...
+}:
+
+let
+  pname = "cs-demo-manager";
+  version = "3.18.2";
+
+  src = fetchurl {
+    url = "https://github.com/akiver/cs-demo-manager/releases/download/v${version}/CS-Demo-Manager-${version}.AppImage";
+    hash = "sha256-REEhqvfYSKD7EyIYJVlbkQu0h5FZcofc8X7Zhu1xZnA="; # You need to add the hash after first build attempt
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraPkgs = pkgs: [ postgresql procps  ];
+
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/cs-demo-manager.desktop $out/share/applications/cs-demo-manager.desktop
+    install -m 444 -D ${appimageContents}/cs-demo-manager.png $out/share/icons/hicolor/512x512/apps/cs-demo-manager.png
+
+    substituteInPlace $out/share/applications/cs-demo-manager.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
+  '';
+
+  meta = with lib; {
+    description = "An application to manage Counter-Strike demos";
+    homepage = "https://github.com/akiver/cs-demo-manager";
+    license = licenses.gpl2Plus;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ ];
+  };
+}

shell.nix

@@ -7,7 +7,7 @@ pkgs.mkShellNoCC {
   packages = with pkgs; [
     cowsay
     lolcat
-    bitwarden-desktop #replaced bitwarden
+    # bitwarden-desktop #replaced bitwarden
     bitwarden-cli
     sops
   ];

systems/x86_64-linux/drivebystation-nix/configuration.nix

@@ -47,10 +47,10 @@
 
   services = {
     # Enable Gnome Session
-    displayManager.gdm.enable = false;
+    displayManager.gdm.enable = true;
     displayManager.sddm.enable = false;
-    # displayManager.sddm.wayland.enable = true;
-    displayManager.cosmic-greeter.enable = true;
+    displayManager.sddm.wayland.enable = false;
+    displayManager.cosmic-greeter.enable = false;
     displayManager.defaultSession = "gnome";
     
     xserver = {
@@ -128,7 +128,7 @@
   environment.systemPackages = with pkgs; [
     #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     #  wget
-    (python312.withPackages (ps: with ps; [ websockets ]))
+    (python3.withPackages (ps: with ps; [ websockets ]))
     sqlite
     javaPackages.compiler.openjdk25
     javaPackages.compiler.openjdk21
@@ -138,6 +138,9 @@
     krita
     ntfs3g
     htop
+    rivalcfg
+    blender
+    freecad
     reaper
     discord
     betterdiscordctl
@@ -158,6 +161,9 @@
 
   services.gvfs.enable = true; # For file manager integration
 
+  # Enable udev rules for SteelSeries devices (rivalcfg)
+  services.udev.packages = [ pkgs.rivalcfg ];
+
   # Disable iBus (not needed unless using Asian input methods)
   i18n.inputMethod = {
     enable = false;
@@ -166,13 +172,15 @@
   virtualisation.libvirtd = {
     enable = true;
     qemu = {
-      package = pkgs.qemu_kvm;
+      package = pkgs.qemu;
       runAsRoot = true;
       swtpm.enable = true;
+      vhostUserPackages = [ pkgs.virtiofsd ];
     };
   };
 
 
+
   systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -187,15 +195,47 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
-  # Open ports in the firewall.
+  # Open ports in the .
   networking.firewall.allowedTCPPorts = [
     24800 #Synergy
     53317 #localsend
+    3390 #rdp
+    9090
+    8000
+    40122
   ];
   networking.firewall.allowedUDPPorts = [
     24800 #Synergy
     53317 #localsend
+    3390 #rdp
+    9090
+    8000
+    40122
   ];
+  networking.firewall.trustedInterfaces = [ "virbr0" ];
+  networking.nat = {
+    enable = true;
+    internalInterfaces = [ "virbr0" ];
+    externalInterface = "enp75s0";
+    extraCommands = ''
+      # MASQUERADE forwarded traffic to VM so it knows how to route back
+      iptables -t nat -A nixos-nat-post -o virbr0 -j MASQUERADE
+    '';
+    forwardPorts = [
+      {
+        sourcePort = 9090;
+        proto = "tcp";
+        destination = "192.168.122.113:9090";
+      }
+      {
+        sourcePort = 9090;
+        proto = "udp";
+        destination = "192.168.122.113:9090";
+      }
+    ];
+  };
+  services.mullvad-vpn.enable = true;
+  services.mullvad-vpn.package = pkgs.mullvad-vpn;
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 

systems/x86_64-linux/drivebystation-nix/default.nix

@@ -45,12 +45,15 @@ in
       my-namespace.desktop-environment.xfce.enable = true;
       my-namespace.desktop-environment.gnome.enable = true;
       my-namespace.desktop-environment.kde.enable = true;
+      my-namespace.desktop-environment.hyprland.enable = true;
       my-namespace.desktop-environment.cosmic.enable = true;
       my-namespace.performance-tuning.enable = true;
       my-namespace.file-organization.enable = true;
       # GNOME-keyring
       my-namespace.gnome-keyring.enable = true;
-
+      # CS Tools
+      my-namespace.cs-tools.enable = true;
+      
       users.users.andreas = {
         isNormalUser = true;
         description = "Andreas Schaafsma";
@@ -125,7 +128,6 @@ in
         mangohud
         my-namespace.udev-steelseries
         my-namespace.hello
-        kde-rounded-corners
         my-namespace.linux-wallpaperengine
 
         (pkgs.writeShellScriptBin "switch-to-desktop" ''

systems/x86_64-linux/drivebystation-nix/hardware/acer-monitor-edid.nix

@@ -1,7 +1,9 @@
 { config, lib, pkgs, ... }:
 {
   # boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
-  boot.kernelParams = [ "drm.edid_firmware=DP-2:edid/edid.bin" ];
+  boot.kernelParams = [ 
+    "drm.edid_firmware=DP-2:edid/edid.bin,DP-4:edid/edid.bin" 
+  ];
 
 
   hardware.firmware = [

systems/x86_64-linux/drivebystation-nix/hardware/graphics/intel.nix

@@ -26,8 +26,8 @@
     "mitigations=off"              # Disable CPU mitigations for better performance
     "module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
   ];
-
-  environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
+  services.switcherooControl.enable = true;
+  # environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
   hardware.intel-gpu-tools.enable = true;
   hardware.graphics = {
     enable = true;
@@ -38,6 +38,7 @@
       vpl-gpu-rt             # oneVPL runtime
       intel-vaapi-driver     # fallback
       intel-compute-runtime # OpenCL/Level Zero
+      level-zero            # Level Zero API for compute
     ];
   };
 
@@ -52,6 +53,13 @@
     "nvidia_uvm"
   ];
 
+  # Mark Arc B580 as a discrete Intel GPU for switcheroo-control and
+  # keep runtime PCI power management enabled for the device.
+  services.udev.extraRules = ''
+    ACTION=="add|bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xe20b", TEST=="power/control", ATTR{power/control}="auto"
+    SUBSYSTEM=="drm", DRIVERS=="xe", ATTRS{vendor}=="0x8086", ATTRS{device}=="0xe20b", TAG+="switcheroo-discrete-gpu"
+  '';
+
   environment.variables = {
     # Force Intel GPU for all graphics operations
     KWIN_DRM_DEVICES = "/dev/dri/card0";
@@ -66,6 +74,11 @@
     # DXVK optimizations
     DXVK_HUD = "compiler";  # Monitor shader compilation
     # DXVK_ASYNC = "1";     # Enable if you want async shader compilation (may cause issues)
+    
+    # Intel IPEX / PyTorch settings
+    ZE_ENABLE_ALT_DRIVERS = "libze_intel_gpu.so.1";  # Enable Intel GPU driver for Level Zero
+    SYCL_CACHE_PERSISTENT = "1";                      # Enable persistent SYCL cache
+    SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS = "1";  # Performance optimization
   };
 
 
@@ -103,4 +116,18 @@
   ## User Access
   ############################
   users.users.andreas.extraGroups = [ "video" "render" ];
+  
+  ############################
+  ## System Packages for AI/ML
+  ############################
+  environment.systemPackages = with pkgs; [
+    intel-compute-runtime
+    level-zero
+    # For checking GPU compute capabilities
+    clinfo
+    vulkan-tools
+  ];
+  services.xserver.deviceSection = ''
+    Option "TearFree" "false"
+  '';
 }

systems/x86_64-linux/drivebystation-nix/hardware/graphics/passthrough_nvidia.nix

@@ -0,0 +1,51 @@
+{ config, lib, system, pkgs, ... }:
+{
+  boot.kernelModules = [
+    "vfio"
+    "vfio-pci"
+    "vfio_iommu_type1"
+  ];
+  boot.kernelParams = [
+    "amd_iommu=on"
+    "iommu=pt"
+  ];
+  # Make sure vfio is available inside initrd
+  boot.initrd.availableKernelModules = [
+    "vfio_pci"
+  ];
+  # Bind by IDs (cleaner via modprobe instead of kernel param)
+  boot.extraModprobeConfig = ''
+    options vfio-pci ids=10de:1b81,10de:10f0
+  '';
+  boot.initrd.systemd = {
+    enable = true;
+    services.initrd-vfio-pci-nvidia = {
+      description = "vfio-pci predevice init";
+      wantedBy = [ "initrd.target" ];
+      # Match 'preDeviceCommands' by running early
+      before = [ "sysroot.mount" ]; 
+      
+      unitConfig.DefaultDependencies = "no";
+      serviceConfig.Type = "oneshot";
+      
+      # Place your original shell commands here
+      script = ''
+        modprobe vfio-pci
+      '';
+    };
+  };
+  # # EARLY and deterministic binding
+  # boot.initrd.preDeviceCommands = ''
+  #   echo 0000:05:00.0 > /sys/bus/pci/drivers/vfio-pci/bind
+  #   echo 0000:05:00.1 > /sys/bus/pci/drivers/vfio-pci/bind
+  # '';
+  environment.systemPackages = with pkgs; [
+    pciutils
+    virtiofsd
+    config.virtualisation.libvirtd.qemu.package
+    looking-glass-client
+    virt-manager
+    libguestfs-with-appliance
+  ];
+  users.extraUsers.andreas.extraGroups = [ "libvirtd" ];
+}

systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix

@@ -8,6 +8,7 @@
     [ 
       (modulesPath + "/installer/scan/not-detected.nix")
       ./graphics/intel.nix
+      ./graphics/passthrough_nvidia.nix
       # ./graphics/intel_i915.nix
       # ./graphics/nvidia.nix
       ./acer-monitor-edid.nix
@@ -32,7 +33,7 @@
 
     serviceConfig = {
       Type = "oneshot";
-      ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp75s0 eee off";
+      ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp10s0 eee off";
       RemainAfterExit = true;
     };
   };