From 56d74ee6b8ba7ac9572814f556891e86525f7663 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 31 Mar 2025 13:18:59 -0400 Subject: Experiment with "as needed" packages and cleanup --- hosts/sofue/configuration.nix | 75 +++++++++++++++++++++------------------ hosts/sofue/programs.nix | 42 +++++++++++----------- hosts/yashinoki/configuration.nix | 27 +++++++------- hosts/yashinoki/programs.nix | 13 +++---- 4 files changed, 85 insertions(+), 72 deletions(-) (limited to 'hosts') diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix index 02c0ce7..929f6a2 100644 --- a/hosts/sofue/configuration.nix +++ b/hosts/sofue/configuration.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, modulesPath, ... }: let - s = config.local; + loc = config.local; + colo = loc.scheme; inherit (import ../../nix/settings.nix) disks; in rec { imports = [ @@ -8,7 +9,6 @@ in rec { ../../nix/system.nix ../../nix/x86.nix ../../nix/user.nix - ../../nix/audio.nix ../../nix/bluetooth.nix ../../nix/email.nix ../../nix/amdgpu.nix @@ -133,12 +133,14 @@ in rec { (pkgs.writeShellScriptBin "run-sway" '' export TTY=/dev/tty3 export XDG_VTNR=3 - export WLR_RENDERER=vulkan + export WLR_RENDERER=gles2 export PULSE_SERVER=unix:/home/andrew/.pulsewire-native-socket export PIPEWIRE_REMOTE=/tmp/pipewire-0-manager cd $HOME exec ${pkgs.kbd}/bin/openvt --switch --login --console 3 -f -- ${pkgs.sway}/bin/sway '') + pipewire # Using server from host. + pavucontrol ]; systemd.services.copy-udev = { @@ -157,17 +159,21 @@ in rec { in { programs.kitty = { extraConfig = '' - repaint_delay 5 - input_delay 2 + repaint_delay 4 + input_delay 1 ''; }; - wayland.windowManager.sway = { + wayland.windowManager.sway = let + monitor1 = loc.monitors.monitor1; + monitor2 = loc.monitors.monitor2; + monitor3 = loc.monitors.monitor3; + in { checkConfig = false; config = { output = { - "${s.monitors.monitor1}" = { + "${monitor1}" = { mode = "2560x1440@144.000Hz"; -# position = "3000 200"; + #position = "3000 200"; position = "1080 200"; allow_tearing = "yes"; max_render_time = "off"; @@ -175,33 +181,34 @@ in rec { render_bit_depth = "10"; bg = "${../../themes/spring_2025/wallpaper1.png} fit"; }; - "${s.monitors.monitor2}" = { + "${monitor2}" = { mode = "1920x1080@60.000Hz"; transform = "270"; -# position = "1920 0"; + #position = "1920 0"; position = "0 0"; - max_render_time = "6"; + allow_tearing = "yes"; + max_render_time = "off"; render_bit_depth = "10"; - bg = "#${s.scheme.background-alt} solid_color"; + bg = "#${colo.background-alt} solid_color"; }; -# "${s.monitors.monitor3}" = { -# mode = "1920x1080@60.000Hz"; -# position = "0 1000"; -# max_render_time = "6"; -# render_bit_depth = "10"; -# bg = "#${s.scheme.background-alt} solid_color"; -# }; + #"${monitor3}" = { + # mode = "1920x1080@60.000Hz"; + # position = "0 1000"; + # max_render_time = "6"; + # render_bit_depth = "10"; + # bg = "#${colo.background-alt} solid_color"; + #}; }; workspaceOutputAssign = [ - { workspace = "1"; output = "${s.monitors.monitor1}"; } - { workspace = "2"; output = "${s.monitors.monitor1}"; } - { workspace = "3"; output = "${s.monitors.monitor1}"; } - { workspace = "4"; output = "${s.monitors.monitor1}"; } - { workspace = "5"; output = "${s.monitors.monitor2}"; } - { workspace = "6"; output = "${s.monitors.monitor2}"; } - { workspace = "7"; output = "${s.monitors.monitor2}"; } - { workspace = "8"; output = "${s.monitors.monitor2}"; } - { workspace = "9"; output = "${s.monitors.monitor3}"; } + { workspace = "1"; output = "${monitor1}"; } + { workspace = "2"; output = "${monitor1}"; } + { workspace = "3"; output = "${monitor1}"; } + { workspace = "4"; output = "${monitor1}"; } + { workspace = "5"; output = "${monitor2}"; } + { workspace = "6"; output = "${monitor2}"; } + { workspace = "7"; output = "${monitor2}"; } + { workspace = "8"; output = "${monitor2}"; } + { workspace = "9"; output = "${monitor3}"; } ]; keybindings = let mod1 = "Mod1"; @@ -226,12 +233,12 @@ in rec { "${mod4}+Shift+3" = "move container to workspace 7"; "${mod4}+Shift+4" = "move container to workspace 8"; "${mod4}+Shift+5" = "move container to workspace 9"; - "${mod4}+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 90"; - "${mod4}+Shift+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 0"; - "${mod4}+F1" = "exec swaymsg -- output ${s.monitors.monitor1} bg \\#${s.scheme.background-alt} solid_color"; - "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/spring_2025/wallpaper1.png} fit"; - #"${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection"; - #"${mod4}+F2" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection"; + "${mod4}+r" = "exec swaymsg -- output ${monitor1} transform 90"; + "${mod4}+Shift+r" = "exec swaymsg -- output ${monitor1} transform 0"; + "${mod4}+F1" = "exec swaymsg -- output ${monitor1} bg \\#${colo.background-alt} solid_color"; + "${mod4}+F2" = "exec swaymsg -- output ${monitor1} bg ${../../themes/spring_2025/wallpaper1.png} fit"; + #"${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${monitor1}/selection"; + #"${mod4}+F2" = "exec printf '||' > $HOME/.config/taro/${monitor1}/selection"; "Pause" = "exec $HOME/c/camu/scripts/cmv_add.sh PAUSE"; }; startup = [ diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix index 72bb4e8..c47f9c1 100644 --- a/hosts/sofue/programs.nix +++ b/hosts/sofue/programs.nix @@ -1,27 +1,29 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - #gftp +{ lib, pkgs, ... }: let + inherit (import ../../nix/utils.nix) asNeeded; +in { + environment.systemPackages = with pkgs; lib.lists.flatten [ #dia - cdrtools - #ardour - #audacity - krita - #olive-editor + (asNeeded lib pkgs "gftp" ["gftp"]) + (asNeeded lib pkgs "cdrtools" ["btcflash" "cdda2mp3" "cdda2ogg" "cdda2wav" "cdrecord" "devdump" "isodebug" "isodump" "isoinfo" "isovfy" "mkhybrid" "mkisofs" "readcd" "rscsi" "scgcheck" "scgskeleton"]) + (asNeeded lib pkgs "audacity" ["audacity"]) + (asNeeded lib pkgs "krita" ["krita"]) + (asNeeded lib pkgs "olive-editor" ["olive-editor"]) yt-dlp - #chatterino2 - streamlink - megatools - #wineWowPackages.staging - #winetricks - #cabextract - #looking-glass-client - #qbittorrent - #ungoogled-chromium + (asNeeded lib pkgs "[chatterino2 streamlink]" ["chatterino2"]) + (asNeeded lib pkgs "megatools" ["megacopy" "megadf" "megadl" "megaexport" "megaget" "megals" "megamkdir" "megaput" "megareg" "megarm" "megatest" "megatools"]) + (asNeeded lib pkgs "gdown" ["gdown"]) + wineWowPackages.staging + winetricks + cabextract + (asNeeded lib pkgs "looking-glass-client" ["looking-glass-client"]) + (asNeeded lib pkgs "qbittorrent" ["qbittorrent"]) + (asNeeded lib pkgs "ungoogled-chromium" ["chromium"]) (pkgs.discord.override { withOpenASAR = true; }) - #imv - #mpv - #vlc + (asNeeded lib pkgs "imv" ["imv"]) + (asNeeded lib pkgs "mpv" ["mpv"]) + (asNeeded lib pkgs "vlc" ["vlc"]) camu + camu-devshell mauri ]; local.scripts.imports = [ diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix index 2917994..88a3674 100644 --- a/hosts/yashinoki/configuration.nix +++ b/hosts/yashinoki/configuration.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - s = config.local; + loc = config.local; inherit (import ../../nix/settings.nix) disks; in { imports = [ @@ -42,6 +42,7 @@ in { }; scheme = import ../../themes/year_of_snake/snake.nix; starter = { + top_padding = 0; picture = ../../themes/year_of_snake/splash.png; width = 64; padding = { top = -2; left = -6; text = 0; }; @@ -161,11 +162,13 @@ in { input_delay 3 ''; }; - wayland.windowManager.sway = { + wayland.windowManager.sway = let + monitor1 = loc.monitors.monitor1; + in { checkConfig = false; config = { output = { - "${s.monitors.monitor1}" = { + "${monitor1}" = { mode = "3000x2000@59.999Hz"; render_bit_depth = "10"; max_render_time = "off"; @@ -175,11 +178,11 @@ in { }; }; workspaceOutputAssign = [ - { workspace = "1"; output = "${s.monitors.monitor1}"; } - { workspace = "2"; output = "${s.monitors.monitor1}"; } - { workspace = "3"; output = "${s.monitors.monitor1}"; } - { workspace = "4"; output = "${s.monitors.monitor1}"; } - { workspace = "5"; output = "${s.monitors.monitor1}"; } + { workspace = "1"; output = "${monitor1}"; } + { workspace = "2"; output = "${monitor1}"; } + { workspace = "3"; output = "${monitor1}"; } + { workspace = "4"; output = "${monitor1}"; } + { workspace = "5"; output = "${monitor1}"; } ]; keybindings = let mod1 = "Mod1"; @@ -195,10 +198,10 @@ in { "${mod1}+Shift+3" = "move container to workspace 3"; "${mod1}+Shift+4" = "move container to workspace 4"; "${mod1}+Shift+5" = "move container to workspace 5"; - "${mod4}+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 270"; - "${mod4}+Shift+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 0"; - "${mod4}+F1" = "exec swaymsg -- output ${s.monitors.monitor1} bg \\#${s.scheme.background-alt} solid_color"; - "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/year_of_snake/wallpaper.png} fill"; + "${mod4}+r" = "exec swaymsg -- output ${monitor1} transform 270"; + "${mod4}+Shift+r" = "exec swaymsg -- output ${monitor1} transform 0"; + "${mod4}+F1" = "exec swaymsg -- output ${monitor1} bg \\#${colo.background-alt} solid_color"; + "${mod4}+F2" = "exec swaymsg -- output ${monitor1} bg ${../../themes/year_of_snake/wallpaper.png} fill"; }; }; }; diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix index 19742cd..915bb21 100644 --- a/hosts/yashinoki/programs.nix +++ b/hosts/yashinoki/programs.nix @@ -1,12 +1,13 @@ -{ pkgs, ... }: { +{ pkgs, ... }: let + inherit (import ../../nix/utils.nix) asNeeded; +in { environment.systemPackages = with pkgs; [ - krita + (asNeeded lib pkgs "krita" ["krita"]) yt-dlp - wineWowPackages.staging - winetricks - cabextract + (asNeeded lib pkgs "[wineWowPackages.staging winetricks cabextract]" ["function_grep.pl" "msidb" "msiexec" "notepad" "regedit" "regsvr32" "widl" "wine" "wine-preloader" "wine64" "wine64-preloader" "wineboot" "winebuild" "winecfg" "wineconsole" "winecpp" "winedbg" "winedump" "winefile" "wineg++" "winegcc" "winemaker" "winemine" "winepath" "wineserver" "wmc" "wrc"]) (pkgs.discord.override { withOpenASAR = true; }) - mpv + (asNeeded lib pkgs "imv" ["imv"]) + (asNeeded lib pkgs "mpv" ["mpv"]) camu ]; local.scripts.imports = [ -- cgit v1.2.3-101-g0448