diff --git a/frame12/desktop-configuration.nix b/frame12/desktop-configuration.nix index 3b7fe15..a699fac 100644 --- a/frame12/desktop-configuration.nix +++ b/frame12/desktop-configuration.nix @@ -96,7 +96,7 @@ in # Hide the OS choice for bootloaders. # It's still possible to open the bootloader list by pressing any key # It will just not appear on screen unless a key is pressed - loader.timeout = 0; + loader.timeout = 1; # Use the systemd-boot EFI boot loader. loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; diff --git a/frame12/linked-dotfiles/niri/config.kdl b/frame12/linked-dotfiles/niri/config.kdl index 3e6e973..ec2ea16 100644 --- a/frame12/linked-dotfiles/niri/config.kdl +++ b/frame12/linked-dotfiles/niri/config.kdl @@ -2,16 +2,11 @@ // MISCELLANEOUS // -// gui startup -// spawn-at-startup "swaybg" "-i" "/home/nate/nixos/frame12/wallpaper.png" "-m" "fill" -// spawn-at-startup "waybar" +// gui startup - Noctalia handles bar, notifications, wallpaper, wifi, and bluetooth spawn-at-startup "keepassxc" spawn-at-startup "flatpak" "run" "org.signal.Signal" // shell startup -spawn-sh-at-startup "kanshi" -spawn-sh-at-startup "sleep 5 && nm-applet --indicator" spawn-sh-at-startup "sleep 5 && syncthingtray --wait" -spawn-sh-at-startup "sleep 5 && swaync" screenshot-path null // save screenshots just to clipboard prefer-no-csd // (Client Side Decorations) ask clients to not add their own decorations @@ -249,8 +244,8 @@ binds { // Terminal - consistent with sway/hyprland Mod+Return { spawn "ghostty"; } - // Application launcher - consistent with sway/hyprland - Mod+D { spawn "wofi" "--show" "drun"; } + // Application launcher - Noctalia launcher + Mod+D { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; } // File manager - consistent with sway/hyprland Mod+T { spawn "nautilus"; } @@ -371,8 +366,8 @@ binds { // Utilities // - // Notifications - Mod+Shift+C { spawn-sh "swaync-client --toggle-panel"; } + // Notifications - Noctalia notification panel + Mod+Shift+C { spawn "noctalia-shell" "ipc" "call" "notificationHistory" "toggle"; } // Screenshots - consistent with sway/hyprland Mod+P { screenshot; } @@ -383,14 +378,11 @@ binds { Ctrl+Print { screenshot-screen; } Alt+Print { screenshot-window; } - // Volume control (via swayosd) - XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "lower"; } - XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume" "mute-toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "swayosd-client" "--input-volume" "mute-toggle"; } - - // Caps Lock indicator (via swayosd) - Caps_Lock { spawn "swayosd-client" "--caps-lock"; } + // Volume control (via Noctalia) + XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "increase"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "decrease"; } + XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteOutput"; } + XF86AudioMicMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteInput"; } // Media control XF86AudioPlay { spawn "playerctl" "play-pause"; } @@ -399,9 +391,9 @@ binds { XF86AudioPrev { spawn "playerctl" "previous"; } XF86AudioStop { spawn "playerctl" "stop"; } - // Brightness control (via swayosd) - XF86MonBrightnessUp { spawn "swayosd-client" "--brightness" "raise"; } - XF86MonBrightnessDown { spawn "swayosd-client" "--brightness" "lower"; } + // Brightness control (via Noctalia) + XF86MonBrightnessUp { spawn "noctalia-shell" "ipc" "call" "brightness" "increase"; } + XF86MonBrightnessDown { spawn "noctalia-shell" "ipc" "call" "brightness" "decrease"; } // Screen rotation Mod+Alt+Up { spawn "niri" "msg" "output" "eDP-1" "transform" "normal"; } @@ -409,9 +401,14 @@ binds { Mod+Alt+Down { spawn "niri" "msg" "output" "eDP-1" "transform" "180"; } Mod+Alt+Left { spawn "niri" "msg" "output" "eDP-1" "transform" "270"; } - Mod+Shift+Q { quit; } + // Session/Power menu (via Noctalia) + Mod+Shift+Q { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } + Mod+Ctrl+Q { quit; } Mod+Shift+Ctrl+P { power-off-monitors; } + // Lock screen (via Noctalia) + Mod+L { spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; } + Mod+Shift+Ctrl+T { toggle-debug-tint; } } diff --git a/frame12/modules/niri/niri_conf.nix b/frame12/modules/niri/niri_conf.nix index 16ad196..ca2c25c 100755 --- a/frame12/modules/niri/niri_conf.nix +++ b/frame12/modules/niri/niri_conf.nix @@ -75,7 +75,7 @@ in man-pages man-pages-posix nautilus - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol slurp swaylock @@ -151,7 +151,7 @@ in ### ## Services ### - services.blueman.enable = true; + # services.blueman.enable = true; # Noctalia handles bluetooth services.gvfs.enable = true; # file manager mount, trash, etc services.tumbler.enable = true; # thunar thumbnails services.openssh.enable = true; diff --git a/frame12/modules/niri/niri_home.nix b/frame12/modules/niri/niri_home.nix index 83b821d..92f7af9 100644 --- a/frame12/modules/niri/niri_home.nix +++ b/frame12/modules/niri/niri_home.nix @@ -43,7 +43,7 @@ libnotify swaynotificationcenter # Tray Applets - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol syncthingtray tailscale-systray diff --git a/jaci/desktop-configuration.nix b/jaci/desktop-configuration.nix index dcb9c78..77eec0b 100644 --- a/jaci/desktop-configuration.nix +++ b/jaci/desktop-configuration.nix @@ -101,7 +101,7 @@ in "udev.log_priority=3" ]; # Hide the OS choice for bootloaders. - loader.timeout = 0; + loader.timeout = 1; # Use the systemd-boot EFI boot loader. loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; diff --git a/jaci/linked-dotfiles/niri/config.kdl b/jaci/linked-dotfiles/niri/config.kdl index de8ba23..705c539 100644 --- a/jaci/linked-dotfiles/niri/config.kdl +++ b/jaci/linked-dotfiles/niri/config.kdl @@ -2,12 +2,6 @@ // MISCELLANEOUS // -// gui startup -spawn-at-startup "swaybg" "-i" "/home/jaci/nixos/jaci/kiki_background.jpg" "-m" "fill" -spawn-at-startup "waybar" -// shell startup -spawn-sh-at-startup "sleep 5 && nm-applet --indicator" -spawn-sh-at-startup "sleep 5 && swaync" screenshot-path "~/Pictures/"// save screenshots just to clipboard prefer-no-csd // (Client Side Decorations) ask clients to not add their own decorations @@ -213,8 +207,8 @@ binds { // Terminal Mod+Return { spawn "ghostty"; } - // Application launcher - nwg-drawer - Mod+D { spawn "nwg-drawer"; } + // Application launcher - Noctalia launcher + Mod+D { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; } // File manager Mod+T { spawn "nautilus"; } @@ -331,8 +325,8 @@ binds { // Utilities // - // Notifications - Mod+Shift+C { spawn-sh "swaync-client --toggle-panel"; } + // Notifications - Noctalia notification panel + Mod+Shift+C { spawn "noctalia-shell" "ipc" "call" "notificationHistory" "toggle"; } // Screenshots Mod+P { screenshot; } @@ -343,14 +337,11 @@ binds { Ctrl+Print { screenshot-screen; } Alt+Print { screenshot-window; } - // Volume control (via swayosd) - XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "lower"; } - XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume" "mute-toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "swayosd-client" "--input-volume" "mute-toggle"; } - - // Caps Lock indicator (via swayosd) - Caps_Lock { spawn "swayosd-client" "--caps-lock"; } + // Volume control (via Noctalia) + XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "increase"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "decrease"; } + XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteOutput"; } + XF86AudioMicMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteInput"; } // Media control XF86AudioPlay { spawn "playerctl" "play-pause"; } @@ -359,9 +350,9 @@ binds { XF86AudioPrev { spawn "playerctl" "previous"; } XF86AudioStop { spawn "playerctl" "stop"; } - // Brightness control (via swayosd) - XF86MonBrightnessUp { spawn "swayosd-client" "--brightness" "raise"; } - XF86MonBrightnessDown { spawn "swayosd-client" "--brightness" "lower"; } + // Brightness control (via Noctalia) + XF86MonBrightnessUp { spawn "noctalia-shell" "ipc" "call" "brightness" "increase"; } + XF86MonBrightnessDown { spawn "noctalia-shell" "ipc" "call" "brightness" "decrease"; } // Screen rotation Mod+Alt+Up { spawn "niri" "msg" "output" "eDP-1" "transform" "normal"; } @@ -369,9 +360,14 @@ binds { Mod+Alt+Down { spawn "niri" "msg" "output" "eDP-1" "transform" "180"; } Mod+Alt+Left { spawn "niri" "msg" "output" "eDP-1" "transform" "270"; } - Mod+Shift+Q { quit; } + // Session/Power menu (via Noctalia) + Mod+Shift+Q { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } + Mod+Ctrl+Q { quit; } Mod+Shift+Ctrl+P { power-off-monitors; } + // Lock screen (via Noctalia) + Mod+L { spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; } + Mod+Shift+Ctrl+T { toggle-debug-tint; } } diff --git a/jaci/modules/home-manager/home.nix b/jaci/modules/home-manager/home.nix index f21ed8e..6fc1f38 100644 --- a/jaci/modules/home-manager/home.nix +++ b/jaci/modules/home-manager/home.nix @@ -38,7 +38,7 @@ barPosition = "top"; darkMode = false; # Jaci uses light mode useWallpaperColors = true; # Generate colors from wallpaper - locationName = "Denver"; + locationName = "Salt Lake"; avatarImage = "/home/${userName}/.face"; }; @@ -50,8 +50,6 @@ # mangohud wine-wayland - webcord - mumble # # Unix tools @@ -60,19 +58,6 @@ htop unzip - # - # Photo / Video - # - imv - ffmpeg - yt-dlp - gimp - - # - # Other - # - keepassxc - # # Style # @@ -172,10 +157,6 @@ # integrate ssh-agent from gnome keyring export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh - yt-audio() { - nix-shell -p yt-dlp --run "yt-dlp -x $1 --audio-format mp3" - } - # Better Unix Aliases alias ls="lsd" alias l="lsd --almost-all --long" @@ -195,39 +176,12 @@ # Stylix handles Qt and GTK theming - # Noctalia has built-in night light, so wlsunset is disabled via noctalia module - # services.wlsunset = { - # enable = true; - # sunrise = "07:00"; - # sunset = "17:00"; - # temperature.night = 3500; - # }; - - services.kdeconnect = { - enable = true; - indicator = true; - }; - # Enable bluetooth headphone controls services.mpris-proxy.enable = true; - # Noctalia replaces SwayOSD and SwayNC - disabled via noctalia module - # services.swayosd = { - # enable = true; - # topMargin = 0.9; - # }; - # services.swaync = { - # enable = true; - # settings = { - # positionX = "center"; - # positionY = "top"; - # notification-window-width = 800; - # }; - # }; - # Git autosync for Documents services.git-autosync = { - enable = true; + enable = false; repos.documents = { path = "/home/${userName}/Documents"; gitName = fullName; diff --git a/jaci/modules/niri/niri_conf.nix b/jaci/modules/niri/niri_conf.nix index 67235e7..df73326 100644 --- a/jaci/modules/niri/niri_conf.nix +++ b/jaci/modules/niri/niri_conf.nix @@ -68,26 +68,18 @@ in [ bash egl-wayland - # foot is in programs.nix for Stylix theming git glib # gsettings gnome-software # GUI app store for Flatpak grim - kanshi libnotify lxqt.lxqt-policykit nautilus - networkmanagerapplet - nwg-drawer - pavucontrol slurp swaylock - swayosd syncthingtray unstable.ghostty unstable.xwayland-satellite - # waybar is in programs.nix for Stylix theming - wdisplays wl-clipboard # wofi is in programs.nix for Stylix theming xdg-utils @@ -118,7 +110,6 @@ in }; }; }; - programs.kdeconnect.enable = true; programs.niri.enable = true; programs.regreet.enable = true; programs.xfconf.enable = true; @@ -133,14 +124,6 @@ in terminal = "ghostty"; }; - services.syncthing = { - enable = true; - dataDir = "/home/${config.niriwm.user}/.syncthing"; - openDefaultPorts = true; - user = config.niriwm.user; - }; - systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true"; # Don't create default ~/Sync folder - # Set zsh as the default shell system-wide users.defaultUserShell = pkgs.zsh; environment.shells = with pkgs; [ @@ -151,7 +134,7 @@ in ### ## Services ### - services.blueman.enable = true; + # services.blueman.enable = true; # Noctalia handles bluetooth services.gvfs.enable = true; # file manager mount, trash, etc services.tumbler.enable = true; # thumbnails services.openssh.enable = true; @@ -160,9 +143,6 @@ in services.flatpak.enable = true; services.usbmuxd.enable = false; - # For yubioath desktop - services.pcscd.enable = true; - # Printing services.printing = { enable = true; @@ -240,13 +220,5 @@ in enable = true; brscan5.enable = true; }; - - # - # udev rules - # - services.udev.extraRules = '' - # For ddcutil monitor controls - KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660" - ''; }; } diff --git a/jaci/modules/niri/niri_home.nix b/jaci/modules/niri/niri_home.nix index 3330693..57c5d19 100644 --- a/jaci/modules/niri/niri_home.nix +++ b/jaci/modules/niri/niri_home.nix @@ -43,7 +43,7 @@ libnotify swaynotificationcenter # Tray Applets - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol syncthingtray tailscale-systray diff --git a/nate-work/desktop-configuration.nix b/nate-work/desktop-configuration.nix index 3d6fa2a..ec68ea1 100644 --- a/nate-work/desktop-configuration.nix +++ b/nate-work/desktop-configuration.nix @@ -32,6 +32,7 @@ in modules/hypr/hyprland.nix modules/niri/niri_conf.nix ../shared/modules/system/power_manager.nix + ../shared/modules/system/noctalia-system.nix ../shared/modules/services/motu-m4-combined.nix # ../shared/modules/services/theme_switcher/default.nix # inputs.nur.hmModules.nur @@ -72,8 +73,12 @@ in power_manager = { enable = true; + backend = "power-profiles-daemon"; # Required for Noctalia power profile widget }; + # Enable Noctalia shell system services + noctaliaSystem.enable = true; + main_user = { enable = true; userName = deskCfg.userName; diff --git a/nate-work/linked-dotfiles/niri/config.kdl b/nate-work/linked-dotfiles/niri/config.kdl index 24d766f..958020e 100644 --- a/nate-work/linked-dotfiles/niri/config.kdl +++ b/nate-work/linked-dotfiles/niri/config.kdl @@ -2,16 +2,12 @@ // MISCELLANEOUS // -// gui startup -spawn-at-startup "swaybg" "-i" "/home/nate/nixos/nate-work/wallpaper.png" "-m" "fill" -spawn-at-startup "waybar" +// gui startup - Noctalia handles bar, notifications, wallpaper, wifi, and bluetooth spawn-at-startup "keepassxc" spawn-at-startup "flatpak" "run" "org.signal.Signal" // shell startup spawn-sh-at-startup "kanshi" -spawn-sh-at-startup "sleep 5 && nm-applet --indicator" spawn-sh-at-startup "sleep 5 && syncthingtray --wait" -spawn-sh-at-startup "sleep 5 && swaync" screenshot-path null // save screenshots just to clipboard prefer-no-csd // (Client Side Decorations) ask clients to not add their own decorations @@ -215,8 +211,8 @@ binds { // Terminal - consistent with sway/hyprland Mod+Return { spawn "ghostty"; } - // Application launcher - consistent with sway/hyprland - Mod+D { spawn "wofi" "--show" "drun"; } + // Application launcher - Noctalia launcher + Mod+D { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; } // File manager - consistent with sway/hyprland Mod+T { spawn "nautilus"; } @@ -335,8 +331,8 @@ binds { // Utilities // - // Notifications - Mod+Shift+C { spawn-sh "swaync-client --toggle-panel"; } + // Notifications - Noctalia notification panel + Mod+Shift+C { spawn "noctalia-shell" "ipc" "call" "notificationHistory" "toggle"; } // Screenshots - consistent with sway/hyprland Mod+P { screenshot; } @@ -347,11 +343,11 @@ binds { Ctrl+Print { screenshot-screen; } Alt+Print { screenshot-window; } - // Volume control - XF86AudioRaiseVolume { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "+5%"; } - XF86AudioLowerVolume { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "-5%"; } - XF86AudioMute { spawn "pactl" "set-sink-mute" "@DEFAULT_SINK@" "toggle"; } - XF86AudioMicMute { spawn "pactl" "set-source-mute" "@DEFAULT_SOURCE@" "toggle"; } + // Volume control (via Noctalia) + XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "increase"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "decrease"; } + XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteOutput"; } + XF86AudioMicMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteInput"; } // Media control XF86AudioPlay { spawn "playerctl" "play-pause"; } @@ -360,13 +356,18 @@ binds { XF86AudioPrev { spawn "playerctl" "previous"; } XF86AudioStop { spawn "playerctl" "stop"; } - // Brightness control - XF86MonBrightnessUp { spawn "brightnessctl" "set" "+5%"; } - XF86MonBrightnessDown { spawn "brightnessctl" "set" "5%-"; } + // Brightness control (via Noctalia) + XF86MonBrightnessUp { spawn "noctalia-shell" "ipc" "call" "brightness" "increase"; } + XF86MonBrightnessDown { spawn "noctalia-shell" "ipc" "call" "brightness" "decrease"; } - Mod+Shift+Q { quit; } + // Session/Power menu (via Noctalia) + Mod+Shift+Q { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } + Mod+Ctrl+Q { quit; } Mod+Shift+Ctrl+P { power-off-monitors; } + // Lock screen (via Noctalia) + Mod+L { spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; } + Mod+Shift+Ctrl+T { toggle-debug-tint; } } diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix index bfd22cc..9b28e43 100644 --- a/nate-work/modules/home-manager/home.nix +++ b/nate-work/modules/home-manager/home.nix @@ -12,6 +12,7 @@ ../../../shared/modules/apps/helix.nix ../../../shared/modules/home-manager/programs.nix ../../../shared/modules/home-manager/git-autosync.nix + ../../../shared/modules/home-manager/noctalia.nix ../niri/niri_home.nix ../vpn-proxy/vpn-proxy.nix ]; @@ -50,6 +51,16 @@ homePackages = []; }; + # Enable Noctalia shell (replaces Waybar, SwayNC, SwayOSD, wlsunset) + noctaliaShell = { + enable = true; + barPosition = "top"; + darkMode = true; + useWallpaperColors = true; # Generate colors from wallpaper + locationName = "Denver"; + avatarImage = "/home/${userName}/.face"; + }; + # Additional user packages # Note: Programs with Stylix theming are in shared modules home.packages = with pkgs; [ diff --git a/nate-work/modules/niri/niri_conf.nix b/nate-work/modules/niri/niri_conf.nix index 8e38a88..4927ee1 100644 --- a/nate-work/modules/niri/niri_conf.nix +++ b/nate-work/modules/niri/niri_conf.nix @@ -64,7 +64,7 @@ man-pages-posix nbfc-linux nautilus - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol slurp syncthingtray @@ -160,7 +160,7 @@ boot.initrd.supportedFilesystems = { nfs = true; }; users.groups.libvirtd.members = ["nate"]; - services.blueman.enable = true; + # services.blueman.enable = true; # Noctalia handles bluetooth services.gvfs.enable = true; # file manager mount, trash, etc services.tumbler.enable = true; # thunar thumbnails services.openssh.enable = true; diff --git a/nate-work/modules/niri/niri_home.nix b/nate-work/modules/niri/niri_home.nix index 0949962..e24f418 100644 --- a/nate-work/modules/niri/niri_home.nix +++ b/nate-work/modules/niri/niri_home.nix @@ -43,7 +43,7 @@ libnotify swaynotificationcenter # Tray Applets - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol syncthingtray tailscale-systray diff --git a/nate/desktop-configuration.nix b/nate/desktop-configuration.nix index 3dd512e..af7af6e 100644 --- a/nate/desktop-configuration.nix +++ b/nate/desktop-configuration.nix @@ -31,6 +31,8 @@ in modules/sway/sway_conf.nix modules/niri/niri_conf.nix ../shared/modules/services/motu-m4-combined.nix + ../shared/modules/system/power_manager.nix + ../shared/modules/system/noctalia-system.nix ]; config = { @@ -86,6 +88,14 @@ in latencyMs = 10; }; + power_manager = { + enable = true; + backend = "power-profiles-daemon"; # Required for Noctalia power profile widget + }; + + # Enable Noctalia shell system services + noctaliaSystem.enable = true; + system.stateVersion = "23.11"; # Did you read the comment? }; } diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix index 67d46fc..6d3e437 100644 --- a/nate/modules/home-manager/home.nix +++ b/nate/modules/home-manager/home.nix @@ -12,6 +12,7 @@ ../../../shared/modules/apps/helix.nix ../../../shared/modules/home-manager/programs.nix ../../../shared/modules/home-manager/git-autosync.nix + ../../../shared/modules/home-manager/noctalia.nix ../niri/niri_home.nix ]; @@ -46,6 +47,16 @@ homePackages = []; }; + # Enable Noctalia shell (replaces Waybar, SwayNC, SwayOSD, wlsunset) + noctaliaShell = { + enable = true; + barPosition = "top"; + darkMode = true; + useWallpaperColors = true; # Generate colors from wallpaper + locationName = "Denver"; + avatarImage = "/home/${userName}/.face"; + }; + # Additional user packages # Note: Programs with Stylix theming are in shared modules home.packages = with pkgs; [ @@ -161,21 +172,19 @@ # Enable bluetooth headphone controls services.mpris-proxy.enable = true; - # SwayOSD - on-screen display for volume, brightness, caps lock - services.swayosd = { - enable = true; - topMargin = 0.9; - }; - - # SwayNC - notification center (Stylix auto-themes this) - services.swaync = { - enable = true; - settings = { - positionX = "center"; - positionY = "top"; - notification-window-width = 800; - }; - }; + # Noctalia replaces SwayOSD and SwayNC - disabled via noctalia module + # services.swayosd = { + # enable = true; + # topMargin = 0.9; + # }; + # services.swaync = { + # enable = true; + # settings = { + # positionX = "center"; + # positionY = "top"; + # notification-window-width = 800; + # }; + # }; home.sessionVariables = { EDITOR = "hx"; @@ -258,10 +267,11 @@ # Stylix handles Qt and GTK theming - services.wlsunset = { - enable = true; - sunrise = "07:00"; - sunset = "17:00"; - temperature.night = 3500; - }; + # Noctalia has built-in night light, so wlsunset is disabled via noctalia module + # services.wlsunset = { + # enable = true; + # sunrise = "07:00"; + # sunset = "17:00"; + # temperature.night = 3500; + # }; } diff --git a/nate/modules/niri/niri_conf.nix b/nate/modules/niri/niri_conf.nix index eecf11f..f1b7de9 100644 --- a/nate/modules/niri/niri_conf.nix +++ b/nate/modules/niri/niri_conf.nix @@ -78,7 +78,7 @@ in man-pages man-pages-posix nautilus - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol slurp swaylock @@ -155,7 +155,7 @@ in ### ## Services ### - services.blueman.enable = true; + # services.blueman.enable = true; # Noctalia handles bluetooth services.gvfs.enable = true; # file manager mount, trash, etc services.tumbler.enable = true; # thunar thumbnails services.openssh.enable = true; diff --git a/nate/modules/niri/niri_home.nix b/nate/modules/niri/niri_home.nix index 8d06e8a..8f00f0c 100644 --- a/nate/modules/niri/niri_home.nix +++ b/nate/modules/niri/niri_home.nix @@ -43,7 +43,7 @@ libnotify swaynotificationcenter # Tray Applets - networkmanagerapplet + # networkmanagerapplet # Noctalia handles wifi pavucontrol syncthingtray tailscale-systray