From d7706ac3fd8e4e7e74fc97be51f4418cc97bc690 Mon Sep 17 00:00:00 2001
From: caleb <cgrohs@tutanota.com>
Date: Tue, 23 Jul 2024 11:01:31 -0400
Subject: [PATCH] wrapping up changes in surface

---
 application-configuration.nix | 13 -------------
 configuration.nix             |  7 +++----
 networking-configuration.nix  | 36 -----------------------------------
 surfacebook-configuration.nix | 11 +----------
 4 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/application-configuration.nix b/application-configuration.nix
index 6ca613c..0a0c332 100644
--- a/application-configuration.nix
+++ b/application-configuration.nix
@@ -7,7 +7,6 @@
         firefox
         kate
         qalculate-qt
-        keepassxc
         libsForQt5.krdc
         libreoffice-qt
         isoimagewriter
@@ -16,23 +15,11 @@
         monero-gui
         tor-browser-bundle-bin
         yubikey-manager-qt
-        libsForQt5.kdeconnect-kde
 
         docker-compose
       ];
   };
 
-  # kde connect
-  networking.firewall = {
-    enable = true;
-    allowedTCPPortRanges = [
-      { from = 1714; to = 1764; } # KDE Connect
-    ];
-    allowedUDPPortRanges = [
-      { from = 1714; to = 1764; } # KDE Connect
-    ];
-  };
-
   # install Steam
   programs.steam = {
     enable = true;
diff --git a/configuration.nix b/configuration.nix
index 615f107..5accd70 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -30,10 +30,9 @@
   };
 
   # Enable opengl
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -60,7 +59,7 @@
 
   # Enable the KDE Plasma Desktop Environment.
   services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # fonts
   fonts.packages = with pkgs; [
diff --git a/networking-configuration.nix b/networking-configuration.nix
index 447b1cb..b8199c8 100644
--- a/networking-configuration.nix
+++ b/networking-configuration.nix
@@ -11,46 +11,10 @@
   systemd.services.NetworkManager-wait-online.enable = false; #disable wait online since it is broken
   hardware.bluetooth.enable = true;
 
-  # Enable encrypted DNS
-  services.dnscrypt-proxy2 = {
-    enable = true;
-    settings = {
-      ipv6_servers = true;
-      require_dnssec = true;
-    };
-  };
-  systemd.services.dnscrypt-proxy2.serviceConfig = {
-    StateDirectory = "dnscrypt-proxy";
-  };
-
   # Enable mullvad vpn
   services.mullvad-vpn.package = pkgs.mullvad-vpn;
   services.mullvad-vpn.enable = true;
 
   # Enable tailscale
   services.tailscale.enable = true;
-
-  # exclude tailscale IPs from mullvad routing
- /*  networking.nftables = {
-    enable = true;
-    ruleset = ''
-      define TAILNET_DNS = {
-        100.100.100.100,
-        9.9.9.9
-      }
-      define TAILNET_IPV4 = {
-        100.64.0.0/10
-      }
-      define TAILNET_IPV6 = {
-        fd7a:115c:a1e0::/48
-      }
-      table inet excludeTraffic {
-        chain excludeDns {
-          type filter hook output priority -10; policy accept;
-          ip daddr $TAILNET_DNS udp dport 53 ct mark set 0x00000f41 meta mark set 0x6d6f6c65;
-          ip daddr $TAILNET_DNS tcp dport 53 ct mark set 0x00000f41 meta mark set 0x6d6f6c65;
-        }
-      }
-    '';
-  }; */
 }
diff --git a/surfacebook-configuration.nix b/surfacebook-configuration.nix
index 3bbdf5d..640dec7 100644
--- a/surfacebook-configuration.nix
+++ b/surfacebook-configuration.nix
@@ -8,7 +8,7 @@
   ##### SB3 Hardware ##### 
   # surface kernel config
   users.users.caleb.extraGroups = [ "surface-control" ];
-  microsoft-surface.surface-control.enable = true;
+  #microsoft-surface.surface-control.enable = true;
   hardware.cpu.intel.updateMicrocode = true;
 
   # Nvidia driver setup
@@ -20,7 +20,6 @@
       enable = true;
       finegrained = true;
     };
-    nvidiaPersistenced = true;
     prime = {
       offload = {
         enable = true;
@@ -31,12 +30,4 @@
       nvidiaBusId = "PCI:2:0:0";
     };
   };
-
-  # preserve video memory after suspend https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Preserve_video_memory_after_suspend
-  boot.extraModprobeConfig = ''
-    options nvidia NVreg_PreserveVideoMemoryAllocations=1 NVreg_TemporaryFilePath=/var/tmp
-  '';
-
-  # change backlight agent
-  boot.kernelParams = [ "acpi_osi=!" "acpi_osi=\"Windows 2015\""];
 }