From 54366a84c92460c140427392b170b8d11cf6f49b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:11:08 -0500 Subject: [PATCH 01/14] feat: replaced trash-cli with trashy --- modules/home/cli/utilities/{trashCli => trashy}/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/home/cli/utilities/{trashCli => trashy}/default.nix (85%) 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 ; }; } From f8f2adbb73039e1a4d0d1e9660d7c3a71836067e Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:11:32 -0500 Subject: [PATCH 02/14] feat: removed zotero connector --- .../gui/apps/browsers/floorp/config/extensions/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ; }; } From 78215bf45657f4f8e52054381aac2c577e32ee4e Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:12:18 -0500 Subject: [PATCH 03/14] feat: added declarative config file --- .../home/gui/apps/media/audio/audioPlaying/feishin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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": { From a4640ffd962053e7ffb3fe834504f2a8f45bea29 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:12:21 -0500 Subject: [PATCH 04/14] feat: added declarative config file --- .../gui/apps/messaging/discord/vesktop/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 + } + ''; } From 0fd3017e2a13ed0229ad1fed0b3f000b32154140 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:12:31 -0500 Subject: [PATCH 05/14] feat: added nautilus --- modules/home/gui/apps/tools/nautilus/default.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 modules/home/gui/apps/tools/nautilus/default.nix 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 From 5306278c2e3ab1b86eca6a9592f542071d27c1f7 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:13:17 -0500 Subject: [PATCH 06/14] feat: added sddm theme --- modules/nixos/desktop/sddm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 2b6b50183e83fe6ff7348e2078effdf68c815b63 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 13:13:42 -0500 Subject: [PATCH 07/14] feat: added all desktop environments --- modules/nixos/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 0e0004b..ea868bc 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 From 116b5311803d366c0b2fe67f8edce3a8e41a9e2f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:36:59 -0500 Subject: [PATCH 08/14] feat: cleaned up hypr exec-once --- modules/home/gui/desktop/hypr/land/config/exec-once.nix | 3 --- 1 file changed, 3 deletions(-) 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" From a8f3a8e3c4dc573a861906229ec21ba61c290476 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:37:31 -0500 Subject: [PATCH 09/14] feat: added column size toggle --- modules/home/gui/desktop/niri/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; From 945f5392ca494cd2f66fb28535a18dab33659753 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:37:54 -0500 Subject: [PATCH 10/14] feat: added dark theme preference for gtk4 --- modules/home/gui/desktop/theming/gtk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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; From 936c17f315182d04af8db8dd965036b9e2a857aa Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:38:19 -0500 Subject: [PATCH 11/14] feat: tuned up fuzzel for laptop --- modules/home/gui/desktop/wayland/fuzzel/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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"; From 3b3c71e7c143ef57c8e387620d4bb34ad8db1558 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:38:30 -0500 Subject: [PATCH 12/14] feat: added all desktop environments --- modules/home/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 From 635e637b1563ee00c7e93eaef02e1324247e813b Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:38:52 -0500 Subject: [PATCH 13/14] feat: added logic for blueman activation --- modules/nixos/hardware/bluetooth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; } From 2cf9ddb3e733a81c9446ddb66b8edb915ca1a082 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 May 2025 15:39:05 -0500 Subject: [PATCH 14/14] feat: added plasma to laptop --- modules/nixos/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index ea868bc..ce689e2 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -38,8 +38,9 @@ in imports = builtins.attrValues { inherit (modules) niri + hypr wayland - # plasma + plasma sddm flatpak xserver