modules/home/default.nix

@@ -43,6 +43,7 @@ in
             daVinci
             mpv
             freetube
+            dissent
             discordCanary
             vesktop
             element
@@ -56,16 +57,13 @@ in
             systemMonitor
             usbImager
             virtManager
-            hypr
+            # hypr
-            wayland
+            # wayland
             theming
             polychromatic
             dolphin
             espanso
             claudeCode
-            jamesDsp
-            zoom
-            academic
             ;
         };
       };

modules/home/gui/apps/academic/default.nix

@@ -1,11 +0,0 @@
-let
-  importList =
-    let
-      content = builtins.readDir ./.;
-      dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-    in
-    map (name: ./. + "/${name}") dirContent;
-in
-{
-  imports = importList;
-}

modules/home/gui/apps/academic/jabref/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      jabref
-      ;
-  };
-}

modules/home/gui/apps/academic/paperlib/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      paperlib
-      ;
-  };
-}

modules/home/gui/apps/academic/zotero/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      zotero-beta
-      ;
-  };
-}

modules/home/gui/apps/browsers/floorp/config/extensions/default.nix

@@ -7,7 +7,8 @@
       sponsorblock
       ublock-origin
       unpaywall
-      zotero-connector
+      vimium
+      side-view
       ;
   };
 }

modules/home/gui/apps/browsers/floorp/config/search/config/flake/selfHosted.nix

@@ -1,9 +1,8 @@
-{ flake, osConfig, ... }:
+{ flake, ... }:
 let
-  inherit (flake.config.services) instances;
+  inherit (flake.config.services)
-  inherit (flake.config.machines) devices;
+    instances
-  localhost = instances.web.localhost.address0;
+    ;
-  hostname = osConfig.networking.hostName;
 in
 {
   "${instances.jellyfin.label}" = {
@@ -35,14 +34,7 @@ in
     icon = ./icons/sx.png;
     urls = [
       {
-        template =
+        template = "https://${instances.searx.subdomain}.${instances.web.domains.url0}/search?q={searchTerms}";
-          (
-            if hostname == devices.mars.name then
-              "http://${localhost}:${toString instances.searx.ports.port0}"
-            else
-              "https://${instances.searx.subdomain}.${instances.web.domains.url0}"
-          )
-          + "/search?q={searchTerms}";
       }
     ];
   };

modules/home/gui/apps/browsers/floorp/config/search/default.nix

@@ -1,4 +1,4 @@
-{ flake, osConfig, ... }:
+{ flake, ... }:
 let
   configPath = ./config;
   flakedPath = configPath + /flake;
@@ -21,7 +21,6 @@ let
       // (import (flakedPath + "/${searchEngine}") {
         inherit
           flake
-          osConfig
           ;
       })
     ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
@@ -31,21 +30,20 @@ in
 {
   search = {
     force = true;
-    default = "SearXNG";
+    default = "Brave";
     engines = aggregatedSearchEngines;
     order = [
       "AlternativeTo"
-      "Brave"
       "Core Radio"
       "Hackage"
       "Hoogle"
       "Jellyfin"
+      "SearXNG"
       "Nix Home Manager"
       "Nix Options"
       "Nix Packages"
       "Nix Wiki"
       "PeerTube"
-      "SearXNG"
       "Sci-Hub"
       "Torrent Leech"
       "Urban Dictionary"

modules/home/gui/apps/browsers/floorp/default.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   flake,
-  osConfig,
   ...
 }:
 let
@@ -15,7 +14,7 @@ in
       configPath = ./config;
       bookmarksPath = import (configPath + /bookmarks) { inherit flake; };
       extensionsPath = import (configPath + /extensions) { inherit pkgs; };
-      searchPath = import (configPath + /search) { inherit flake osConfig; };
+      searchPath = import (configPath + /search) { inherit flake; };
       settingsPath = import (configPath + /settings);
       themesPath = import (configPath + /themes);
     in

modules/home/gui/desktop/wayland/jamesDsp/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      jamesdsp
-      ;
-  };
-}

modules/home/gui/desktop/wayland/waybar/config/settings.nix

@@ -104,8 +104,8 @@ in
       tooltip = false;
       format-muted = " Muted";
       on-click = "easyeffects";
-      on-scroll-up = "pactl set-sink-volume @DEFAULT_SINK@ +5%";
+      on-scroll-up = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink +5% ; pactl set-sink-volume @DEFAULT_SINK@ 5%";
-      on-scroll-down = "pactl set-sink-volume @DEFAULT_SINK@ -5%";
+      on-scroll-down = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink -5% ; pactl set-sink-volume @DEFAULT_SINK@ -5%";
       scroll-step = 5;
       format-icons = {
         headphone = "";

modules/nixos/default.nix

@@ -10,12 +10,13 @@ in
           mullvad
           syncthing
           ollama
-          hypr
+          # hypr
-          wayland
           searx
           portals
           xserver
           flatpak
+          plasma
+          sddm
           wireGuard
           ;
       };

profiles/user0/default.nix

@@ -53,26 +53,23 @@ in
               mars = devices.mars;
               deimos = devices.deimos;
               deviceLogic = if hostname == mars.name then deimos else mars;
-
-              vpnServers = [
-                "CA363"
-                "CA220"
-                "CA358"
-                "CA627"
-              ];
-
-              vpnCommands = lib.concatStrings (
-                lib.imap0 (i: server: ''
-                  vpn${toString i}:
-                      sudo systemctl start wg-quick-Proton-${server}.service
-
-                '') vpnServers
-              );
             in
             {
               text = ''
-                rebuildboot:
+                vpn0:
-                    nixos-rebuild boot --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
+                    sudo systemctl start wg-quick-Proton-CA363.service
+
+                vpn1:
+                    sudo systemctl start wg-quick-Proton-CA220.service
+
+                vpn2:
+                    sudo systemctl start wg-quick-Proton-CA358.service
+
+                vpn3:
+                    sudo systemctl start wg-quick-Proton-CA627.service
+
+                vpnoff:
+                    sudo systemctl stop wg-quick-Proton-*.service
 
                 rebuild:
                     nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
@@ -88,11 +85,6 @@ in
 
                 ${deviceLogic.name}:
                     ssh ${deviceLogic.ip.address0}
-
-                vpnoff:
-                    sudo systemctl stop wg-quick-Proton-*.service
-
-                ${vpnCommands}
               '';
             };
           "./Files/Scripts/list.sh" = {