unexplrd/nixos-blueprint
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run "statix fix"

Browse Source 
hosts/dunamis/sops.nix: fix w/ statix
hosts/dunamis/users/user/home-configuration.nix: fix w/ statix
hosts/eldrid/users/user/home-configuration.nix: fix w/ statix
modules/home/desktop/gnome/default.nix: fix w/ statix
modules/home/desktop/hyprland/default.nix: fix w/ statix
modules/home/desktop/niri/default.nix: add swayosd, move bar to the bottom, fix w/ statix
modules/nixos/system/security/basic.nix: fix w/ statix

Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
unexplrd
2025-03-29 14:30:34 +02:00
parent ab6611a231
commit a83068d010
7 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/dunamis/sops.nix
View File

@ -1,5 +1,4 @@
{inputs, ...}: let {inputs, ...}: {
in {
imports = with inputs; [ imports = with inputs; [
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];

2
hosts/dunamis/users/user/home-configuration.nix
View File

@ -11,7 +11,7 @@
./flatpak.nix ./flatpak.nix
]; ];
home = { home = {
stateVersion = osConfig.system.stateVersion; inherit (osConfig.system) stateVersion;
sessionPath = ["$HOME/.local/bin"]; sessionPath = ["$HOME/.local/bin"];
}; };

2
hosts/eldrid/users/user/home-configuration.nix
View File

@ -11,7 +11,7 @@
./flatpak.nix ./flatpak.nix
]; ];
home = { home = {
stateVersion = osConfig.system.stateVersion; inherit (osConfig.system) stateVersion;
sessionPath = ["$HOME/.local/bin"]; sessionPath = ["$HOME/.local/bin"];
}; };

2
modules/home/desktop/gnome/default.nix
View File

@ -6,7 +6,7 @@
}: }:
with lib; let with lib; let
cfg = config.desktop.gnome; cfg = config.desktop.gnome;
colors = config.lib.stylix.colors; inherit (config.lib.stylix) colors;
in { in {
options = { options = {
desktop.gnome.enable = desktop.gnome.enable =

2
modules/home/desktop/hyprland/default.nix
View File

@ -9,7 +9,7 @@
cfg = config.desktop.hyprland; cfg = config.desktop.hyprland;
hostname = osConfig.networking.hostName; hostname = osConfig.networking.hostName;
cursor_size = config.stylix.cursor.size; cursor_size = config.stylix.cursor.size;
colors = config.lib.stylix.colors; inherit (config.lib.stylix) colors;
keyboard = keyboard =
if hostname == "eldrid" if hostname == "eldrid"
then "chromeos" then "chromeos"

38
modules/home/desktop/niri/default.nix
View File

@ -8,7 +8,7 @@
cfg = config.desktop.niri; cfg = config.desktop.niri;
hostname = osConfig.networking.hostName; hostname = osConfig.networking.hostName;
cursor_size = config.stylix.cursor.size; cursor_size = config.stylix.cursor.size;
colors = config.lib.stylix.colors; inherit (config.lib.stylix) colors;
keyboard = keyboard =
if hostname == "eldrid" if hostname == "eldrid"
then "chromeos" then "chromeos"
@ -33,10 +33,14 @@ in {
qt.enable = false; qt.enable = false;
}; };
services = { services = {
wpaperd.enable = true;
playerctld.enable = true;
network-manager-applet.enable = true;
copyq.enable = true; copyq.enable = true;
network-manager-applet.enable = true;
playerctld.enable = true;
swayosd = {
enable = true;
topMargin = 0.8;
};
wpaperd.enable = true;
gnome-keyring = { gnome-keyring = {
enable = true; enable = true;
components = ["secrets"]; components = ["secrets"];
@ -384,7 +388,6 @@ in {
niri = { niri = {
target = "niri/config.kdl"; target = "niri/config.kdl";
text = let text = let
cursor_size = toString config.stylix.cursor.size;
left = "n"; left = "n";
down = "e"; down = "e";
up = "i"; up = "i";
@ -460,7 +463,7 @@ in {
cursor { cursor {
xcursor-theme "${config.stylix.cursor.name}" xcursor-theme "${config.stylix.cursor.name}"
xcursor-size ${cursor_size} xcursor-size ${toString cursor_size}
} }
layout { layout {
@ -635,10 +638,15 @@ in {
Ctrl+Print { screenshot-screen; } Ctrl+Print { screenshot-screen; }
Shift+Print { screenshot-window; } Shift+Print { screenshot-window; }
XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "-l" "1.0" "@DEFAULT_AUDIO_SINK@" "5%+"; } Caps_Lock { spawn "swayosd-client" "--caps-lock"; }
XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "-l" "1.0" "@DEFAULT_AUDIO_SINK@" "5%-"; } // XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "-l" "1.0" "@DEFAULT_AUDIO_SINK@" "5%+"; }
XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } // XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "-l" "1.0" "@DEFAULT_AUDIO_SINK@" "5%-"; }
XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } // XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
// XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; }
XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "lower"; }
XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume" "mute-toggle"; }
XF86AudioMicMute allow-when-locked=true { spawn "swayosd-client" "--input-volume" "mute-toggle"; }
XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; }
XF86AudioPause allow-when-locked=true { spawn "playerctl" "pause"; } XF86AudioPause allow-when-locked=true { spawn "playerctl" "pause"; }
XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; }
@ -1144,7 +1152,7 @@ in {
settings = { settings = {
bar-0 = { bar-0 = {
# layer = "top"; # layer = "top";
position = "top"; position = "bottom";
height = 32; height = 32;
spacing = 4; spacing = 4;
margin-left = 63; margin-left = 63;
@ -1355,10 +1363,10 @@ in {
.mpris.paused, .mpris.paused,
.modules-left, .modules-left,
.modules-right { .modules-right {
border-bottom-left-radius: 12px; border-top-left-radius: 12px;
border-bottom-right-radius: 12px; border-top-right-radius: 12px;
border-top-left-radius: 0px; border-bottom-left-radius: 0px;
border-top-right-radius: 0px; border-bottom-right-radius: 0px;
background-color: @base00; background-color: @base00;
color: @base05; color: @base05;
padding: 0 0.5em; padding: 0 0.5em;

2
modules/nixos/system/security/basic.nix
View File

@ -40,7 +40,7 @@ in {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(mkIf (config.security.doas.enable) doas-sudo-shim) # if doas install doas sudo shim (mkIf config.security.doas.enable doas-sudo-shim) # if doas install doas sudo shim
]; ];
services.dbus = { services.dbus = {