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 --- nix/programs/firefox.nix | 4 +- nix/programs/foot.nix | 39 ++++++------ nix/programs/kitty.nix | 67 +++++++++---------- nix/programs/nvim.nix | 2 +- nix/programs/sway.nix | 163 ++++++++++++++++++++++++----------------------- 5 files changed, 139 insertions(+), 136 deletions(-) (limited to 'nix/programs') diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix index 404c3a6..da5aa09 100644 --- a/nix/programs/firefox.nix +++ b/nix/programs/firefox.nix @@ -19,8 +19,8 @@ in { source = (pkgs.fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; - rev = "d8a440226dc9030cb793db4562132d8166fcc904"; - hash = "sha256-knaPVGni+v431hidyJ/HOKITFzQs0PaxuainC603jjo="; + rev = "a1795946debb5f21dfa5d328a6f1b68984f810fc"; + hash = "sha256-CoGE9+8oVnnOOTStPQ9C87gp0C6vgf0tN3ls7MuKZiE="; }); }; home.file."customChrome.css" = { diff --git a/nix/programs/foot.nix b/nix/programs/foot.nix index 9cc9fa9..5c85ce7 100644 --- a/nix/programs/foot.nix +++ b/nix/programs/foot.nix @@ -1,6 +1,7 @@ { config, pkgs, ... }: let - s = config.local; + loc = config.local; + colo = loc.scheme; in { environment.sessionVariables = { TERMINAL = "${pkgs.foot}/bin/footclient"; @@ -14,24 +15,24 @@ in { font = "${s.font.name}:size=${toString s.font.size}"; }; colors = { - foreground = "${s.scheme.foreground}"; - background = "${s.scheme.background}"; - regular0 = "${s.scheme.color0}"; - regular1 = "${s.scheme.color1}"; - regular2 = "${s.scheme.color2}"; - regular3 = "${s.scheme.color3}"; - regular4 = "${s.scheme.color4}"; - regular5 = "${s.scheme.color5}"; - regular6 = "${s.scheme.color6}"; - regular7 = "${s.scheme.color7}"; - bright0 = "${s.scheme.color8}"; - bright1 = "${s.scheme.color9}"; - bright2 = "${s.scheme.color10}"; - bright3 = "${s.scheme.color11}"; - bright4 = "${s.scheme.color12}"; - bright5 = "${s.scheme.color13}"; - bright6 = "${s.scheme.color14}"; - bright7 = "${s.scheme.color15}"; + foreground = "${colo.foreground}"; + background = "${colo.background}"; + regular0 = "${colo.color0}"; + regular1 = "${colo.color1}"; + regular2 = "${colo.color2}"; + regular3 = "${colo.color3}"; + regular4 = "${colo.color4}"; + regular5 = "${colo.color5}"; + regular6 = "${colo.color6}"; + regular7 = "${colo.color7}"; + bright0 = "${colo.color8}"; + bright1 = "${colo.color9}"; + bright2 = "${colo.color10}"; + bright3 = "${colo.color11}"; + bright4 = "${colo.color12}"; + bright5 = "${colo.color13}"; + bright6 = "${colo.color14}"; + bright7 = "${colo.color15}"; alpha = "1.0"; }; }; diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix index e3238eb..5f0c91b 100644 --- a/nix/programs/kitty.nix +++ b/nix/programs/kitty.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let - s = config.local; + loc = config.local; + colo = loc.scheme; in { environment.sessionVariables = { TERMINAL = "${pkgs.kitty}/bin/kitty -1"; @@ -9,8 +10,8 @@ in { programs.kitty = { enable = true; font = { - name = s.font.name; - size = s.font.size; + name = loc.font.name; + size = loc.font.size; }; shellIntegration = { mode = "enabled"; @@ -20,7 +21,7 @@ in { shell ${pkgs.bashInteractive}/bin/bash --login update_check_interval 0 confirm_os_window_close 0 - sync_to_monitor yes + sync_to_monitor no allow_remote_control yes linux_display_server wayland remember_window_size no @@ -29,41 +30,41 @@ in { scrollback_lines 3000 paste_actions confirm,confirm-if-large disable_ligatures always - modify_font baseline ${toString s.font.baseline} - cursor #${s.scheme.foreground} + modify_font baseline ${toString loc.font.baseline} + cursor #${colo.foreground} cursor_shape block #cursor_blink_interval -1 linear ease-out #cursor_stop_blinking_after 20.0 cursor_trail 35 cursor_trail_decay 0.1 0.5 cursor_trail_start_threshold 2 - foreground #${s.scheme.foreground} - background #${s.scheme.background} - color0 #${s.scheme.color0} - color1 #${s.scheme.color1} - color2 #${s.scheme.color2} - color3 #${s.scheme.color3} - color4 #${s.scheme.color4} - color5 #${s.scheme.color5} - color6 #${s.scheme.color6} - color7 #${s.scheme.color7} - color8 #${s.scheme.color8} - color9 #${s.scheme.color9} - color10 #${s.scheme.color10} - color11 #${s.scheme.color11} - color12 #${s.scheme.color12} - color13 #${s.scheme.color13} - color14 #${s.scheme.color14} - color15 #${s.scheme.color15} - selection_foreground #${s.scheme.background} - selection_background #${s.scheme.color6} - mark1_foreground #${s.scheme.background} - mark1_background #${s.scheme.color5} - mark2_foreground #${s.scheme.background} - mark2_background #${s.scheme.color6} - mark3_foreground #${s.scheme.background} - mark3_background #${s.scheme.color4} - background_opacity ${toString s.scheme.alpha} + foreground #${colo.foreground} + background #${colo.background} + color0 #${colo.color0} + color1 #${colo.color1} + color2 #${colo.color2} + color3 #${colo.color3} + color4 #${colo.color4} + color5 #${colo.color5} + color6 #${colo.color6} + color7 #${colo.color7} + color8 #${colo.color8} + color9 #${colo.color9} + color10 #${colo.color10} + color11 #${colo.color11} + color12 #${colo.color12} + color13 #${colo.color13} + color14 #${colo.color14} + color15 #${colo.color15} + selection_foreground #${colo.background} + selection_background #${colo.color6} + mark1_foreground #${colo.background} + mark1_background #${colo.color5} + mark2_foreground #${colo.background} + mark2_background #${colo.color6} + mark3_foreground #${colo.background} + mark3_background #${colo.color4} + background_opacity ${toString colo.alpha} ''; }; wayland.windowManager.sway = { diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix index fb779e4..5ff902f 100644 --- a/nix/programs/nvim.nix +++ b/nix/programs/nvim.nix @@ -61,7 +61,7 @@ let hi ModeMsg guifg=#${colo.color4} hi MoreMsg guifg=#${colo.color2} hi NonText guifg=#${colo.color6} - hi NormalFloat guibg=#${colo.background} + hi NormalFloat guibg=#${colo.color4} hi Pmenu guibg=#${colo.color4} hi PmenuThumb guibg=#${colo.color5} hi PmenuSel guibg=#${colo.color3} diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix index 863a8ef..49efdf6 100644 --- a/nix/programs/sway.nix +++ b/nix/programs/sway.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let - s = config.local; + loc = config.local; + colo = loc.scheme; in { services.xserver.videoDrivers = [ "modesetting" ]; programs.sway = { @@ -54,82 +55,82 @@ in { home.sessionVariables = { XDG_CURRENT_DESKTOP = "sway"; MOZ_ENABLE_WAYLAND = "1"; - #SDL_VIDEODRIVER = "wayland"; + SDL_VIDEODRIVER = "wayland"; GDK_BACKEND = "wayland,x11"; QT_QPA_PLATFORM = "wayland;xcb"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; _JAVA_AWT_WM_NONREPARENTING = "1"; }; xresources.properties = { - "*background" = "#${s.scheme.background}"; - "*foreground" = "#${s.scheme.foreground}"; - "*color0" = "#${s.scheme.color0}"; - "*color1" = "#${s.scheme.color1}"; - "*color2" = "#${s.scheme.color2}"; - "*color3" = "#${s.scheme.color3}"; - "*color4" = "#${s.scheme.color4}"; - "*color5" = "#${s.scheme.color5}"; - "*color6" = "#${s.scheme.color6}"; - "*color7" = "#${s.scheme.color7}"; - "*color8" = "#${s.scheme.color8}"; - "*color9" = "#${s.scheme.color9}"; - "*color10" = "#${s.scheme.color10}"; - "*color11" = "#${s.scheme.color11}"; - "*color12" = "#${s.scheme.color12}"; - "*color13" = "#${s.scheme.color13}"; - "*color14" = "#${s.scheme.color14}"; - "*color15" = "#${s.scheme.color15}"; + "*background" = "#${colo.background}"; + "*foreground" = "#${colo.foreground}"; + "*color0" = "#${colo.color0}"; + "*color1" = "#${colo.color1}"; + "*color2" = "#${colo.color2}"; + "*color3" = "#${colo.color3}"; + "*color4" = "#${colo.color4}"; + "*color5" = "#${colo.color5}"; + "*color6" = "#${colo.color6}"; + "*color7" = "#${colo.color7}"; + "*color8" = "#${colo.color8}"; + "*color9" = "#${colo.color9}"; + "*color10" = "#${colo.color10}"; + "*color11" = "#${colo.color11}"; + "*color12" = "#${colo.color12}"; + "*color13" = "#${colo.color13}"; + "*color14" = "#${colo.color14}"; + "*color15" = "#${colo.color15}"; }; gtk = let # *_shade_color is adjusted from black by default. extraCss3 = '' - @define-color window_bg_color #${s.scheme.background}; - @define-color window_fg_color #${s.scheme.foreground}; - @define-color view_bg_color #${s.scheme.background}; - @define-color view_fg_color #${s.scheme.foreground}; - @define-color accent_bg_color #${s.scheme.color4}; - @define-color accent_fg_color #${s.scheme.background}; - @define-color accent_color #${s.scheme.color4}; - @define-color headerbar_bg_color #${s.scheme.background}; - @define-color headerbar_fg_color #${s.scheme.foreground}; - @define-color headerbar_backdrop_color #${s.scheme.background}; - @define-color headerbar_border_color #${s.scheme.color6}; - @define-color secondary_headerbar_bg_color #${s.scheme.background}; - @define-color secondary_headerbar_fg_color #${s.scheme.foreground}; - @define-color secondary_headerbar_backdrop_color #${s.scheme.background}; - @define-color secondary_headerbar_border_color #${s.scheme.color5}; - @define-color thumbnail_bg_color #${s.scheme.background}; - @define-color thumbnail_fg_color #${s.scheme.foreground}; - @define-color card_bg_color #${s.scheme.background}; - @define-color card_fg_color #${s.scheme.foreground}; - @define-color popover_bg_color #${s.scheme.background}; - @define-color popover_fg_color #${s.scheme.foreground}; - @define-color dialog_bg_color #${s.scheme.background}; - @define-color dialog_fg_color #${s.scheme.foreground}; - @define-color panel_bg_color #${s.scheme.background}; - @define-color panel_fg_color #${s.scheme.foreground}; - @define-color sidebar_bg_color #${s.scheme.background}; - @define-color sidebar_fg_color #${s.scheme.foreground}; - @define-color sidebar_backdrop_color #${s.scheme.background}; - @define-color warning_bg_color #${s.scheme.color4}; - @define-color warning_fg_color #${s.scheme.foreground}; - @define-color warning_color #${s.scheme.color4}; - @define-color error_bg_color #${s.scheme.color3}; - @define-color error_fg_color #${s.scheme.foreground}; - @define-color error_color #${s.scheme.color3}; - @define-color success_bg_color #${s.scheme.color2}; - @define-color success_fg_color #${s.scheme.background}; - @define-color success_color #${s.scheme.color2}; - @define-color destructive_bg_color #${s.scheme.color5}; - @define-color destructive_fg_color #${s.scheme.background}; - @define-color destructive_color #${s.scheme.color5}; + @define-color window_bg_color #${colo.background}; + @define-color window_fg_color #${colo.foreground}; + @define-color view_bg_color #${colo.background}; + @define-color view_fg_color #${colo.foreground}; + @define-color accent_bg_color #${colo.color4}; + @define-color accent_fg_color #${colo.background}; + @define-color accent_color #${colo.color4}; + @define-color headerbar_bg_color #${colo.background}; + @define-color headerbar_fg_color #${colo.foreground}; + @define-color headerbar_backdrop_color #${colo.background}; + @define-color headerbar_border_color #${colo.color6}; + @define-color secondary_headerbar_bg_color #${colo.background}; + @define-color secondary_headerbar_fg_color #${colo.foreground}; + @define-color secondary_headerbar_backdrop_color #${colo.background}; + @define-color secondary_headerbar_border_color #${colo.color5}; + @define-color thumbnail_bg_color #${colo.background}; + @define-color thumbnail_fg_color #${colo.foreground}; + @define-color card_bg_color #${colo.background}; + @define-color card_fg_color #${colo.foreground}; + @define-color popover_bg_color #${colo.background}; + @define-color popover_fg_color #${colo.foreground}; + @define-color dialog_bg_color #${colo.background}; + @define-color dialog_fg_color #${colo.foreground}; + @define-color panel_bg_color #${colo.background}; + @define-color panel_fg_color #${colo.foreground}; + @define-color sidebar_bg_color #${colo.background}; + @define-color sidebar_fg_color #${colo.foreground}; + @define-color sidebar_backdrop_color #${colo.background}; + @define-color warning_bg_color #${colo.color4}; + @define-color warning_fg_color #${colo.foreground}; + @define-color warning_color #${colo.color4}; + @define-color error_bg_color #${colo.color3}; + @define-color error_fg_color #${colo.foreground}; + @define-color error_color #${colo.color3}; + @define-color success_bg_color #${colo.color2}; + @define-color success_fg_color #${colo.background}; + @define-color success_color #${colo.color2}; + @define-color destructive_bg_color #${colo.color5}; + @define-color destructive_fg_color #${colo.background}; + @define-color destructive_color #${colo.color5}; ''; extraCss4 = '' ''; in { enable = true; theme = { - name = "adw-gtk3" + (if s.scheme.lightness == "light" then "" else "-dark"); + name = "adw-gtk3" + (if colo.lightness == "light" then "" else "-dark"); package = pkgs.adw-gtk3; }; cursorTheme = { @@ -156,12 +157,12 @@ in { settings = { "" = { edge = "top"; - font = "${s.ui-font.name} ${toString s.ui-font.size}"; - background = "${s.scheme.background}"; - border = "${s.scheme.background}"; - text = "${s.scheme.foreground}"; - button-text = "${s.scheme.foreground}"; - button-background = "${s.scheme.color6}"; + font = "${loc.ui-font.name} ${toString loc.ui-font.size}"; + background = "${colo.background}"; + border = "${colo.background}"; + text = "${colo.foreground}"; + button-text = "${colo.foreground}"; + button-background = "${colo.color6}"; message-padding = 5; border-bottom-size = 1; details-border-size = 1; @@ -211,7 +212,7 @@ in { scroll_button = "276"; }; "1386:890:Wacom_One_by_Wacom_S_Pen" = { - map_to_output = s.monitors.monitor1; + map_to_output = loc.monitors.monitor1; left_handed = "enabled"; }; }; @@ -259,9 +260,9 @@ in { }; }; fonts = { - names = [ s.ui-font.name ]; + names = [ loc.ui-font.name ]; style = "Regular"; - size = s.ui-font.size + 0.0; + size = loc.ui-font.size + 0.0; }; bars = [ ]; window = { @@ -269,7 +270,8 @@ in { titlebar = false; commands = [ { command = "move to scratchpad"; criteria.app_id = "kitty-server"; } - { command = "max_render_time 1"; criteria.app_id = "kitty"; } + #{ command = "max_render_time 1"; criteria.app_id = "kitty"; } + { command = "allow_tearing yes"; criteria.app_id = "kitty"; } { command = "inhibit_idle fullscreen; floating enable; max_render_time 1; allow_tearing yes"; criteria.app_id = "cmv"; } { command = "floating enable"; criteria.class = "cmv.exe"; } { command = "floating enable"; criteria.app_id = "mauri"; } @@ -281,7 +283,6 @@ in { { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = "cs2"; } { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.class = "Minecraft*"; } { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.title = "Overwatch"; } - { command = "allow_tearing yes"; criteria.title = "vkcube"; } { command = "inhibit_idle fullscreen"; criteria.class = "Ryujinx"; } { command = "inhibit_idle fullscreen"; criteria.app_id = "org.yuzu_emu.yuzu"; } { command = "inhibit_idle fullscreen"; criteria.class = "dolphin-emu"; } @@ -290,10 +291,10 @@ in { ]; }; colors = let - bg = "#${s.scheme.background}"; - fg = "#${s.scheme.foreground}"; - ch = "#${s.scheme.color4}"; - urgent = "#${s.scheme.color1}"; + bg = "#${colo.background}"; + fg = "#${colo.foreground}"; + ch = "#${colo.color4}"; + urgent = "#${colo.color1}"; in { background = bg; focused = { background = bg; border = ch; childBorder = ch; indicator = ch; text = fg; }; @@ -305,7 +306,7 @@ in { startup = let gnome-schema = "org.gnome.desktop.interface"; in [ - { command = "dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-${s.scheme.lightness}'\""; always = true; } + { command = "dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-${colo.lightness}'\""; always = true; } { command = "dbus-sway-environment"; } { command = "swaymsg 'seat * hide_cursor 4000'"; always = true; } { command = "kitty -1 --class=\"kitty-server\""; } @@ -326,10 +327,10 @@ in { services.mako = { enable = true; defaultTimeout = 14000; - font = "${s.font.name} ${toString s.ui-font.size}"; - backgroundColor = "#${s.scheme.background}"; - textColor = "#${s.scheme.foreground}"; - borderColor = "#${s.scheme.color6}"; + font = "${loc.font.name} ${toString loc.ui-font.size}"; + backgroundColor = "#${colo.background}"; + textColor = "#${colo.foreground}"; + borderColor = "#${colo.color6}"; }; }; } -- cgit v1.2.3-101-g0448