From ddca756838488527267f5180285a8b18b010c42a Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Sun, 18 Jun 2023 04:25:53 -0400
Subject: [PATCH] Clean up uneeded bits

---
 machines/levitation/home.nix               | 18 ----------
 machines/productivity-vm/configuration.nix | 17 +--------
 machines/productivity-vm/home.nix          | 42 +++++-----------------
 3 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/machines/levitation/home.nix b/machines/levitation/home.nix
index 7d9b36e..88ed6e3 100644
--- a/machines/levitation/home.nix
+++ b/machines/levitation/home.nix
@@ -17,24 +17,6 @@
 
   home.packages = with pkgs; [ gammastep fido2luks ];
 
-  # Sway outputs
-  wayland.windowManager.sway.config = {
-    output = {
-      DP-1 = {
-        scale = "1.4";
-        subpixel = "rgb";
-        max_render_time = "6";
-        adaptive_sync = "on";
-        render_bit_depth = "10";
-      };
-    };
-    input = { "type:pointer" = { pointer_accel = "-0.3"; }; };
-    startup = [
-      # Up the mouse dpi
-      { command = "solaar config 1 dpi 4000"; }
-    ];
-  };
-
   # Hyprland outputs
   wayland.windowManager.hyprland.extraConfig = ''
     # monitor=DP-1,preferred,auto,1.4,bitdepth,10
diff --git a/machines/productivity-vm/configuration.nix b/machines/productivity-vm/configuration.nix
index 22eb045..a33051a 100644
--- a/machines/productivity-vm/configuration.nix
+++ b/machines/productivity-vm/configuration.nix
@@ -33,17 +33,7 @@
   nathan = {
     programs = { games = false; };
     services = {
-      borg = {
-        # TODO: Enable
-        enable = false;
-        extraExcludes = [
-          "/home/${config.nathan.config.user}/Music"
-          "/var/lib/docker"
-          "/var/log"
-        ];
-        passwordFile = config.sops.secrets."borg-password".path;
-        sshKey = config.sops.secrets."borg-ssh-key".path;
-      };
+      borg = { enable = false; };
       kubo = { enable = false; };
     };
     config = {
@@ -59,11 +49,6 @@
     useDHCP = false;
     interfaces.ens33.useDHCP = true;
     nat.externalInterface = "ens33";
-    # Open ports for soulseek
-    firewall = {
-      allowedTCPPorts = [ 61377 ];
-      allowedUDPPorts = [ 61377 ];
-    };
   };
 
   # Setup home manager
diff --git a/machines/productivity-vm/home.nix b/machines/productivity-vm/home.nix
index 42f8f52..11ade32 100644
--- a/machines/productivity-vm/home.nix
+++ b/machines/productivity-vm/home.nix
@@ -25,41 +25,17 @@
     "WLR_NO_HARDWARE_CURSORS" = "1";
     "WLR_RENDERER" = "gles2";
     "WLR_RENDER_DRM_DEVICE" = "/dev/dri/renderD128";
-  };
-  wayland.windowManager.sway.config = {
-    output = {
-      Virtual-1 = {
-        scale = "1.25";
-        subpixel = "rgb";
-        #   max_render_time = "6";
-        #   adaptive_sync = "on";
-        #   render_bit_depth = "10";
-      };
-    };
-    input = { "type:pointer" = { pointer_accel = "-0.3"; }; };
-    startup = [ ];
+    "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
   };
 
-  # Sway background
-
-  # Spin up glpaper as a user service so we can have it restart on failure (liable due to kvm switch
-  # disconnecting input)
-  systemd.user.services.glpaper-dp1 = {
-    Unit = {
-      Description = "glpaper (Virtual-1)";
-      After = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = ''
-        /etc/profiles/per-user/nathan/bin/glpaper Virtual-1 ${
-          ../../custom-files/sway/selen.frag
-        }
-      '';
-      Restart = "always";
-    };
-    Install = { WantedBy = [ "graphical-session.target" ]; };
-  };
+  wayland.windowManager.hyprland.extraConfig = ''
+    monitor=Virtual-1,preferred,auto,1.5
+    input {
+      # sensitivity = -0.8
+      # accel_profile = flat
+    }
+    exec-once=hyprpaper
+  '';
 
   # System specific autoruns
   systemd.user.services = { };