This commit is contained in:
ari committed 2025-07-29 13:58:56 -04:00
1 parent 2afcdabfc9
commit 0dc1199ae9
7 files changed
+71 -35

No files matched your search

+2 -2
View File
@@ -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; }
+5 -3
View File
@@ -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 = {
+1 -3
View File
@@ -11,9 +11,7 @@ in
./packages.nix
./crypto.nix
./gnome.nix
./tiler.nix
./hyprland.nix
./niri.nix
./tiler
];
options = {
-25
View File
@@ -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";
};
};
}
@@ -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
@@ -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";
};
+57
View File
@@ -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
'';
};
};
}