Generalize and move configs

This commit is contained in:
Jimbo 2024-11-12 18:03:28 -05:00
parent 17f2a16f48
commit ffb1b6d541
21 changed files with 73 additions and 64 deletions

View file

@ -5,7 +5,7 @@
./programs
./services
./settings
./sway
./wms
./users
../../overlays
../../variables

View file

@ -1,29 +0,0 @@
{ pkgs, ... }:
{
wayland.windowManager.sway.config = {
bars = [ {command = "waybar";} ];
startup = [
# Scratchpads
{command = "foot -a gotop -T Gotop gotop";}
{command = "foot -a music -T Music ncmpcpp";}
{command = "foot -a sound -T Sound pulsemixer";}
{command = "easyeffects";}
# Daemons and tray apps
{command = "wl-paste -t text --watch clipman store -P";}
{command = "wl-copy";}
{command = "mako";}
{command = "sunshine";}
# Polkit agent
{command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";}
# Foreground apps
{command = "librewolf -P Misc --name=MiscBrowser";}
{command = "vesktop";}
{command = "fractal";}
{command = "thunderbird";}
];
};
}

View file

@ -0,0 +1,8 @@
{ ... }:
{
imports = [
./sway
./swaylock
./waybar
];
}

View file

@ -0,0 +1,32 @@
{ pkgs, ... }:
{
wayland.windowManager.sway.config = {
bars = [{ command = "waybar"; }];
startup = [
# Lock on startup
{ command = "swaylock"; }
# Scratchpads
{ command = "foot -a gotop -T Gotop gotop"; }
{ command = "foot -a music -T Music ncmpcpp"; }
{ command = "foot -a sound -T Sound pulsemixer"; }
{ command = "easyeffects"; }
# Daemons and tray apps
{ command = "wl-paste -t text --watch clipman store -P"; }
{ command = "wl-copy"; }
{ command = "mako"; }
{ command = "sunshine"; }
# Polkit agent
{ command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"; }
# Foreground apps
{ command = "librewolf -P Misc --name=MiscBrowser"; }
{ command = "vesktop"; }
{ command = "fractal"; }
{ command = "thunderbird"; }
];
};
}

View file

@ -1,15 +1,14 @@
{ config, pkgs, ... }:
{
imports = [
./autostart
./hardware
./theme
./hotkeys
./programs
./rules
./autostart
./waybar
./swayshot
./swaylock
./swaysleep
./theme
];
wayland.windowManager.sway = {

View file

@ -0,0 +1,10 @@
{ pkgs, config, ... }:
{
home.packages = with pkgs; [
(pkgs.writeScriptBin "swaysleep" ''
swaylock & ${pkgs.swayidle}/bin/swayidle -w \
timeout 1 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"; pkill -9 swayidle'
'')
];
}

View file

@ -41,17 +41,4 @@ in {
indicator-radius = 80;
};
};
home.packages = with pkgs; [
(pkgs.writeScriptBin "swaysleep" ''
swaylock & ${pkgs.swayidle}/bin/swayidle -w \
timeout 1 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"; pkill -9 swayidle'
'')
];
# Enable Swaylock on startup
wayland.windowManager.sway.config.startup = [
{ command = "swaylock"; }
];
}

View file

@ -1,9 +1,6 @@
{ config, pkgs, ... }:
{
imports = [
./greetd
./portals
];
imports = [ ./greetd ];
programs.sway = {
enable = config.system.desktop.enable;

View file

@ -1,13 +0,0 @@
{ config, pkgs, ... }:
{
xdg.portal = {
wlr = {
enable = config.system.desktop.enable;
settings.screencast = {
max_fps = 60;
chooser_type = "simple";
chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
};
};
};
}

View file

@ -6,6 +6,7 @@
./keyd
./libvirtd
./mpd
./portals
./ssh
./sunshine
./tlp

View file

@ -0,0 +1,6 @@
{ ... }:
{
imports = [
./wlr
];
}

View file

@ -0,0 +1,11 @@
{ config, pkgs, ... }:
{
xdg.portal.wlr = {
enable = config.system.desktop.enable;
settings.screencast = {
max_fps = 60;
chooser_type = "simple";
chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
};
};
}