hosts/april/default.nix

@@ -21,10 +21,6 @@
     amdgpu.enable = false;
   };
 
-  environment.systemPackages = with pkgs; [
-    remmina
-  ];
-
   services = {
     vnstat.enable = true;
   };

modules/home/kanshi.nix

@@ -76,18 +76,17 @@
       };
       home = {
         outputs = [
+          {
+            criteria = "eDP-1";
+            position = "152,1440";
+          }
           {
             criteria = "LG Electronics LG ULTRAGEAR+ 507NTRLM0646";
             scale = 1.0;
             status = "enable";
             position = "0,0";
             # adaptiveSync = true;
-            mode = if (host == "sakura") then "2560x1440@60Hz" else "2560x1440@60Hz";
+            mode = "2560x1440@144Hz";
-          }
-          {
-            criteria = "eDP-1";
-            status = if (host == "sakura") then "enable" else "disable";
-            position = if (host == "sakura") then "152,1440" else "300,1440";
           }
         ];
       };

modules/home/packages.nix

@@ -27,6 +27,7 @@
     qbittorrent
 
     # CLI shit
+    bitwarden-cli
     imagemagick
     foot
     # termpdfpy # shit broke again smfh
@@ -55,10 +56,10 @@
     yarn
     cargo
     rustc
-    # wikit
+    wikit
-    # reader
+    reader
     nmap
-    # speedtest-go
+    speedtest-go
     powertop
     android-tools
     sshpass
@@ -74,10 +75,10 @@
     # '')
 
     # Email/calendar/etc
-    # neomutt
+    neomutt
     w3m
-    # khard
+    khard
-    # khal
+    khal
-    # vdirsyncer
+    vdirsyncer
   ];
 }

roles/creative.nix

@@ -38,9 +38,9 @@ in
           gimp
           darktable
           audacity
+          kdePackages.kdenlive
           orca-slicer
-          # kdePackages.kdenlive
+          freecad
-          # freecad
         ];
       };
     };

roles/gui.nix

@@ -69,18 +69,23 @@ in
         signal-desktop
         mumble
         anki-bin
+        obs-studio
         wdisplays
-        librewolf
+        librewolf # main
-        ungoogled-chromium
+        ungoogled-chromium # for things that don't work with librewolf
         nsxiv
         imv
         libreoffice
+        #xfce.thunar
         nautilus
+        # spotify
         spotify-player
         thunderbird
         lxqt.pavucontrol-qt
         mpv
         kdePackages.kdeconnect-kde
+        winbox
+        # onthespot-overlay
 
         # Gaming
         lunar-client
@@ -95,6 +100,7 @@ in
         pkgs.twemoji-color-font
         pkgs.noto-fonts-color-emoji
         pkgs.swww
+        pkgs.swaylock
         pkgs.pywal16
       ];
     };