diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index a63dbdf..82c231c 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -6,8 +6,6 @@ input { } } -spawn-at-startup "/home/ari/.config/niri/startup.sh" - environment { QT_QPA_PLATFORM "wayland" QT_WAYLAND_DISABLE_WINDOWDECORATION "1" @@ -60,7 +58,17 @@ output "Dell Inc. DELL SE3223Q 1WDWKK3" { layout { gaps 8 center-focused-column "never" - tab-indicator + tab-indicator { + width 8 + gap 8 + length total-proportion=1.0 + hide-when-single-tab + position "top" + place-within-column + } + shadow { + on + } preset-column-widths { proportion 0.33333 proportion 0.5 @@ -69,9 +77,17 @@ layout { default-column-width { proportion 0.5; } focus-ring { width 4 - active-color "#7fc8ff" + active-gradient from="#f00f" to="#0f05" angle=45 in="oklch longer hue" inactive-color "#505050" } + border { + off + } +} +prefer-no-csd +window-rule { + geometry-corner-radius 6 + tiled-state true } // ========================= @@ -189,7 +205,6 @@ binds { workspace "chat" { open-on-output "eDP-1" } -spawn-at-startup "slack" window-rule { match app-id=r#"^Slack$"# match app-id=r#"^signal$"# diff --git a/hosts/extra/fwbook/wallpaper.gif b/hosts/extra/fwbook/wallpaper.gif new file mode 100644 index 0000000..5a54534 Binary files /dev/null and b/hosts/extra/fwbook/wallpaper.gif differ diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 6863f14..6a31305 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -2,6 +2,7 @@ { pkgs, ... }: let zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; + backgroundImage = builtins.filterSource (p: t: true) ./extra/fwbook/wallpaper.gif; zshFunctions = zshFWBook + "/functions.sh"; openPorts = [ 8000 @@ -35,6 +36,10 @@ in enable = true; hyprland.enable = false; niri.enable = true; + background = { + enable = true; + imagePath = backgroundImage; + }; }; }; }; diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index 9906247..cdc5695 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -6,6 +6,7 @@ in imports = [ ./hyprland.nix ./niri.nix + ./swww.nix ]; options = { skyg.nixos.desktop.tiler = { @@ -13,37 +14,38 @@ in "Enable libraries for tiling window managers"; }; }; - config = lib.mkIf cfg.enable { - users.users.${config.skyg.user.name} = { - extraGroups = [ - "input" + config = lib.mkIf cfg.enable + { + users.users.${config.skyg.user.name} = { + extraGroups = [ + "input" + ]; + }; + # services.blueman.enable = true; + programs.nm-applet.enable = true; + environment.systemPackages = with pkgs; [ + # Protocols and libraries + xwayland-satellite + libnotify + # Notifications + mako + wofi + rofi + rofi-wayland + # Control Tools + pavucontrol + brightnessctl + networkmanagerapplet + blueman + # Apps + fuzzel + waybar + nwg-bar + # Screen capture and recording tools + grim + slurp + satty + wf-recorder ]; }; - # services.blueman.enable = true; - # programs.nm-applet.enable = true; - environment.systemPackages = with pkgs; [ - # Protocols and libraries - xwayland-satellite - libnotify - # Notifications - mako - wofi - rofi - rofi-wayland - # Control Tools - pavucontrol - brightnessctl - networkmanagerapplet - blueman - # Apps - fuzzel - waybar - nwg-bar - # Screen capture and recording tools - grim - slurp - satty - wf-recorder - ]; - }; } diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 0d057e7..f682219 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -1,14 +1,21 @@ { config, lib, pkgs, skygUtils, ... }: let cfg = config.skyg.nixos.desktop.tiler.niri; - makeNiriSystemdService = { description, script }: { - inherit description script; + makeNiriSystemdService = { description, script, path ? [ ] }: { + inherit description script path; enable = true; requires = [ "niri.service" ]; reloadIfChanged = true; restartIfChanged = true; after = [ "niri.service" ]; partOf = [ "niri.service" ]; + bindsTo = [ "niri.service" ]; + wants = [ "niri.service" ]; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + }; }; in { @@ -30,28 +37,30 @@ in filePath = "niri"; configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; }; - systemd.user.services.niri-waybar-top = makeNiriSystemdService { + systemd.user.services.niri-waybar = makeNiriSystemdService { description = "Niri's Top Waybar"; + path = [ pkgs.nwg-bar pkgs.niri ]; script = '' ${pkgs.waybar}/bin/waybar \ --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-config.jsonc \ - --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/style.css - ''; - }; - systemd.user.services.niri-waybar-bottom = makeNiriSystemdService { - description = "Niri's Bottom Waybar"; - script = '' + --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/style.css & ${pkgs.waybar}/bin/waybar \ --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-config.jsonc \ --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/style.css ''; }; - systemd.user.services.niri-xwayland-satellite = makeNiriSystemdService { + systemd.user.services.niri-xwayland = makeNiriSystemdService { description = "Niri's xwayland-satellite"; script = '' ${pkgs.xwayland-satellite}/bin/xwayland-satellite ''; }; + systemd.user.services.niri-hypridle = makeNiriSystemdService { + description = "Niri's hypridle"; + script = '' + ${pkgs.hypridle}/bin/hypridle + ''; + }; }; } diff --git a/modules/nixos/desktop/tiler/swww.nix b/modules/nixos/desktop/tiler/swww.nix new file mode 100644 index 0000000..780f5b1 --- /dev/null +++ b/modules/nixos/desktop/tiler/swww.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.nixos.desktop.tiler; +in +{ + options = { + skyg.nixos.desktop.tiler.background = { + enable = lib.mkEnableOption + "Enable background management for tiling window managers"; + imagePath = lib.mkOption { + type = lib.types.path; + description = "Path to the background image for tiling window managers."; + }; + }; + }; + config = lib.mkIf cfg.background.enable { + environment.systemPackages = with pkgs; [ + swww + waytrogen + ]; + systemd.user.services.swww = { + description = "SWWW Background Manager"; + path = [ pkgs.swww ]; + script = '' + ${pkgs.swww}/bin/swww-daemon & + ${pkgs.swww}/bin/swww img ${cfg.background.imagePath} --resize no + ''; + wantedBy = [ "graphical-session.target" ]; + }; + }; +}