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

42
flake.lock generated
View file

@ -226,11 +226,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1773456096, "lastModified": 1773802295,
"narHash": "sha256-vlV3HnHBxnfW4a2ifabH3L/3iGGjA5ejEP7XD7EOC+E=", "narHash": "sha256-luPLLgS8VR2fHo3xT04KbJm0RU2wep6SDh3smwF8e5E=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "ce7440a5fced512773e8e695d8a7bd57f33c7e6d", "rev": "41870283e080c46a6d33b6c3b3923e90348254c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +257,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1773646010, "lastModified": 1773734432,
"narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +273,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1773610124, "lastModified": 1773705440,
"narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=", "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9fe1300f4360e13f39d6d1d006e54fd5093e9ad5", "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,11 +313,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773670009, "lastModified": 1773777742,
"narHash": "sha256-LEiA7ntxR6Biep4fgD2Jh9bB1g2olRNAToFUS51szDs=", "narHash": "sha256-3lluT9/nXWmv3yV3orSuMMgmj25wbOxy76mJzvqN/w0=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "9511f1fce45ffe763d7954f3207e3dfd644c97f2", "rev": "d9ae5e617f7f512ac7732c5cfb2538d1ae2fa594",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,11 +356,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773687088, "lastModified": 1773821291,
"narHash": "sha256-c1ZOH4ePnmutpIqZlLeXHA35/LJjKj7c5XqNJ+c4UVc=", "narHash": "sha256-iHmzt6YBzcBAj+Z+A0Fcb1gyPzRJjwFZI1vngUrjxtY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ac0f3671d707d7df2fd03ff56fd4b07ad05c6842", "rev": "73c085b7083facfc4eece5487d6b5093b7922cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +377,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773687088, "lastModified": 1773821291,
"narHash": "sha256-c1ZOH4ePnmutpIqZlLeXHA35/LJjKj7c5XqNJ+c4UVc=", "narHash": "sha256-iHmzt6YBzcBAj+Z+A0Fcb1gyPzRJjwFZI1vngUrjxtY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ac0f3671d707d7df2fd03ff56fd4b07ad05c6842", "rev": "73c085b7083facfc4eece5487d6b5093b7922cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +449,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1772296853, "lastModified": 1773792048,
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

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

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

@ -1,26 +1,17 @@
{ pkgs, repoRoot, lib, ... }: { pkgs, repoRoot, lib, ... }:
let let
commands = import ../../../../lib/commands.nix { inherit pkgs; }; commands = import ../../../../lib/commands.nix { inherit pkgs; };
inherit (commands) uwsm lock term notify nag dmenu espanso; inherit (commands) uwsm lock term notify nag dmenu espanso key_mod key_mod_misc key_left key_right key_up key_down;
key_mod = "Mod4";
key_mod_misc = "Alt";
key_left = "Left";
key_right = "Right";
key_up = "Up";
key_down = "Down";
in in
{ {
imports = [ imports = [
./gtk.nix ./gtk.nix
./xdg.nix ./xdg.nix
./shells/noctalia.nix ./shells/default.nix
../../programs/foot.nix ../../programs/foot.nix
../../programs/qutebrowser.nix ../../programs/qutebrowser.nix
../../programs/swaylock.nix
../../services/espanso.nix ../../services/espanso.nix
../../services/gnome-keyring.nix ../../services/gnome-keyring.nix
../../services/swayidle.nix
]; ];
wayland.windowManager.sway = { 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 = [ imports = [
../../../programs/rofi.nix ../../../programs/rofi.nix
../../../programs/waybar.nix ../../../programs/waybar.nix
../../../programs/swaylock.nix
../../../services/swayidle.nix
../../../services/mako.nix ../../../services/mako.nix
]; ];
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
startup = [ startup = [
{ command = "${uwsm} swaybg -m fill -i /home/alisceon/Pictures/system/bg.png"; } { command = "${uwsm} swaybg -m fill -i /home/alisceon/Pictures/system/bg.png"; }
]; ];
}; keybindings = {
keybindings = { "${key_mod}+L" = "exec ${lock}";
"${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}+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}+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";
"${key_mod}+d" = "exec ${uwsm} ${dmenu} -show drun"; "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%";
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +3%"; "XF86AudioLowerVolume" = "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";
"XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle"; "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 9"; "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3";
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 3"; "XF86AudioPlay" = "exec playerctl play-pause";
"XF86AudioPlay" = "exec playerctl play-pause"; };
}; };
} }

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

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

8
lib/commands.nix
View file

@ -14,4 +14,12 @@ in
espanso = "${pkgs.espanso-wayland}/bin/espanso cmd"; espanso = "${pkgs.espanso-wayland}/bin/espanso cmd";
display = status: "${swaymsg} 'output * power ${status}'"; 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 } # end file

6
nixos/hosts/electra/configuration.nix
View file

@ -17,6 +17,7 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.bluetui pkgs.bluetui
pkgs.wakeonlan pkgs.wakeonlan
pkgs.samba
]; ];
systemd.services.fprintd = { systemd.services.fprintd = {
@ -33,6 +34,11 @@
tuned.enable = true; tuned.enable = true;
}; };
hardware.graphics = {
enable = true;
enable32Bit = true;
};
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;