commit b3eaefc3f61713160e93edd4f4e9a5f3e70cae8e parent 917829fdd9d24b0fa6313a0a7f1dc0794cf31847 Author: maydayv7 <maydayv7@gmail.com> Date: Fri, 19 Jun 2026 23:47:08 +0530 feat: Desktop refinements Diffstat:
19 files changed, 431 insertions(+), 187 deletions(-)
diff --git a/files/_module.nix b/files/_module.nix @@ -76,8 +76,8 @@ in { # Hyprland WM hyprland = { shaders = ./hyprland/shaders; + noctalia = ./hyprland/noctalia; pypr = readFile ./hyprland/pypr.toml; - waycorner = readFile ./hyprland/waycorner.toml; kebihelp = readFile ./hyprland/kebihelp.json; }; diff --git a/files/hyprland/noctalia/submap/plugin.toml b/files/hyprland/noctalia/submap/plugin.toml @@ -0,0 +1,33 @@ +# Hyprland Submap Indicator +id = "maydayv7/hyprland-submap" +name = "Hyprland Submap" +version = "1.0.0" +min_noctalia = "5.0.0" +author = "maydayv7" +license = "GPL-3.0-only" +tags = ["hyprland", "submap"] +icon = "keyboard" +description = "Shows the currently active Hyprland submap on the bar." + +[[setting]] +key = "command" +type = "string" +label_key = "settings.command.label" +description_key = "settings.command.description" +default = "socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock -" + +[[widget]] +id = "indicator" +entry = "submap.luau" + + [[widget.setting]] + key = "glyph" + type = "glyph" + label_key = "settings.glyph.label" + default = "keyboard" + + [[widget.setting]] + key = "show_glyph" + type = "bool" + label_key = "settings.show_glyph.label" + default = true diff --git a/files/hyprland/noctalia/submap/submap.luau b/files/hyprland/noctalia/submap/submap.luau @@ -0,0 +1,38 @@ +-- Hyprland Submap Indicator bar widget + +local glyph = barWidget.getConfig("glyph") +local showGlyph = barWidget.getConfig("show_glyph") +local command = barWidget.getConfig("command") + +local function apply(name) + if name == nil or name == "" then + barWidget.setText("") + barWidget.setTooltip("") + barWidget.setVisible(false) + return + end + + if showGlyph then + barWidget.setGlyph(glyph) + end + barWidget.setText(name) + barWidget.setTooltip(noctalia.tr("active") .. name) + barWidget.setVisible(true) +end + +-- Static otherwise: slow periodic tick down +function update() + noctalia.setUpdateInterval(60000) +end + +-- Start hidden until first event arrives +apply("") + +if command ~= nil and command ~= "" then + noctalia.runStream(command, function(line) + local name = string.match(line, "^submap>>(.*)$") + if name ~= nil then + apply(name) + end + end) +end diff --git a/files/hyprland/noctalia/submap/translations/en.json b/files/hyprland/noctalia/submap/translations/en.json @@ -0,0 +1,17 @@ +{ + "title": "Hyprland Submap", + "active": "Submap: ", + "settings": { + "glyph": { + "label": "Glyph", + "description": "Glyph shown before the submap name." + }, + "show_glyph": { + "label": "Show glyph" + }, + "command": { + "label": "Stream command", + "description": "Shell command emitting Hyprland `submap>>NAME` event lines." + } + } +} diff --git a/files/hyprland/waycorner.toml b/files/hyprland/waycorner.toml @@ -1,11 +0,0 @@ -[overview] -command = [ "hyprctl", "dispatch", "hyprexpo:expo", "on" ] -locations = [ "top_left" ] -size = 10 -timeout_ms = 200 - -[workspace] -command = [ "hyprctl", "dispatch", "split:workspace", "empty" ] -locations = [ "top_right" ] -size = 10 -timeout_ms = 200 diff --git a/flake.lock b/flake.lock @@ -1729,11 +1729,11 @@ ] }, "locked": { - "lastModified": 1781625454, - "narHash": "sha256-5mGBvcA/BRdWpxOxqmtDvnQgr6Z3AiNiic1CaTDNTVM=", + "lastModified": 1781888265, + "narHash": "sha256-J+sVIVJ1Uhx2ugZnRqZD75NP0Go78tkupBRlkpC3Ppg=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "2066693c9d7ef183557e2ba4a3ec586d6cff8bc4", + "rev": "e0100eeb6e2fe67b4173a5e555f7901162a2aba2", "type": "github" }, "original": { diff --git a/modules/desktop/gnome/_main.nix b/modules/desktop/gnome/_main.nix @@ -40,22 +40,10 @@ programs = { gnupg.agent.pinentryPackage = pkgs.lib.mkForce pkgs.pinentry-gnome3; - kdeconnect = { enable = true; package = pkgs.gnomeExtensions.gsconnect; }; - - firefox = { - nativeMessagingHosts.packages = [pkgs.gnomeExtensions.gsconnect]; - policies.ExtensionSettings = { - name = "gnome-shell-integration"; - value = { - installation_mode = "normal_installed"; - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/chrome-gnome-shell@gnome.org/latest.xpi"; - }; - }; - }; }; # Screen Brightness @@ -100,11 +88,6 @@ home = _: { config = { - stylix.targets = { - gnome.enable = true; - ghostty.enable = true; - }; - # Default Applications xdg.mimeApps.defaultApplications = util.build.mime { archive = ["org.gnome.FileRoller.desktop"]; @@ -142,43 +125,57 @@ ".cache/gnome-builder" ]; - ## Terminal - programs.ghostty = { - enable = true; - settings = { - # Features - clipboard-paste-protection = true; - clipboard-trim-trailing-spaces = true; - copy-on-select = false; - mouse-hide-while-typing = true; - quit-after-last-window-closed = true; - scrollback-limit = 4200; - shell-integration-features = true; - window-vsync = true; + programs = { + # Terminal + ghostty = { + enable = true; + settings = { + clipboard-paste-protection = true; + clipboard-trim-trailing-spaces = true; + copy-on-select = false; + mouse-hide-while-typing = true; + quit-after-last-window-closed = true; + scrollback-limit = 4200; + shell-integration-features = true; + window-vsync = true; + keybind = [ + "ctrl+h=goto_split:left" + "ctrl+j=goto_split:bottom" + "ctrl+k=goto_split:top" + "ctrl+l=goto_split:right" + "ctrl+shift+h=new_split:left" + "ctrl+shift+j=new_split:down" + "ctrl+shift+k=new_split:up" + "ctrl+shift+l=new_split:right" + "ctrl+shift+enter=new_split:auto" + "ctrl+shift+i=inspector:toggle" + "ctrl+shift+r=reload_config" + "ctrl+t=new_tab" + ]; + }; + }; - # Keybindings - keybind = [ - "ctrl+h=goto_split:left" - "ctrl+j=goto_split:bottom" - "ctrl+k=goto_split:top" - "ctrl+l=goto_split:right" - "ctrl+shift+h=new_split:left" - "ctrl+shift+j=new_split:down" - "ctrl+shift+k=new_split:up" - "ctrl+shift+l=new_split:right" - "ctrl+shift+enter=new_split:auto" - "ctrl+shift+i=inspector:toggle" - "ctrl+shift+r=reload_config" - "ctrl+t=new_tab" - ]; + # Browser + firefox = { + enableGnomeExtensions = true; + policies.ExtensionSettings = { + name = "gnome-shell-integration"; + value = { + installation_mode = "normal_installed"; + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/chrome-gnome-shell@gnome.org/latest.xpi"; + }; + }; }; }; - # Firefox GNOME Theme - stylix.targets.firefox = { - enable = true; - profileNames = ["default"]; - firefoxGnomeTheme.enable = true; + stylix.targets = { + gnome.enable = true; + ghostty.enable = true; + firefox = { + enable = true; + profileNames = ["default"]; + firefoxGnomeTheme.enable = true; + }; }; }; }; diff --git a/modules/desktop/gnome/_settings/extensions.nix b/modules/desktop/gnome/_settings/extensions.nix @@ -43,7 +43,6 @@ lib.mkIf (osConfig != null) ( {package = media-progress;} {package = night-light-slider-updated;} {package = notification-counter;} - {package = overview-hover;} {package = removable-drive-menu;} {package = screenshot-window-sizer;} {package = unmess;} @@ -372,7 +371,7 @@ lib.mkIf (osConfig != null) ( package = vertical-workspaces; settings = { aaa-loading-profile = true; - always-activate-selected-window = false; + always-activate-selected-window = true; animation-speed-factor = 100; app-display-module = true; app-favorites-module = true; diff --git a/modules/desktop/hyprland/_features/browser.nix b/modules/desktop/hyprland/_features/browser.nix @@ -1,19 +0,0 @@ -# Web Browser -_: { - home = _: { - home.file.".config/mozilla/firefox/default/chrome/userChrome.css".text = '' - #TabsToolbar { - -moz-window-dragging: no-drag; - } - ''; - - # Theme - programs.firefox.policies.ExtensionSettings = { - name = "catppuccin-macchiato-blue"; - value = { - installation_mode = "normal_installed"; - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/{d49033ac-8969-488c-afb0-5cdb73957f41}/latest.xpi"; - }; - }; - }; -} diff --git a/modules/desktop/hyprland/_features/hyprutils.nix b/modules/desktop/hyprland/_features/hyprutils.nix @@ -17,43 +17,20 @@ hyprkeys hyprshade unstable.pyprland - waycorner ]; }; - home = { - config, - pkgs, - ... - }: let - inherit (pkgs.lib) getExe; - inherit (config.lib.stylix) colors; - in { - # Hot Corners - systemd.user.services.waycorner = let - target = ["graphical-session.target"]; - in { - Install.WantedBy = target; - Unit = { - Description = "Hot Corners"; - After = target; - }; - Service.ExecStart = getExe pkgs.waycorner; - }; - + home = {config, ...}: { home = { persist.directories = [".config/nwg-displays"]; file = with files.hyprland; { # Pyprland ".config/pypr/config.toml".text = pypr; - # Hot Corners - ".config/waycorner/config.toml".text = waycorner; - # Keybinds Viewer ".config/kebihelp.json".text = util.build.theme { - inherit colors; inherit (config.stylix) fonts; + inherit (config.lib.stylix) colors; file = kebihelp; }; diff --git a/modules/desktop/hyprland/_features/login.nix b/modules/desktop/hyprland/_features/login.nix @@ -1,10 +1,6 @@ # Login Greeter {inputs ? null, ...}: { - nixos = { - config, - pkgs, - ... - }: { + nixos = {config, ...}: { imports = [inputs.noctalia-greeter.nixosModules.default]; environment.persist.directories = ["/var/lib/noctalia-greeter"]; programs.noctalia-greeter = { diff --git a/modules/desktop/hyprland/_features/misc.nix b/modules/desktop/hyprland/_features/misc.nix @@ -0,0 +1,23 @@ +# Web Browser +_: { + home = _: { + # GTK Apps + dconf.settings."org/gnome/desktop/wm/preferences" = { + action-double-click-titlebar = "none"; + button-layout = "appmenu"; + }; + + # Browser + home.file.".config/mozilla/firefox/default/chrome/userChrome.css".text = '' + #TabsToolbar { + -moz-window-dragging: no-drag; + } + ''; + + # Code Editor + programs.vscode.profiles.default.userSettings = { + "window.titleBarStyle" = "custom"; + "window.controlsStyle" = "hidden"; + }; + }; +} diff --git a/modules/desktop/hyprland/_features/shell.nix b/modules/desktop/hyprland/_features/shell.nix @@ -1,18 +1,22 @@ # Noctalia Shell -{inputs ? null, ...}: { +{ + inputs ? null, + files ? null, + ... +}: { home = { config, osConfig ? null, + lib, + pkgs, ... }: let - inherit (config.lib.stylix.colors) withHashtag; - inherit (config.stylix.fonts) sansSerif; + output = osConfig.gui.display; in { imports = [inputs.noctalia.homeModules.default]; stylix.targets.noctalia-shell.enable = false; home.persist.directories = [ ".cache/noctalia" - ".local/share/noctalia" ".local/state/noctalia" ]; @@ -21,26 +25,40 @@ systemd.enable = true; settings = { shell = { - font_family = sansSerif.name; + font_family = config.stylix.fonts.sansSerif.name; + avatar_path = "~/.face"; clipboard_enabled = true; clipboard_history_max_entries = 150; polkit_agent = true; + launch_apps_as_systemd_services = true; + settings_show_advanced = true; + panel.launcher_session_search = true; + screen_corners = { + enabled = true; + size = 30; + }; + shadow.direction = "center"; }; theme = { source = "custom"; custom_palette = "stylix"; mode = "dark"; + builtin = "Catppuccin"; + templates = { + builtin_ids = ["qt"]; + enable_builtin_templates = false; + enable_community_templates = false; + }; }; # Bar bar.main = { position = "top"; - start = ["session" "control-center" "workspaces"]; - center = ["launcher" "clock" "media"]; + start = ["session" "workspaces" "minimize" "media" "maydayv7/hyprland-submap:indicator"]; + center = ["control-center" "clock" "launcher"]; end = [ "tray" - "system_monitor" "clipboard" "bluetooth" "network" @@ -49,33 +67,131 @@ "battery" "notifications" ]; + background_opacity = 0.75; + margin_edge = 0; + margin_ends = 0; + padding = 15; + radius = 0; + scale = 1.1; + thickness = 30; + widget_spacing = 14; + }; + + # Audio + audio = { + enable_overdrive = true; + enable_sounds = true; + sound_volume = 0.3; + }; + + # Widgets + widget = { + clock.anchor = true; + control-center.glyph = "menu"; + workspaces.display = "name"; + network.show_label = false; + media = { + hide_when_no_media = true; + title_scroll = "on_hover"; + }; + + # Minimize Button + minimize = { + type = "custom_button"; + glyph = "arrow-bar-to-down"; + tooltip = "Minimize window"; + command = "hyprctl dispatch movetoworkspacesilent special:minimized"; + right_command = "hyprutils toggle minimized"; + }; + }; + system.monitor.enabled = true; + + # Calendar + calendar = { + enabled = true; + account.personal_google.type = "google"; }; # Notifications - notification.enable_daemon = true; - osd.kinds = { - volume = true; - brightness = true; - wifi = true; - bluetooth = true; - power_profile = true; - caffeine = true; - dnd = true; - keyboard_layout = true; + notification = { + enable_daemon = true; + layer = "overlay"; + filter.power = { + enabled = true; + match = "poweralertd"; + play_sound = true; + save_history = false; + show_toast = true; + }; + }; + osd = { + background_opacity = 0.75; + kinds = { + volume = true; + brightness = true; + wifi = true; + bluetooth = true; + power_profile = true; + caffeine = true; + dnd = true; + keyboard_layout = true; + }; + }; + + # Screenshots + shell.screenshot = { + save_to_file = true; + copy_to_clipboard = true; + freeze_screen = true; + directory = "~/Pictures/Screenshots"; }; # Wallpaper wallpaper = { - enabled = true; - fill_mode = "crop"; + enabled = false; default.path = "${osConfig.stylix.image}"; }; - # Lock Screen - lockscreen = { - enabled = true; - blurred_desktop = true; - blur_intensity = 0.5; + # Desktop Widgets + desktop_widgets = { + schema_version = 2; + widget_order = ["desktop-widget-0000000000000001" "desktop-widget-0000000000000002"]; + grid = { + cell_size = 16; + major_interval = 4; + visible = true; + }; + widget = { + "desktop-widget-0000000000000001" = { + inherit output; + box_height = 352.0; + box_width = 368.0; + cx = 1328.0; + cy = 240.0; + rotation = 0.0; + type = "clock"; + settings = { + background = false; + center_text = true; + clock_style = "analog"; + format = "{:%H:%M:%S}"; + shadow = true; + }; + }; + "desktop-widget-0000000000000002" = { + inherit output; + box_height = 112.0; + box_width = 240.0; + cx = 1392.0; + cy = 856.0; + rotation = 0.0; + type = "weather"; + settings = { + background = false; + show_forecast = false; + }; + }; + }; }; # Screen Idle @@ -93,12 +209,68 @@ }; }; - # Screenshots - shell.screenshot = { - save_to_file = true; - copy_to_clipboard = true; - freeze_screen = true; - directory = "~/Pictures/Screenshots"; + # Lock Screen + lockscreen = { + enabled = true; + blurred_desktop = false; + blur_intensity = 0.0; + tint_intensity = 0.25; + fingerprint = false; + }; + + # Lockscreen Widgets + lockscreen_widgets = { + enabled = true; + schema_version = 2; + widget_order = [ + "lockscreen-login-box@eDP-1" + "lockscreen-widget-0000000000000001" + "lockscreen-widget-0000000000000003" + ]; + grid = { + cell_size = 16; + major_interval = 4; + visible = true; + }; + widget = { + "lockscreen-login-box@${output}" = { + inherit output; + box_height = 70.0; + box_width = 400.0; + cx = 1280.0; + cy = 1477.0; + rotation = 0.0; + type = "login_box"; + settings = { + background_color = "surface_variant"; + background_opacity = 0.88; + background_radius = 12.0; + input_opacity = 1.0; + input_radius = 6.0; + show_login_button = true; + }; + }; + "lockscreen-widget-0000000000000001" = { + inherit output; + box_height = 256.0; + box_width = 736.0; + cx = 768.0; + cy = 352.0; + rotation = 0.0; + type = "clock"; + settings.format = "{:%H:%M:%S}"; + }; + "lockscreen-widget-0000000000000003" = { + inherit output; + box_height = 192.0; + box_width = 368.0; + cx = 768.0; + cy = 640.0; + rotation = 0.0; + type = "media_player"; + settings.hide_when_no_media = true; + }; + }; }; # Night Light @@ -108,19 +280,47 @@ temperature_night = 4000; }; + # Weather + weather.enabled = true; location = { auto_locate = true; sunset = "19:00"; sunrise = "06:00"; }; - brightness.enable_ddcutil = false; - system.monitor.enabled = true; - weather.enabled = true; + # Plugins + plugins = { + source = [ + { + name = "official"; + kind = "git"; + location = "https://github.com/noctalia-dev/official-plugins"; + } + { + name = "community"; + kind = "git"; + location = "https://github.com/noctalia-dev/community-plugins"; + } + { + name = "local"; + kind = "path"; + location = "${files.hyprland.noctalia}"; + } + ]; + enabled = [ + "noctalia/screen_recorder" + "noctalia/timer" + "maydayv7/hyprland-submap" + ]; + }; + plugin_settings = { + "noctalia/screen_recorder".copy_to_clipboard = true; + "maydayv7/hyprland-submap".command = "${lib.getExe pkgs.socat} -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock -"; + }; }; # Color Palette - customPalettes.stylix.dark = with withHashtag; { + customPalettes.stylix.dark = with config.lib.stylix.colors.withHashtag; { primary = base0D; onPrimary = base00; secondary = base0E; @@ -137,7 +337,7 @@ shadow = base00; hover = base0C; onHover = base00; - terminal = with withHashtag; { + terminal = { normal = { black = base00; red = base08; diff --git a/modules/desktop/hyprland/_features/style.nix b/modules/desktop/hyprland/_features/style.nix @@ -35,7 +35,7 @@ }; }; - home = {config, ...}: { + home = _: { imports = [inputs.catppuccin.homeModules.catppuccin]; config = { @@ -44,17 +44,20 @@ accent = "blue"; flavor = "macchiato"; - brave.enable = config.programs.brave.enable or false; - thunderbird.enable = config.programs.thunderbird.enable or false; - obs.enable = config.programs.obs-studio.enable or false; - vesktop.enable = config.programs.nixcord.vesktop.enable or false; - vscode.profiles.default.enable = config.programs.vscode.enable or false; + brave.enable = true; + thunderbird.enable = true; + obs.enable = true; + vesktop.enable = true; + vscode.profiles.default.enable = true; }; - # GTK Apps - dconf.settings."org/gnome/desktop/wm/preferences" = { - action-double-click-titlebar = "none"; - button-layout = "appmenu"; + # Browser + programs.firefox.policies.ExtensionSettings = { + name = "catppuccin-macchiato-blue"; + value = { + installation_mode = "normal_installed"; + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/{d49033ac-8969-488c-afb0-5cdb73957f41}/latest.xpi"; + }; }; }; }; diff --git a/modules/desktop/hyprland/_settings/keybinds.nix b/modules/desktop/hyprland/_settings/keybinds.nix @@ -84,7 +84,6 @@ in { "CTRL, Print, exec, grimblast --notify --cursor copysave active" # Submaps - "$mod SHIFT, Escape, exec, hyprutils toggle service waycorner" "$mod SHIFT, Escape, submap, Inhibit" "$mod, R, submap, Resize" "$mod, M, submap, Move" @@ -150,10 +149,7 @@ in { ## Submaps submaps = { # Inhibit Keybinds - Inhibit.settings.bind = [ - "$mod SHIFT, Escape, exec, hyprutils toggle service waycorner" - "$mod SHIFT, Escape, submap, reset" - ]; + Inhibit.settings.bind = ["$mod SHIFT, Escape, submap, reset"]; # Window Resize Resize.settings = { diff --git a/modules/hosts/valkyrie/_settings/default.nix b/modules/hosts/valkyrie/_settings/default.nix @@ -41,6 +41,14 @@ _: { cloudflared gcc github-copilot-cli + (mongodb-compass.overrideAttrs (oldAttrs: { + postFixup = + (oldAttrs.postFixup or "") + + '' + wrapProgram $out/bin/mongodb-compass \ + --add-flags "--password-store=gnome-libsecret --ignore-additional-command-line-flags" + ''; + })) # Node nodejs @@ -58,8 +66,10 @@ _: { home = _: { home.persist.directories = [ ".copilot" + ".mongodb" ".npm" ".config/rog" + ".config/MongoDB Compass" ".local/share/cloudflare-warp-gui" ]; diff --git a/modules/hosts/valkyrie/default.nix b/modules/hosts/valkyrie/default.nix @@ -46,7 +46,7 @@ "latex" #"wine" "games" - "gnome" + "hyprland" ]; hmImports = @@ -83,10 +83,11 @@ in { fs.scheme = "advanced"; # Kernel - kernel = "xanmod"; + kernel = "zen"; kernelModules = [ "nvme" "thunderbolt" + "asus-armoury" ]; # Nix Tools @@ -112,7 +113,7 @@ in { # GUI gui = { display = "eDP-1"; - wallpaper = "Bluewatch"; + wallpaper = "Quasar"; fancy = true; }; diff --git a/modules/system/boot.nix b/modules/system/boot.nix @@ -103,6 +103,7 @@ enable = true; autoReboot = true; }; + settings.console-mode = "max"; }; environment = { diff --git a/scripts/hyprutils.nix b/scripts/hyprutils.nix @@ -19,7 +19,6 @@ monitor 'name' - Toggle specified Monitor shader - Toggle Compositor Shader touchpad - Toggle touchpad - service 'name' - Toggle SYSTEMD Service ''; daemon = builtins.toFile "daemon.sh" '' @@ -63,7 +62,6 @@ in custom.hyprshellevents hyprland hyprshade - systemd zenity ]; @@ -159,21 +157,6 @@ in fi fi ;; - "service") - if [ -z "$3" ] - then - fail "Expected service name" - fi - - if systemctl --user is-active "$3" - then - systemctl --user stop "$3" - hyprnotify 1 "Stopped $3" - else - systemctl --user start "$3" - hyprnotify 1 "Started $3" - fi - ;; "") fail "Expected an Option" ;; *) fail "Unexpected Option 'toggle $2'" ;; esac