alisceon/nixos_config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert to waybar, fix imports, improve modularity

Browse source
This commit is contained in:
alisceon 2026-03-18 09:49:43 +01:00
parent 55d0a4254e
commit 0db4955f41
7 changed files with 61 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/modules/programs/noctalia.nix
View file

@ -37,7 +37,7 @@
"id" = "weather-card";
enabled = false;
}
]
];
};
bar = {
density = "compact";

13
home/modules/wm/sway/default.nix
View file

@ -1,26 +1,17 @@
{ pkgs, repoRoot, lib, ... }:
let
commands = import ../../../../lib/commands.nix { inherit pkgs; };
inherit (commands) uwsm lock term notify nag dmenu espanso;
key_mod = "Mod4";
key_mod_misc = "Alt";
key_left = "Left";
key_right = "Right";
key_up = "Up";
key_down = "Down";
inherit (commands) uwsm lock term notify nag dmenu espanso key_mod key_mod_misc key_left key_right key_up key_down;
in
{
imports = [
./gtk.nix
./xdg.nix
./shells/noctalia.nix
./shells/default.nix
../../programs/foot.nix
../../programs/qutebrowser.nix
../../programs/swaylock.nix
../../services/espanso.nix
../../services/gnome-keyring.nix
../../services/swayidle.nix
];
wayland.windowManager.sway = {

34
home/modules/wm/sway/shells/default.nix
View file

@ -1,27 +1,31 @@
{ ... }:
{ pkgs, ... }:
let
commands = import ../../../../../lib/commands.nix { inherit pkgs; };
inherit (commands) uwsm lock term notify nag dmenu espanso key_mod;
in
{
commands = import ../../../../lib/commands.nix { inherit pkgs; };
inherit (commands) uwsm lock term notify nag dmenu espanso;
imports = [
../../../programs/rofi.nix
../../../programs/waybar.nix
../../../programs/swaylock.nix
../../../services/swayidle.nix
../../../services/mako.nix
];
wayland.windowManager.sway.config = {
startup = [
{ command = "${uwsm} swaybg -m fill -i /home/alisceon/Pictures/system/bg.png"; }
];
};
keybindings = {
"${key_mod}+L" = "exec ${lock}";
"${key_mod}+Escape" = "exec ${nag} -m 'Shutdown options:' -Z 'Power Off' 'systemctl poweroff' -Z 'Reboot' 'systemctl reboot' -Z 'Logout' 'swaymsg exit'";
"${key_mod}+Backspace" = "exec ${nag} -m 'TuneD profiles:' -Z 'Performance' 'tuned-adm profile accelerator-performance' -Z 'Balanced' 'tuned-adm profile balanced' -Z 'Power Save' 'tuned-adm profile powersave'"
"${key_mod}+d" = "exec ${uwsm} ${dmenu} -show drun";
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%";
"XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -3%";
"XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9";
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3";
"XF86AudioPlay" = "exec playerctl play-pause";
keybindings = {
"${key_mod}+L" = "exec ${lock}";
"${key_mod}+Escape" = "exec ${nag} -m 'Shutdown options:' -Z 'Power Off' 'systemctl poweroff' -Z 'Reboot' 'systemctl reboot' -Z 'Logout' 'swaymsg exit'";
"${key_mod}+Backspace" = "exec ${nag} -m 'TuneD profiles:' -Z 'Performance' 'tuned-adm profile accelerator-performance' -Z 'Balanced' 'tuned-adm profile balanced' -Z 'Power Save' 'tuned-adm profile powersave'";
"${key_mod}+d" = "exec ${uwsm} ${dmenu} -show drun";
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%";
"XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -3%";
"XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9";
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3";
"XF86AudioPlay" = "exec playerctl play-pause";
};
};
}

6
home/modules/wm/sway/shells/noctalia.nix
View file

@ -1,5 +1,7 @@
{ ... }:
{ pkgs, ... }:
let
commands = import ../../../../../lib/commands.nix { inherit pkgs; };
inherit (commands) uwsm lock term notify nag dmenu espanso key_mod;
ipc = "noctalia-shell ipc call";
in
{
@ -7,7 +9,7 @@ in
../../../programs/noctalia.nix
];
wayland.windowManager.sway.config.keybindings = {
"Mod4+d" = "exec ${ipc} launcher toggle";
"${key_mod}+d" = "exec ${ipc} launcher toggle";
"XF86AudioRaiseVolume" = "exec ${ipc} volume increase";
"XF86AudioLowerVolume" = "exec ${ipc} volume decrease";
"XF86AudioMute" = "exec ${ipc} volume muteOutput";