clean up
This commit is contained in:
1 parent
57d6c968d9
commit
9f6ffaab98
5 files changed
+55
-41
No files matched your search
@@ -246,5 +246,10 @@ binds {
|
|||||||
Mod+Q { close-window; }
|
Mod+Q { close-window; }
|
||||||
|
|
||||||
Mod+Ctrl+P { spawn "waypaper" "--restore"; }
|
Mod+Ctrl+P { spawn "waypaper" "--restore"; }
|
||||||
|
|
||||||
|
Mod+Ctrl+W {
|
||||||
|
spawn "sh" "-c" "/home/ari/.config/niri/waybar/start-up-script.sh";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spawn-at-startup "/home/ari/.config/niri/waybar/start-up-script.sh"
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
* {
|
* {
|
||||||
font-family: "Fira Code", "SF Pro Display", sans-serif;
|
font-family: "Fira Code", "SF Pro Display", sans-serif;
|
||||||
font-size: 14px;
|
font-size: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
window#waybar {
|
window#waybar {
|
||||||
@@ -13,7 +13,8 @@ window#waybar.hidden {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* === Reset button styles === */
|
/* === Reset button styles === */
|
||||||
button {
|
|
||||||
|
/* button {
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
@@ -27,15 +28,14 @@ button:hover {
|
|||||||
border: none;
|
border: none;
|
||||||
-gtk-icon-effect: none;
|
-gtk-icon-effect: none;
|
||||||
-gtk-icon-shadow: none;
|
-gtk-icon-shadow: none;
|
||||||
}
|
} */
|
||||||
|
|
||||||
/* === Workspaces as a tray === */
|
/* === Workspaces as a tray === */
|
||||||
#workspaces {
|
/* #workspaces {
|
||||||
margin: 0 10px;
|
margin: 0 10px;
|
||||||
padding: 0 4px;
|
padding: 0 4px;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border-bottom: 2px solid rgba(255, 255, 255, 0.15);
|
border-bottom: 2px solid rgba(255, 255, 255, 0.15);
|
||||||
/* tray shelf line */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button {
|
#workspaces button {
|
||||||
@@ -57,16 +57,14 @@ button:hover {
|
|||||||
|
|
||||||
#workspaces button.urgent {
|
#workspaces button.urgent {
|
||||||
border-bottom: 2px solid #eb4d4b;
|
border-bottom: 2px solid #eb4d4b;
|
||||||
/* urgent = red underline */
|
} */
|
||||||
}
|
|
||||||
|
|
||||||
/* === Taskbar as a tray === */
|
/* === Taskbar as a tray === */
|
||||||
#taskbar {
|
/* #taskbar {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
margin: 0 10px;
|
margin: 0 10px;
|
||||||
padding: 0 4px;
|
padding: 0 4px;
|
||||||
border-bottom: 2px solid rgba(255, 255, 255, 0.15);
|
border-bottom: 2px solid rgba(255, 255, 255, 0.15);
|
||||||
/* tray shelf line */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#taskbar button {
|
#taskbar button {
|
||||||
@@ -87,4 +85,4 @@ button:hover {
|
|||||||
|
|
||||||
#taskbar button.active:hover {
|
#taskbar button.active:hover {
|
||||||
border-bottom: 2px solid rgba(255, 255, 255, 1.0);
|
border-bottom: 2px solid rgba(255, 255, 255, 1.0);
|
||||||
}
|
} */
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
"reload_style_on_change": true,
|
"reload_style_on_change": true,
|
||||||
"layer": "top",
|
"layer": "top",
|
||||||
"position": "bottom", // Waybar at bottom layer
|
"position": "bottom", // Waybar at bottom layer
|
||||||
"height": 42,
|
"height": 10,
|
||||||
"margin-top": 4,
|
"margin-top": 0,
|
||||||
"margin-bottom": 4,
|
"margin-bottom": 4,
|
||||||
"margin-left": 4,
|
"margin-left": 4,
|
||||||
"margin-right": 4,
|
"margin-right": 4,
|
||||||
|
|||||||
Executable
+7
@@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
killall -q waybar
|
||||||
|
|
||||||
|
waybar --config /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.css &
|
||||||
|
waybar --config /home/ari/nixos-setup/configs/niri/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/top-bar.css &
|
||||||
|
waypaper --restore
|
||||||
@@ -2,23 +2,27 @@
|
|||||||
let
|
let
|
||||||
cfg = config.skyg.nixos.desktop.tiler.niri;
|
cfg = config.skyg.nixos.desktop.tiler.niri;
|
||||||
makeNiriSystemdService = { description, script, path ? [ ] }: {
|
makeNiriSystemdService = { description, script, path ? [ ] }: {
|
||||||
Unit = {
|
inherit description script path;
|
||||||
Description = description;
|
enable = true;
|
||||||
After = [ "niri.service" "xdg-desktop-portal.service" ];
|
requires = [ "niri.service" ];
|
||||||
PartOf = [ "niri.service" "tray.target" ];
|
restartTriggers = [
|
||||||
BindsTo = [ "niri.service" ];
|
script
|
||||||
Wants = [ "niri.service" "xdg-desktop-portal.service" ];
|
path
|
||||||
WantedBy = [
|
];
|
||||||
"graphical-session.target"
|
reloadTriggers = [
|
||||||
# "tray.target"
|
script
|
||||||
];
|
path
|
||||||
Requires = [ "niri.service" ];
|
];
|
||||||
};
|
after = [ "niri.service" "xdg-desktop-portal.service" ];
|
||||||
Service = {
|
partOf = [ "niri.service" "tray.target" ];
|
||||||
|
bindsTo = [ "niri.service" ];
|
||||||
|
wants = [ "niri.service" "xdg-desktop-portal.service" ];
|
||||||
|
wantedBy = [ "graphical-session.target" "tray.target" ];
|
||||||
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
KillMode = "mixed";
|
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
|
ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
|
||||||
|
KillMode = "mixed";
|
||||||
ConditionEnvironment = "WAYLAND_DISPLAY";
|
ConditionEnvironment = "WAYLAND_DISPLAY";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -46,31 +50,31 @@ in
|
|||||||
filePath = "niri";
|
filePath = "niri";
|
||||||
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs";
|
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs";
|
||||||
};
|
};
|
||||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-waybar = makeNiriSystemdService {
|
# systemd.user.services.niri-waybar = makeNiriSystemdService {
|
||||||
description = "Niri's Top Waybar";
|
# description = "Niri's Top Waybar";
|
||||||
path = [ pkgs.nwg-bar pkgs.niri ];
|
# path = [ pkgs.nwg-bar pkgs.niri ];
|
||||||
script = ''
|
# script = ''
|
||||||
${pkgs.waybar}/bin/waybar \
|
# ${pkgs.waybar}/bin/waybar \
|
||||||
--config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.jsonc \
|
# --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.jsonc \
|
||||||
--style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.css &
|
# --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.css &
|
||||||
${pkgs.waybar}/bin/waybar \
|
# ${pkgs.waybar}/bin/waybar \
|
||||||
--config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.jsonc \
|
# --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.jsonc \
|
||||||
--style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css
|
# --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-xwayland = makeNiriSystemdService {
|
systemd.user.services.niri-xwayland = makeNiriSystemdService {
|
||||||
description = "Niri's xwayland-satellite";
|
description = "Niri's xwayland-satellite";
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.xwayland-satellite}/bin/xwayland-satellite
|
${pkgs.xwayland-satellite}/bin/xwayland-satellite
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-hypridle = makeNiriSystemdService {
|
systemd.user.services.niri-hypridle = makeNiriSystemdService {
|
||||||
description = "Niri's hypridle";
|
description = "Niri's hypridle";
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.hypridle}/bin/hypridle
|
${pkgs.hypridle}/bin/hypridle
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
users.users.${config.skyg.user.name}.systemd.user.services.niri-swayosd = makeNiriSystemdService {
|
systemd.user.services.niri-swayosd = makeNiriSystemdService {
|
||||||
description = "Niri's swayosd";
|
description = "Niri's swayosd";
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.swayosd}/bin/swayosd-server
|
${pkgs.swayosd}/bin/swayosd-server
|
||||||
|
|||||||
Reference in new issue
Block a user