From cf92d891243ea567f75e78b66ff6992c4a0989ff Mon Sep 17 00:00:00 2001 From: martyTF Date: Tue, 21 Apr 2026 12:29:14 +0200 Subject: [PATCH] the H --- home/desktop/shell/noctalia.nix | 25 ++----- home/desktop/window-managers/hyprland.nix | 26 +++---- home/desktop/window-managers/niri.nix | 91 ++++++++++++++++------- hosts/marty-pc/options.nix | 2 +- modules/apps/video/default.nix | 19 ++++- modules/desktop/shell/noctalia.nix | 1 + 6 files changed, 105 insertions(+), 59 deletions(-) diff --git a/home/desktop/shell/noctalia.nix b/home/desktop/shell/noctalia.nix index e4678b3..fa5fd51 100644 --- a/home/desktop/shell/noctalia.nix +++ b/home/desktop/shell/noctalia.nix @@ -72,6 +72,14 @@ useFixedWidth = false; visualizerType = "linear"; } + { + defaultSettings = { + barWidgetMaxWidth = 300; + barWidgetSrollingMode = "hover"; + showVolumePercentage = false; + }; + id = "plugin:c4ed72:homeassistant"; + } { hideWhenZero = false; hideWhenZeroUnread = false; @@ -244,19 +252,6 @@ }; id = "plugin:clipper"; } - { - defaultSettings = { - catColor = "default"; - catOffsetY = 0; - catSize = 1; - idleTimeout = 150; - raveMode = false; - tappyMode = false; - useMprisFilter = false; - waitingTimeout = 30000; - }; - id = "plugin:slowbongo"; - } ]; right = [ { @@ -968,10 +963,6 @@ enabled = true; sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; }; - slowbongo = { - enabled = true; - sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; - }; syncthing-status = { enabled = true; sourceUrl = "https://github.com/noctalia-dev/noctalia-plugins"; diff --git a/home/desktop/window-managers/hyprland.nix b/home/desktop/window-managers/hyprland.nix index 5fd6a3d..3137f41 100644 --- a/home/desktop/window-managers/hyprland.nix +++ b/home/desktop/window-managers/hyprland.nix @@ -90,25 +90,23 @@ "echo $HYPRLAND_INSTANCE_SIGNATURE > ~/.config/hypr/instance_signature" ]; "$mod" = "SUPER"; - "$shiftmod" = "SUPER_SHIFT"; - "$controlmod" = "SUPER_CTRL"; bind = [ - (lib.mkIf (osConfig.desktop.shell.walker.enable) "$mod, D, exec, walker") - (lib.mkIf (osConfig.desktop.shell.rofi.enable) "$mod, D, exec, rofi -show drun") + (lib.mkIf (osConfig.desktop.shell.walker.enable) "$mod, D, exec, noctalia-shell ipc call launcher toggle || walker") + (lib.mkIf (osConfig.desktop.shell.rofi.enable) "$mod, D, exec, noctalia-shell ipc call launcher toggle || rofi -show drun") "$mod, return, exec, ${osConfig.apps.terminal.binary}" (lib.mkIf (osConfig.desktop.utilities.grimblast.enable) ", print, exec, GRIMBLAST_EDITOR=gradia grimblast edit area") (lib.mkIf (osConfig.desktop.shell.walker.enable && osConfig.apps.misc.bitwarden.enable) "$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; selected=$(rbw list | walker -d); wl-copy $(rbw get \"$selected\"); sleep 30; rbw lock" ) "$mod, F, fullscreen, 1" - "$shiftmod, F, fullscreen, 0" - "$shiftmod, Q, killactive," + "$mod SHIFT, F, fullscreen, 0" + "$mod SHIFT, Q, killactive," "$mod, S, togglespecialworkspace, magic" "$mod, O, exec, zen" - "$shiftmod, S, movetoworkspace, special:magic" - "$controlmod, right, workspace, m+1" - "$controlmod, left, workspace, m-1" + "$mod SHIFT, S, movetoworkspace, special:magic" + "$mod CTRL, right, workspace, m+1" + "$mod CTRL, left, workspace, m-1" "$mod, mouse_down, workspace, m-1" "$mod, mouse_up, workspace, m+1" "$mod, left, movefocus, l" @@ -120,10 +118,10 @@ "$mod, L, exec, playerctl next" "$mod, G, togglefloating," "$mod, F1, exec, hyprlock" - "$shiftmod, E, exec, codium" - "$controlmod, up, exec, light -A 10" - "$controlmod, down, exec, light -U 10" - "$controlmod, Q, exec, hyprctl kill" + "$mod SHIFT, E, exec, codium" + "$mod CTRL, up, exec, light -A 10" + "$mod CTRL, down, exec, light -U 10" + "$mod CTRL, Q, exec, hyprctl kill" ] ++ (builtins.concatLists ( @@ -134,7 +132,7 @@ in [ "$mod, code:1${toString i}, workspace, ${toString ws}" - "$shiftmod, code:1${toString i}, movetoworkspacesilent, ${toString ws}" + "$mod SHIFT, code:1${toString i}, movetoworkspacesilent, ${toString ws}" ] ) config.desktop.hyprland.workspaces.amount )); diff --git a/home/desktop/window-managers/niri.nix b/home/desktop/window-managers/niri.nix index a7fee7d..aada878 100644 --- a/home/desktop/window-managers/niri.nix +++ b/home/desktop/window-managers/niri.nix @@ -20,6 +20,7 @@ in "~/.config/niri/config.kdl" = { target = ".config/niri/config.kdl"; text = '' + input { keyboard { @@ -45,6 +46,70 @@ in } } + output "Samsung Electric Company S24D330 0x5A5A5131" { + mode "1920x1080@60" + position x=0 y=1440 + } + output "PNP(AOC) Q27G2WG4 0x00005F45" { + mode "2560x1440@143.912" + position x=0 y=0 + variable-refresh-rate on-demand=true + focus-at-startup + } + + binds { + //Applications + ${modifier}+${osConfig.keybinds.hotkeys.terminal} hotkey-overlay-title="Open Terminal" { spawn "${osConfig.apps.terminal.binary}";} + ${modifier}+${osConfig.keybinds.hotkeys.browser} hotkey-overlay-title="Open Browser" { spawn "${osConfig.apps.internet.browsers.default}";} + ${modifier}+${osConfig.keybinds.hotkeys.launcher} hotkey-overlay-title="Open Launcher" { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle";} + ${modifier}+Shift+${osConfig.keybinds.hotkeys.editor} hotkey-overlay-title="Open Editor" { spawn "${osConfig.apps.development.editor.default}";} + + //Window Management + ${modifier}+Shift+${osConfig.keybinds.hotkeys.close-window} { close-window; } + + //Column Navigation + ${modifier}+H { focus-column-left; } + ${modifier}+L { focus-column-right; } + ${modifier}+R { switch-preset-column-width; } + ${modifier}+Shift+R { switch-preset-column-width-back; } + ${modifier}+F { expand-column-to-available-width; } + ${modifier}+G { toggle-window-floating; } + + //Workspace Navigation + ${modifier}+J cooldown-ms=150 { focus-workspace-down; } + ${modifier}+K cooldown-ms=150 { focus-workspace-up; } + + //Screenshots + Print { screenshot;} + } + + switch-events { + lid-close { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "lockAndSuspend"; } + } + + layout { + gaps 20 + center-focused-column "always" + always-center-single-column + default-column-width { proportion 0.5; } + preset-column-widths { + proportion 0.5 + proportion 0.66667 + proportion 1.0 + } + border { + width 5 + } + shadow { + on + } + } + + + spawn-at-startup "elephant" + spawn-at-startup "noctalia-shell" + spawn-at-startup "walker --gapplication-service" + gestures { hot-corners { @@ -66,32 +131,6 @@ in hide-not-bound } - binds { - ${modifier}+Down cooldown-ms=150 { focus-workspace-down; } - ${modifier}+Up cooldown-ms=150 { focus-workspace-up; } - ${modifier}+${osConfig.keybinds.hotkeys.terminal} { spawn "${osConfig.apps.terminal.binary}";} - ${modifier}+Left {focus-column-left; } - ${modifier}+Right {focus-column-right; } - ${modifier}+${osConfig.keybinds.hotkeys.browser} { spawn "${osConfig.apps.internet.browsers.default}";} - ${modifier}+${osConfig.keybinds.hotkeys.launcher} { spawn "${osConfig.desktop.shell.launcher}";} - Print { screenshot;} - ${modifier}+Shift+${osConfig.keybinds.hotkeys.close-window} { close-window; } - ${modifier}+Shift+${osConfig.keybinds.hotkeys.editor} { spawn "${osConfig.apps.development.editor.default}";} - } - - spawn-at-startup "elephant" - spawn-at-startup "noctalia-shell" - spawn-at-startup "walker --gapplication-service" - - layout { - gaps 20 - focus-ring { - width 5 - } - border { - off - } - } window-rule { geometry-corner-radius 20 clip-to-geometry true diff --git a/hosts/marty-pc/options.nix b/hosts/marty-pc/options.nix index f2b386e..8c07686 100644 --- a/hosts/marty-pc/options.nix +++ b/hosts/marty-pc/options.nix @@ -28,7 +28,7 @@ editor = { vscodium.enable = true; emacs.enable = true; - default = "vscodium"; + default = "codium"; }; languages = { python.enable = true; diff --git a/modules/apps/video/default.nix b/modules/apps/video/default.nix index 55f516f..0b4caae 100644 --- a/modules/apps/video/default.nix +++ b/modules/apps/video/default.nix @@ -35,7 +35,6 @@ [ kdePackages.kdenlive kdePackages.qtwebsockets - obs-studio ] else [ ] @@ -50,5 +49,23 @@ else [ ] ); + programs = { + obs-studio = + if config.apps.video.editing.enable then + { + enable = true; + enableVirtualCamera = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi # optional AMD hardware acceleration + obs-gstreamer + obs-vkcapture + ]; + } + else + { }; + }; }; } diff --git a/modules/desktop/shell/noctalia.nix b/modules/desktop/shell/noctalia.nix index f89d873..0200f83 100644 --- a/modules/desktop/shell/noctalia.nix +++ b/modules/desktop/shell/noctalia.nix @@ -18,6 +18,7 @@ with pkgs; [ evtest + gnome-calendar ] else [ ];