From 0db4955f41a23429a2d1e7a9242b62a9172ec126 Mon Sep 17 00:00:00 2001 From: alisceon Date: Wed, 18 Mar 2026 09:49:43 +0100 Subject: [PATCH] revert to waybar, fix imports, improve modularity --- flake.lock | 42 ++++++++++++------------ home/modules/programs/noctalia.nix | 2 +- home/modules/wm/sway/default.nix | 13 ++------ home/modules/wm/sway/shells/default.nix | 34 ++++++++++--------- home/modules/wm/sway/shells/noctalia.nix | 6 ++-- lib/commands.nix | 8 +++++ nixos/hosts/electra/configuration.nix | 6 ++++ 7 files changed, 61 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 013e9aa..2ee1941 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1773456096, - "narHash": "sha256-vlV3HnHBxnfW4a2ifabH3L/3iGGjA5ejEP7XD7EOC+E=", + "lastModified": 1773802295, + "narHash": "sha256-luPLLgS8VR2fHo3xT04KbJm0RU2wep6SDh3smwF8e5E=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ce7440a5fced512773e8e695d8a7bd57f33c7e6d", + "rev": "41870283e080c46a6d33b6c3b3923e90348254c3", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1773646010, - "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773610124, - "narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=", + "lastModified": 1773705440, + "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fe1300f4360e13f39d6d1d006e54fd5093e9ad5", + "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1773670009, - "narHash": "sha256-LEiA7ntxR6Biep4fgD2Jh9bB1g2olRNAToFUS51szDs=", + "lastModified": 1773777742, + "narHash": "sha256-3lluT9/nXWmv3yV3orSuMMgmj25wbOxy76mJzvqN/w0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9511f1fce45ffe763d7954f3207e3dfd644c97f2", + "rev": "d9ae5e617f7f512ac7732c5cfb2538d1ae2fa594", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1773687088, - "narHash": "sha256-c1ZOH4ePnmutpIqZlLeXHA35/LJjKj7c5XqNJ+c4UVc=", + "lastModified": 1773821291, + "narHash": "sha256-iHmzt6YBzcBAj+Z+A0Fcb1gyPzRJjwFZI1vngUrjxtY=", "owner": "nix-community", "repo": "NUR", - "rev": "ac0f3671d707d7df2fd03ff56fd4b07ad05c6842", + "rev": "73c085b7083facfc4eece5487d6b5093b7922cf8", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1773687088, - "narHash": "sha256-c1ZOH4ePnmutpIqZlLeXHA35/LJjKj7c5XqNJ+c4UVc=", + "lastModified": 1773821291, + "narHash": "sha256-iHmzt6YBzcBAj+Z+A0Fcb1gyPzRJjwFZI1vngUrjxtY=", "owner": "nix-community", "repo": "NUR", - "rev": "ac0f3671d707d7df2fd03ff56fd4b07ad05c6842", + "rev": "73c085b7083facfc4eece5487d6b5093b7922cf8", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1773792048, + "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", "owner": "danth", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", "type": "github" }, "original": { diff --git a/home/modules/programs/noctalia.nix b/home/modules/programs/noctalia.nix index f3e8e27..3cbaad5 100644 --- a/home/modules/programs/noctalia.nix +++ b/home/modules/programs/noctalia.nix @@ -37,7 +37,7 @@ "id" = "weather-card"; enabled = false; } - ] + ]; }; bar = { density = "compact"; diff --git a/home/modules/wm/sway/default.nix b/home/modules/wm/sway/default.nix index b7e954e..55e1db4 100644 --- a/home/modules/wm/sway/default.nix +++ b/home/modules/wm/sway/default.nix @@ -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 = { diff --git a/home/modules/wm/sway/shells/default.nix b/home/modules/wm/sway/shells/default.nix index 653e0f1..c463034 100644 --- a/home/modules/wm/sway/shells/default.nix +++ b/home/modules/wm/sway/shells/default.nix @@ -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"; + }; }; } diff --git a/home/modules/wm/sway/shells/noctalia.nix b/home/modules/wm/sway/shells/noctalia.nix index c946b7e..3ffc813 100644 --- a/home/modules/wm/sway/shells/noctalia.nix +++ b/home/modules/wm/sway/shells/noctalia.nix @@ -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"; diff --git a/lib/commands.nix b/lib/commands.nix index dbb543f..7e766f4 100644 --- a/lib/commands.nix +++ b/lib/commands.nix @@ -14,4 +14,12 @@ in espanso = "${pkgs.espanso-wayland}/bin/espanso cmd"; display = status: "${swaymsg} 'output * power ${status}'"; + + #Keys + key_mod = "Mod4"; + key_mod_misc = "Alt"; + key_left = "Left"; + key_right = "Right"; + key_up = "Up"; + key_down = "Down"; } # end file diff --git a/nixos/hosts/electra/configuration.nix b/nixos/hosts/electra/configuration.nix index 6de485a..601f85b 100644 --- a/nixos/hosts/electra/configuration.nix +++ b/nixos/hosts/electra/configuration.nix @@ -17,6 +17,7 @@ environment.systemPackages = [ pkgs.bluetui pkgs.wakeonlan + pkgs.samba ]; systemd.services.fprintd = { @@ -33,6 +34,11 @@ tuned.enable = true; }; + hardware.graphics = { + enable = true; + enable32Bit = true; + }; + hardware.bluetooth = { enable = true; powerOnBoot = true;