From 190c58639f08dd11c0408cd6125cc68de211fbbf Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Thu, 4 Sep 2025 17:10:42 +0100
Subject: [PATCH] use zramswap instead of file; use sudo-rs; remove discover;
 readd docker compose; remove redundant comments (I cant believe fullscreen
 finally works and i didnt even change anything); joplin desktop needs
 unstable;

---
 configuration/base.nix                   | 11 +++++++----
 configuration/base/kde.nix               |  1 +
 configuration/modules/virtualisation.nix |  2 +-
 devices/tuxedo/configuration.nix         | 24 ------------------------
 home-manager/base.nix                    |  4 ++--
 home-manager/gaming.nix                  |  5 -----
 6 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/configuration/base.nix b/configuration/base.nix
index ffb30e2..38e8f2d 100644
--- a/configuration/base.nix
+++ b/configuration/base.nix
@@ -17,15 +17,18 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  swapDevices = [{
-    device = "/var/lib/swapfile";
-    size = 16 * 1024;
-  }];
+  # swapDevices = [{
+  #   device = "/var/lib/swapfile";
+  #   size = 16 * 1024; # 16 GB
+  # }];
+  zramSwap.enable = true; # Creates a zram block device and uses it as a swap device
 
   hardware.bluetooth.enable = true;
   hardware.enableRedistributableFirmware = true;
   hardware.enableAllFirmware = true;
 
+  security.sudo-rs.enable = true;
+
   # networking.hostName = "nixos"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
diff --git a/configuration/base/kde.nix b/configuration/base/kde.nix
index b24df5d..6d1e1ce 100644
--- a/configuration/base/kde.nix
+++ b/configuration/base/kde.nix
@@ -27,6 +27,7 @@ in
     };
   };
   services.desktopManager.plasma6.enable = true;
+  environment.plasma6.excludePackages = [ pkgs.kdePackages.discover ];
 
   # For cursor in steam?
   xdg.icons.fallbackCursorThemes = [ "breeze_cursors" ];
diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix
index 73aff8f..6fdff50 100644
--- a/configuration/modules/virtualisation.nix
+++ b/configuration/modules/virtualisation.nix
@@ -28,6 +28,6 @@
     # };
   };
   programs.virt-manager.enable = true;
-  environment.systemPackages = with pkgs;[ podman-compose podman-tui podman-desktop ];
+  environment.systemPackages = with pkgs;[ docker-compose podman-compose podman-tui podman-desktop ];
 }
 
diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix
index a0a792c..33d0e14 100644
--- a/devices/tuxedo/configuration.nix
+++ b/devices/tuxedo/configuration.nix
@@ -20,18 +20,6 @@
 
   networking.hostName = "tuxedo"; # Define your hostname.
 
-  # one day i will fix the fullscreen issue
-  # https://community.frame.work/t/fullscreen-games-freeze-on-plasma-6-with-dgpu/61088/9
-  # https://community.frame.work/t/bug-psa-gpu-bug-causes-crashes-on-kde-plasma/58133/4
-  # https://www.reddit.com/r/archlinux/comments/1gzy0xd/amdgpu_regression_on_kernel_612_choppy/
-  # https://forum.manjaro.org/t/unstable-update-october-2024-edition/168715/44
-  boot.kernelParams = [
-    # "amdgpu.dcdebugmask=0x410"
-    # or amdgpu.dcdebugmask=0x010
-    # or amdgpu.dcdebugmask=0x400
-    # or both amdgpu.dcdebugmask=0x410
-  ];
-
   boot.extraModprobeConfig = ''
     options iwlwifi 11n_disable=8 power_save=0
     options iwlmvm power_scheme=1
@@ -39,18 +27,6 @@
 
   services.hardware.openrgb.enable = true;
 
-  # fileSystems."/mnt/HDD1" = {
-  #   fsType = "ext4";
-  #   label = "HDD1";
-  #   options = [
-  #     # If you don't have this options attribute, it'll default to "defaults"
-  #     # boot options for fstab. Search up fstab mount options you can use
-  #     "users" # Allows any user to mount and unmount
-  #     "nofail" # Prevent system from failing if this drive doesn't mount
-  #     "exec" # Permit execution of binaries and other executable files
-  #   ];
-  # };
-
   fileSystems."/mnt/HDD2" = {
     fsType = "ext4";
     label = "HDD2";
diff --git a/home-manager/base.nix b/home-manager/base.nix
index 26d88eb..662b95e 100644
--- a/home-manager/base.nix
+++ b/home-manager/base.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 
 {
   imports = [
@@ -14,7 +14,7 @@
     keepassxc
     qbittorrent
     libreoffice-qt
-    joplin-desktop
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop
 
     # comms   
     teamspeak_client
diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix
index 2b8b25d..b7554f7 100644
--- a/home-manager/gaming.nix
+++ b/home-manager/gaming.nix
@@ -1,10 +1,6 @@
 { pkgs, ... }:
 
 {
-  xdg.dataFile."proton/proton-ge" = {
-    source = pkgs.proton-ge-bin;
-  };
-
   home.packages = with pkgs;[
     # Wine / Proton
     wineWowPackages.staging
@@ -24,7 +20,6 @@
         gst-plugins-ugly
         gst-libav
         gst-vaapi
-        gamescope
       ];
     })