From ea99f31ff0dd6d34687b63e233d68a318bc9b605 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 1 Oct 2023 11:51:00 +0000 Subject: modules/windowing: switch from alacritty to foot I've already been contributing to foot for Spectrum, it doesn't require a GPU, and it has working emoji. --- modules/workstation/windowing/alacritty/config.yml | 114 --------------------- .../workstation/windowing/alacritty/default.nix | 11 -- modules/workstation/windowing/default.nix | 2 +- modules/workstation/windowing/foot/default.nix | 7 ++ modules/workstation/windowing/foot/foot.ini | 2 + modules/workstation/windowing/sway/config.in | 2 +- overlays/personal/choose/choose.in | 2 +- 7 files changed, 12 insertions(+), 128 deletions(-) delete mode 100644 modules/workstation/windowing/alacritty/config.yml delete mode 100644 modules/workstation/windowing/alacritty/default.nix create mode 100644 modules/workstation/windowing/foot/default.nix create mode 100644 modules/workstation/windowing/foot/foot.ini diff --git a/modules/workstation/windowing/alacritty/config.yml b/modules/workstation/windowing/alacritty/config.yml deleted file mode 100644 index 856a7aa5af29..000000000000 --- a/modules/workstation/windowing/alacritty/config.yml +++ /dev/null @@ -1,114 +0,0 @@ -window: - # If both are `0`, this setting is ignored. - dimensions: - columns: 80 - lines: 24 - - padding: - x: 2 - y: 2 - - dynamic_padding: true - decorations: none - opacity: 0.8 - startup_mode: Windowed - -scrolling: - history: 0 # disabled - -font: - normal: - family: monospace - #style: Regular - - bold: - family: monospace - #style: Bold - - italic: - family: monospace - #style: Italic - - offset: - x: 0 - y: 0 - - size: 11.5 - - glyph_offset: - x: 0 - y: 0 - -draw_bold_text_with_bright_colors: false - -colors: - primary: - background: '0x000000' - foreground: '0xffffff' - # dim_foreground: auto - # bright_foreground: normal foreground color - - cursor: - text: '0x161616' - cursor: '0xfcdc07' - - normal: - black: '0x2e3436' - red: '0xb40000' - green: '0x307000' - yellow: '0xce5c00' - blue: '0x3465a4' - magenta: '0x75507b' - cyan: '0x06989a' - white: '0xd3d7cf' - - bright: - black: '0x555753' - red: '0xcc0000' - green: '0x4e9a06' - yellow: '0xedd400' - blue: '0x729fcf' - magenta: '0xad7fa8' - cyan: '0x34e2e2' - white: '0xeeeeec' - - # dim: default - # indexed_colors: default - -hints: - enabled: [] - -# Available fields: -# - mouse -# - action -# - mods (optional) -# -# Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# All available `mods` and `action` values are documented in the key binding -# section. -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -mouse: - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - hide_when_typing: false - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - - # When set to `true`, selected text will be copied to both the primary and - # the selection clipboard. Otherwise, it will only be copied to the selection - # clipboard. - save_to_clipboard: false - -cursor: - style: Block - unfocused_hollow: true - -live_config_reload: true diff --git a/modules/workstation/windowing/alacritty/default.nix b/modules/workstation/windowing/alacritty/default.nix deleted file mode 100644 index e8d086f54d8c..000000000000 --- a/modules/workstation/windowing/alacritty/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ ../../../xdg ]; - - environment.systemPackages = with pkgs; - lib.optional (!stdenv.isDarwin) alacritty; - - users.users.qyliss.xdg.config.paths."alacritty/alacritty.yml" = - pkgs.copyPathToStore ./config.yml; -} diff --git a/modules/workstation/windowing/default.nix b/modules/workstation/windowing/default.nix index af8ca84fdd42..2723861bdb4f 100644 --- a/modules/workstation/windowing/default.nix +++ b/modules/workstation/windowing/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./alacritty ./firefox ./gtk ./sway + ./firefox ./foot ./gtk ./sway ]; environment.systemPackages = with pkgs; [ diff --git a/modules/workstation/windowing/foot/default.nix b/modules/workstation/windowing/foot/default.nix new file mode 100644 index 000000000000..5c66f18eb03f --- /dev/null +++ b/modules/workstation/windowing/foot/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + users.users.qyliss.xdg.config.paths."foot/foot.ini" = ./foot.ini; + + environment.systemPackages = with pkgs; [ foot ]; +} diff --git a/modules/workstation/windowing/foot/foot.ini b/modules/workstation/windowing/foot/foot.ini new file mode 100644 index 000000000000..d041f42bceac --- /dev/null +++ b/modules/workstation/windowing/foot/foot.ini @@ -0,0 +1,2 @@ +[main] +font = monospace:size=12 diff --git a/modules/workstation/windowing/sway/config.in b/modules/workstation/windowing/sway/config.in index d59bdaa28db5..52efc1fa90e3 100644 --- a/modules/workstation/windowing/sway/config.in +++ b/modules/workstation/windowing/sway/config.in @@ -37,7 +37,7 @@ for_window [title="(Firefox|Nightly) . Sharing Indicator"] { input * natural_scroll enabled -bindsym $mod+Return exec alacritty +bindsym $mod+Return exec foot bindsym $mod+backslash exec firefox bindsym $mod+BackSpace kill bindsym $mod+d exec swaymsg exec "$(choosebin --tiebreak=begin,length,index)" diff --git a/overlays/personal/choose/choose.in b/overlays/personal/choose/choose.in index 7f60b47386a3..1fc2b7f91c2a 100644 --- a/overlays/personal/choose/choose.in +++ b/overlays/personal/choose/choose.in @@ -4,7 +4,7 @@ define -s fzf_opts "--reverse" ifelse { importas -i _ DISPLAY } { - alacritty --class float -e + foot -a float getpid my_pid importas -i -u my_pid my_pid backtick -i -n term_pid { awk "{print $4}" /proc/${my_pid}/stat } -- cgit 1.4.1