diff --git a/home-manager/default.nix b/home-manager/default.nix index ab0956b..127b73c 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -3,7 +3,7 @@ let home-manager = (import ../nix/sources.nix).home-manager; unstable = import {}; - fontSize = hiDPI : if hiDPI then 14 else 8; + fontSize = hiDPI : if hiDPI then "FiraCode:size=14" else "FiraCode:size=8"; in { imports = [ @@ -93,6 +93,7 @@ in mako sway-contrib.grimshot albert + foot wofi unzip whois @@ -287,26 +288,35 @@ in # Enable blueman-applet when the machine has bluetooth enabled services.blueman-applet.enable = config.hardware.bluetooth.enable == true; - programs.kitty = { + programs.foot = { enable = true; - theme = "Argonaut"; - environment = { - "TERM" = "xterm-256color"; - }; - font = { - name = "Fira Code"; - size = fontSize config.my.highDPI; - }; settings = { - disable_ligatures = "always"; - scrollback_lines = 50000; - detect_urls = true; - url_color = "#0087bd"; - url_style = "curly"; - copy_on_select = "clipboard"; - confirm_os_window_close = 0; - background_opacity = "0.98"; - enable_audio_bell = "no"; + main = { + term = "xterm-256color"; + font = fontSize config.my.highDPI; + }; + scrollback = { lines = 100000; }; + colors = { + alpha = "0.98"; + foreground = "B3B1AD"; + background = "0A0E14"; + regular0 = "01060E"; + regular1 = "EA6C73"; + regular2 = "91B362"; + regular3 = "F9AF4F"; + regular4 = "53BDFA"; + regular5 = "FAE994"; + regular6 = "90E1C6"; + regular7 = "C7C7C7"; + bright0 = "686868"; + bright1 = "F07178"; + bright2 = "C2D94C"; + bright3 = "FFB454"; + bright4 = "59C2FF"; + bright5 = "FFEE99"; + bright6 = "95E6CB"; + bright7 = "FFFFFF"; + }; }; }; diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix index 7128d81..c26e881 100644 --- a/home-manager/modules/sway.nix +++ b/home-manager/modules/sway.nix @@ -38,7 +38,7 @@ in gaps = { inner = 8; }; window.border = 0; workspaceAutoBackAndForth = true; - terminal = "kitty"; + terminal = "foot"; bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; @@ -61,9 +61,8 @@ in playerctl = "${pkgs.playerctl}/bin/playerctl"; in { - "${mod}+Return" = "exec kitty"; + "${mod}+Return" = "exec foot"; "${mod}+p" = "exec ${pkgs.wofi}/bin/wofi --show drun"; - "${mod}+Shift+p" = "exec ${pkgs.albert}/bin/albert toggle"; "${mod}+Shift+c" = "reload"; "${mod}+Shift+q" = "kill";