From 9dbe3644305c583d8d43964507ec82bc411660e5 Mon Sep 17 00:00:00 2001
From: caleb <cgrohs@tutanota.com>
Date: Thu, 18 Apr 2024 09:45:07 -0400
Subject: [PATCH] cleaned up unused packages and added remote builder

---
 application-configuration.nix | 17 ++++-------------
 configuration.nix             | 10 ++++------
 school-configuration.nix      | 17 +----------------
 winapps.nix                   |  7 -------
 4 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 winapps.nix

diff --git a/application-configuration.nix b/application-configuration.nix
index e6e4c2b..6b6fcaf 100644
--- a/application-configuration.nix
+++ b/application-configuration.nix
@@ -5,6 +5,7 @@
       [
         # apps
         firefox
+        ungoogled-chromium
         kate
         qalculate-qt
         keepassxc
@@ -16,23 +17,14 @@
         monero-gui
         tor-browser-bundle-bin
         yubikey-manager-qt
-        gparted
         libsForQt5.kdeconnect-kde
         obsidian
 
-        # flatpak
-        flatpak
-        gnome.gnome-software
-
         # virtualisation
         podman-compose
       ];
   };
 
-  environment.systemPackages = with pkgs; [
-    openjdk8
-  ];
-
   # kde connect
   networking.firewall = {
     enable = true;
@@ -54,10 +46,8 @@
   # yubikey
   services.pcscd.enable = true;
 
-  # flatpak for bluebubbles client
-  services.flatpak.enable = true;
-
-  # podman
+  # podman and libvirt
+  programs.virt-manager.enable = true;
   virtualisation = {
     podman = {
       enable = true;
@@ -66,6 +56,7 @@
     };
 
     # enable libvirt
+    spiceUSBRedirection.enable = true;
     libvirtd = {
       enable = true;
       qemu = {
diff --git a/configuration.nix b/configuration.nix
index a35ac7b..6f1bb71 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,7 +10,6 @@
       ./software-development-configuration.nix
       ./school-configuration.nix
       ./faf-linux.nix
-      ./winapps.nix
     ];
 
   # Set time zone.
@@ -59,7 +58,6 @@
 
     "vscode"
     "code"
-    "Oracle_VM_VirtualBox_Extension_Pack"
 
     "obsidian"
   ];
@@ -69,8 +67,8 @@
   services.xserver.videoDrivers = [ "nvidia" ];
 
   # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # fonts
   fonts.packages = with pkgs; [
@@ -142,14 +140,14 @@
 
   # remote build
   nix.buildMachines = [
-    /* {
+    {
       hostName = "talos";
       system = "x86_64-linux";
       protocol = "ssh-ng";
       speedFactor = 4;
       supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
       mandatoryFeatures = [ ];
-    } */
+    }
     {
       hostName = "january";
       system = "x86_64-linux";
diff --git a/school-configuration.nix b/school-configuration.nix
index 5ac269e..5563158 100644
--- a/school-configuration.nix
+++ b/school-configuration.nix
@@ -7,24 +7,9 @@
   ];
 
   users.users.caleb.packages = with pkgs; [
-    uhd
+    python311Packages.pygame
   ];
 
-  services.udev.extraRules = ''
-    #USRP1
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666"
-
-    #B100
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666"
-
-    #B200
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0020", MODE:="0666"
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0021", MODE:="0666"
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0022", MODE:="0666"
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="3923", ATTRS{idProduct}=="7813", MODE:="0666"
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="3923", ATTRS{idProduct}=="7814", MODE:="0666"
-  '';
-
   #virtualisation.virtualbox.host.enable = true;
   #users.extraGroups.vboxusers.members = [ "caleb" ];
 }
diff --git a/winapps.nix b/winapps.nix
deleted file mode 100644
index b09df01..0000000
--- a/winapps.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    freerdp
-    bc
-  ];
-}