diff --git a/modules/home/cli/utilities/trashCli/default.nix b/modules/home/cli/utilities/trashy/default.nix similarity index 85% rename from modules/home/cli/utilities/trashCli/default.nix rename to modules/home/cli/utilities/trashy/default.nix index 7099b60..5d20168 100755 --- a/modules/home/cli/utilities/trashCli/default.nix +++ b/modules/home/cli/utilities/trashy/default.nix @@ -5,7 +5,7 @@ { home.packages = builtins.attrValues { inherit (pkgs) - trash-cli + trashy ; }; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 550bdad..3f1a7f8 100755 --- a/modules/home/default.nix +++ b/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,6 +239,7 @@ in discord signal niri + hypr wayland theming tools diff --git a/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix b/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix index 84f0711..4f58475 100755 --- a/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix +++ b/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix @@ -7,7 +7,8 @@ sponsorblock ublock-origin unpaywall - zotero-connector + firefox-translations + immersive-translate ; }; } diff --git a/modules/home/gui/apps/media/audio/audioPlaying/feishin/default.nix b/modules/home/gui/apps/media/audio/audioPlaying/feishin/default.nix index fae0ba5..7fdc914 100755 --- a/modules/home/gui/apps/media/audio/audioPlaying/feishin/default.nix +++ b/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": { diff --git a/modules/home/gui/apps/messaging/discord/vesktop/default.nix b/modules/home/gui/apps/messaging/discord/vesktop/default.nix index d2fcbcd..4e7ec10 100755 --- a/modules/home/gui/apps/messaging/discord/vesktop/default.nix +++ b/modules/home/gui/apps/messaging/discord/vesktop/default.nix @@ -8,4 +8,17 @@ 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 + } + ''; } diff --git a/modules/home/gui/apps/tools/nautilus/default.nix b/modules/home/gui/apps/tools/nautilus/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/gui/desktop/hypr/land/config/exec-once.nix b/modules/home/gui/desktop/hypr/land/config/exec-once.nix index 4a86739..cca45f7 100755 --- a/modules/home/gui/desktop/hypr/land/config/exec-once.nix +++ b/modules/home/gui/desktop/hypr/land/config/exec-once.nix @@ -5,7 +5,6 @@ let ; in [ - "swaylock" "hypridle" "wl-clipboard" "wpaperd" @@ -15,8 +14,6 @@ in "waybar" "nm-applet" "blueman-applet" - "rfkill block bluetooth" - "rfkill unblock bluetooth" "easyeffects -r" "emote" "flameshot" diff --git a/modules/home/gui/desktop/niri/default.nix b/modules/home/gui/desktop/niri/default.nix index 03ad4b6..e26fa88 100755 --- a/modules/home/gui/desktop/niri/default.nix +++ b/modules/home/gui/desktop/niri/default.nix @@ -149,6 +149,8 @@ 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; @@ -314,14 +316,14 @@ in ]; layout = { - # always-center-single-column = true; default-column-width = { - proportion = 0.5; + proportion = 1.; }; preset-column-widths = [ { proportion = 1. / 3.; } { proportion = 1. / 2.; } { proportion = 2. / 3.; } + { proportion = 1.; } ]; border = { enable = true; diff --git a/modules/home/gui/desktop/theming/gtk/default.nix b/modules/home/gui/desktop/theming/gtk/default.nix index ab0ea7e..4057be9 100755 --- a/modules/home/gui/desktop/theming/gtk/default.nix +++ b/modules/home/gui/desktop/theming/gtk/default.nix @@ -10,6 +10,11 @@ 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; diff --git a/modules/home/gui/desktop/wayland/fuzzel/default.nix b/modules/home/gui/desktop/wayland/fuzzel/default.nix index c055bc6..87be24e 100755 --- a/modules/home/gui/desktop/wayland/fuzzel/default.nix +++ b/modules/home/gui/desktop/wayland/fuzzel/default.nix @@ -30,16 +30,19 @@ in enable = true; settings = { main = { - prompt = "❯ "; + prompt = "Summon: "; 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"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 0e0004b..ce689e2 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -10,10 +10,11 @@ in mullvad syncthing ollama - # plasma + plasma sddm hypr - # niri + niri + # gnome wayland searx xserver @@ -37,8 +38,9 @@ in imports = builtins.attrValues { inherit (modules) niri + hypr wayland - # plasma + plasma sddm flatpak xserver diff --git a/modules/nixos/desktop/sddm/default.nix b/modules/nixos/desktop/sddm/default.nix index c65f22f..694eb07 100755 --- a/modules/nixos/desktop/sddm/default.nix +++ b/modules/nixos/desktop/sddm/default.nix @@ -8,14 +8,14 @@ in sddm = { enable = true; enableHidpi = true; - theme = "catppuccin-mocha"; + theme = "catppuccin-macchiato"; }; }; }; environment = { systemPackages = [ (pkgs.catppuccin-sddm.override { - flavor = "mocha"; + flavor = "macchiato"; font = "${fonts.names.name0}"; fontSize = "${toString fonts.sizes.desktop.size0}"; loginBackground = true; diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix index 655e030..5d5d8ad 100755 --- a/modules/nixos/hardware/bluetooth/default.nix +++ b/modules/nixos/hardware/bluetooth/default.nix @@ -1,12 +1,12 @@ { pkgs, config, - flake, ... }: let - inherit (flake.config.machines) devices; - hostname = config.networking.hostName; + + hyprland = config.programs.hyprland.enable; + niri = config.programs.niri.enable; in { hardware = { @@ -25,5 +25,5 @@ in ]; }; }; - services.blueman.enable = if hostname == devices.deimos.name then false else true; + services.blueman.enable = if hyprland || niri == true then true else false; }