modules/home/cli/utilities/trashCli/default.nix

@@ -5,7 +5,7 @@
 {
   home.packages = builtins.attrValues {
     inherit (pkgs)
-      trashy
+      trash-cli
       ;
   };
 }

modules/home/default.nix

@@ -186,7 +186,7 @@ in
             systemMonitor
             usbImager
             virtManager
-            hypr
+            # hypr
             niri
             wayland
             theming
@@ -214,7 +214,7 @@ in
             scrcpy
             bitwarden
             emote
-            hypr
+            # hypr
             wayland
             niri
             theming
@@ -239,7 +239,6 @@ in
             discord
             signal
             niri
-            hypr
             wayland
             theming
             tools

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

@@ -7,8 +7,7 @@
       sponsorblock
       ublock-origin
       unpaywall
-      firefox-translations
-      immersive-translate
+      zotero-connector
       ;
   };
 }

modules/home/gui/apps/media/audio/audioPlaying/feishin/default.nix

@@ -8,7 +8,7 @@
       feishin
       ;
   };
-  xdg.configFile."feishin/config.json".text = ''
+  xdg.configFile."feishin.config.json".text = ''
     {
     	"window_has_frame": true,
     	"bounds": {

modules/home/gui/apps/messaging/discord/vesktop/default.nix

@@ -8,17 +8,4 @@
       vesktop
       ;
   };
-  xdg.configFile."vesktop/settings.json".text = ''
-    {
-        "discordBranch": "stable",
-        "minimizeToTray": false,
-        "arRPC": true,
-        "splashColor": "rgb(202, 211, 245)",
-        "splashBackground": "rgb(36, 39, 58)",
-        "customTitleBar": false,
-        "tray": false,
-        "staticTitle": false,
-        "enableMenu": false
-    }
-  '';
 }

modules/home/gui/desktop/hypr/land/config/exec-once.nix

@@ -5,6 +5,7 @@ let
     ;
 in
 [
+  "swaylock"
   "hypridle"
   "wl-clipboard"
   "wpaperd"
@@ -14,6 +15,8 @@ in
   "waybar"
   "nm-applet"
   "blueman-applet"
+  "rfkill block bluetooth"
+  "rfkill unblock bluetooth"
   "easyeffects -r"
   "emote"
   "flameshot"

modules/home/gui/desktop/niri/default.nix

@@ -149,8 +149,6 @@ in
           # "Ctrl+Alt+5".action = niri.move-window-to-workspace workspace4;
           # "Super+Enter".action = niri.toggle-overview;
 
-          "Super+w".action = niri.switch-preset-column-width;
-
           "Super+1".action = niri.focus-workspace workspace0;
           "Super+4".action = niri.focus-workspace workspace1;
           "Super+3".action = niri.focus-workspace workspace2;
@@ -316,14 +314,14 @@ in
         ];
 
         layout = {
+          # always-center-single-column = true;
           default-column-width = {
-            proportion = 1.;
+            proportion = 0.5;
           };
           preset-column-widths = [
             { proportion = 1. / 3.; }
             { proportion = 1. / 2.; }
             { proportion = 2. / 3.; }
-            { proportion = 1.; }
           ];
           border = {
             enable = true;

modules/home/gui/desktop/theming/gtk/default.nix

@@ -10,11 +10,6 @@ in
         gtk-application-prefer-dark-theme = true;
       };
     };
-    gtk4 = {
-      extraConfig = {
-        gtk-application-prefer-dark-theme = true;
-      };
-    };
     cursorTheme = {
       name = "catppuccin-macchiato-dark-cursors";
       package = pkgs.catppuccin-cursors.macchiatoDark;

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

@@ -30,19 +30,16 @@ in
     enable = true;
     settings = {
       main = {
-        prompt = "Summon: ";
+        prompt = "❯   ";
         show-actions = "yes";
-        dpi-aware = "no";
         icon-theme = "Papirus-Dark";
         width = 25;
         font = "${fonts.names.name0}:weight=bold:size=${toString fonts.sizes.desktop.size0}";
         terminal = "${pkgs.ghostty}/bin/ghostty";
         layer = "overlay";
-        fields = "name";
       };
       border = {
         radius = 10;
-        width = 2;
       };
       colors = {
         background = "${el.base00}dd";

modules/nixos/default.nix

@@ -10,11 +10,10 @@ in
           mullvad
           syncthing
           ollama
-          plasma
+          # plasma
           sddm
           hypr
-          niri
-          # gnome
+          # niri
           wayland
           searx
           xserver
@@ -38,9 +37,8 @@ in
       imports = builtins.attrValues {
         inherit (modules)
           niri
-          hypr
           wayland
-          plasma
+          # plasma
           sddm
           flatpak
           xserver

modules/nixos/desktop/sddm/default.nix

@@ -8,14 +8,14 @@ in
       sddm = {
         enable = true;
         enableHidpi = true;
-        theme = "catppuccin-macchiato";
+        theme = "catppuccin-mocha";
       };
     };
   };
   environment = {
     systemPackages = [
       (pkgs.catppuccin-sddm.override {
-        flavor = "macchiato";
+        flavor = "mocha";
         font = "${fonts.names.name0}";
         fontSize = "${toString fonts.sizes.desktop.size0}";
         loginBackground = true;

modules/nixos/hardware/bluetooth/default.nix

@@ -1,12 +1,12 @@
 {
   pkgs,
   config,
+  flake,
   ...
 }:
 let
-
-  hyprland = config.programs.hyprland.enable;
-  niri = config.programs.niri.enable;
+  inherit (flake.config.machines) devices;
+  hostname = config.networking.hostName;
 in
 {
   hardware = {
@@ -25,5 +25,5 @@ in
       ];
     };
   };
-  services.blueman.enable = if hyprland || niri == true then true else false;
+  services.blueman.enable = if hostname == devices.deimos.name then false else true;
 }