From 0dc1199ae99f657b659d41ba7e6cddb669ece000 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 29 Jul 2025 13:58:56 -0400 Subject: [PATCH] clean up --- configs/niri/config.kdl | 4 +- hosts/fwbook.nix | 8 ++- modules/nixos/desktop/default.nix | 4 +- modules/nixos/desktop/niri.nix | 25 -------- .../desktop/{tiler.nix => tiler/default.nix} | 4 ++ .../nixos/desktop/{ => tiler}/hyprland.nix | 4 +- modules/nixos/desktop/tiler/niri.nix | 57 +++++++++++++++++++ 7 files changed, 71 insertions(+), 35 deletions(-) delete mode 100644 modules/nixos/desktop/niri.nix rename modules/nixos/desktop/{tiler.nix => tiler/default.nix} (94%) rename modules/nixos/desktop/{ => tiler}/hyprland.nix (89%) create mode 100644 modules/nixos/desktop/tiler/niri.nix diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index bbb5a3d..a63dbdf 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -173,8 +173,8 @@ binds { Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - Print { spawn "grim" "-g" "\"$(slurp)\"" "-" "|" "satty" "-f" "-"; } - Mod+P { spawn "grim" "-g" "\"$(slurp)\"" "-" "|" "satty" "-f" "-"; } + Print { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; } + Mod+P { spawn "sh" "-c" "grim -g \"$(slurp)\" - | satty -f -"; } Mod+R { spawn "/home/ari/.config/niri/screen-record.sh"; } Ctrl+Alt+Delete { quit; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 7518b4f..6863f14 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -31,9 +31,11 @@ in kde.enable = false; crypto.enable = true; gnome.enable = true; - tiler.enable = true; - hyprland.enable = false; - niri.enable = true; + tiler = { + enable = true; + hyprland.enable = false; + niri.enable = true; + }; }; }; networkDrives = { diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 607d1b6..f1d7ccc 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -11,9 +11,7 @@ in ./packages.nix ./crypto.nix ./gnome.nix - ./tiler.nix - ./hyprland.nix - ./niri.nix + ./tiler ]; options = { diff --git a/modules/nixos/desktop/niri.nix b/modules/nixos/desktop/niri.nix deleted file mode 100644 index 5be431e..0000000 --- a/modules/nixos/desktop/niri.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, pkgs, skygUtils, ... }: -let - cfg = config.skyg.nixos.desktop.niri; -in -{ - options = { - skyg.nixos.desktop.niri = { - enable = lib.mkEnableOption - "niri"; - }; - }; - config = lib.mkIf cfg.enable { - skyg.nixos.desktop.tiler.enable = true; - programs.niri = { - enable = true; - }; - environment.systemPackages = with pkgs; [ - hypridle - ]; - system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { - filePath = "niri"; - configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; - }; - }; -} diff --git a/modules/nixos/desktop/tiler.nix b/modules/nixos/desktop/tiler/default.nix similarity index 94% rename from modules/nixos/desktop/tiler.nix rename to modules/nixos/desktop/tiler/default.nix index caa4ba7..9906247 100644 --- a/modules/nixos/desktop/tiler.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -3,6 +3,10 @@ let cfg = config.skyg.nixos.desktop.tiler; in { + imports = [ + ./hyprland.nix + ./niri.nix + ]; options = { skyg.nixos.desktop.tiler = { enable = lib.mkEnableOption diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix similarity index 89% rename from modules/nixos/desktop/hyprland.nix rename to modules/nixos/desktop/tiler/hyprland.nix index e21bbc4..5b6c51b 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - cfg = config.skyg.nixos.desktop.hyprland; + cfg = config.skyg.nixos.desktop.tiler.hyprland; hypr-plugin-dir = pkgs.symlinkJoin { name = "hyrpland-plugins"; paths = with pkgs.hyprlandPlugins; [ @@ -12,7 +12,7 @@ let in { options = { - skyg.nixos.desktop.hyprland = { + skyg.nixos.desktop.tiler.hyprland = { enable = lib.mkEnableOption "hyprland"; }; diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix new file mode 100644 index 0000000..0d057e7 --- /dev/null +++ b/modules/nixos/desktop/tiler/niri.nix @@ -0,0 +1,57 @@ +{ config, lib, pkgs, skygUtils, ... }: +let + cfg = config.skyg.nixos.desktop.tiler.niri; + makeNiriSystemdService = { description, script }: { + inherit description script; + enable = true; + requires = [ "niri.service" ]; + reloadIfChanged = true; + restartIfChanged = true; + after = [ "niri.service" ]; + partOf = [ "niri.service" ]; + }; +in +{ + options = { + skyg.nixos.desktop.tiler.niri = { + enable = lib.mkEnableOption + "niri"; + }; + }; + config = lib.mkIf cfg.enable { + skyg.nixos.desktop.tiler.enable = true; + programs.niri = { + enable = true; + }; + environment.systemPackages = with pkgs; [ + hypridle + ]; + system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { + filePath = "niri"; + configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; + }; + systemd.user.services.niri-waybar-top = makeNiriSystemdService { + description = "Niri's Top Waybar"; + 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 = '' + ${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 { + description = "Niri's xwayland-satellite"; + script = '' + ${pkgs.xwayland-satellite}/bin/xwayland-satellite + ''; + }; + }; +} +