Experiment with "as needed" packages and cleanup

2 files changed, 22 insertions, 18 deletions

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 = [