diff --git a/modules/programs/home/alacritty/default.nix b/modules/programs/home/alacritty/default.nix deleted file mode 100644 index b5964c1..0000000 --- a/modules/programs/home/alacritty/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, ...}: { - programs.alacritty = { - enable = true; - settings = { - window = { - padding = { - x = 5; - y = 5; - }; - }; - colors = { - bright = { - black = lib.mkForce "#504945"; - red = lib.mkForce "#fb4934"; - green = lib.mkForce "#b8bb26"; - yellow = lib.mkForce "#fabd2f"; - blue = lib.mkForce "#83a598"; - magenta = lib.mkForce "#d3869b"; - cyan = lib.mkForce "#8ec07c"; - white = lib.mkForce "#ebdbb2"; - }; - }; - }; - }; -} diff --git a/modules/programs/home/default.nix b/modules/programs/home/default.nix index c336095..9127a45 100644 --- a/modules/programs/home/default.nix +++ b/modules/programs/home/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./alacritty + ./foot ./mpv ./firefox ./git diff --git a/modules/programs/home/foot/default.nix b/modules/programs/home/foot/default.nix new file mode 100644 index 0000000..c7daef8 --- /dev/null +++ b/modules/programs/home/foot/default.nix @@ -0,0 +1,21 @@ +{ lib, ... }: { + programs.foot = { + enable = true; + settings = { + # terminal = { + # padding = "5 5"; + # }; + + colors = { + # "bright-black" = lib.mkForce "#504945"; + # "bright-red" = lib.mkForce "#fb4934"; + # "bright-green" = lib.mkForce "#b8bb26"; + # "bright-yellow" = lib.mkForce "#fabd2f"; + # "bright-blue" = lib.mkForce "#83a598"; + # "bright-magenta" = lib.mkForce "#d3869b"; + # "bright-cyan" = lib.mkForce "#8ec07c"; + # "bright-white" = lib.mkForce "#ebdbb2"; + }; + }; + }; +} diff --git a/modules/programs/home/rofi/default.nix b/modules/programs/home/rofi/default.nix index f3ad414..4170636 100644 --- a/modules/programs/home/rofi/default.nix +++ b/modules/programs/home/rofi/default.nix @@ -10,7 +10,7 @@ extraConfig = { display-drun = ""; show-icons = true; - terminal = "alacritty"; + terminal = "foot"; }; }; } diff --git a/modules/system/default.nix b/modules/system/default.nix index 2d5ff97..e387959 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -2,7 +2,6 @@ imports = [ ./user ./homemanger - ./xdg ./networking ./lact ./doas diff --git a/modules/system/xdg/default.nix b/modules/system/xdg/default.nix deleted file mode 100644 index 22ed0a1..0000000 --- a/modules/system/xdg/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - home-manager.users.joy.xdg = { - desktopEntries = { - hx = { - name = "Helix"; - exec = "alacritty -e hx %F"; - icon = "helix"; - terminal = false; - type = "Application"; - categories = ["Utility" "TextEditor"]; - mimeType = ["text/plain"]; - }; - }; - mimeApps = { - enable = true; - defaultApplications = { - "text/plain" = ["hx.desktop"]; - "image/*" = ["imv.desktop"]; - "video/*" = ["mpv.desktop"]; - }; - }; - }; -} diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index 5a5206c..8ea527b 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -68,12 +68,12 @@ bind = [ # launch Apps - "$mod,TAB, exec, alacritty" - "$mod, E, exec, alacritty -e yazi" + "$mod,TAB, exec, foot" + "$mod, E, exec, foot -e yazi" "$mod, S, exec, firefox" "$mod, X, exec, keepassxc" - "$mod, M, exec, mbsync -a && alacritty -e neomutt" - "$mod, N, exec, alacritty -e newsboat" + "$mod, M, exec, mbsync -a && foot -e neomutt" + "$mod, N, exec, foot -e newsboat" "$mod, A, exec, rofi -show drun" "$mod, F, exec, freetube" "$mod, C, exec, hyprpicker -a" @@ -83,7 +83,7 @@ "$mod, O, exec, sh $sciPath/mpv.sh" "$mod+Shift, TAB,hyprexpo:expo, toggleoverview" "$mod, B, exec, rofimoji" - "$mod, F, exec, alacritty -e hx" + "$mod, F, exec, foot -e hx" # controls "$mod, Q, killactive" "$mod, W, togglefloating" diff --git a/modules/wm/hyprland/scripts/cmus.sh b/modules/wm/hyprland/scripts/cmus.sh index d3ef502..55084b6 100755 --- a/modules/wm/hyprland/scripts/cmus.sh +++ b/modules/wm/hyprland/scripts/cmus.sh @@ -1,8 +1,8 @@ #!/bin/sh if tmux has-session -t cmus 2>/dev/null; then - alacritty -e tmux attach-session -t cmus + foot -e tmux attach-session -t cmus else tmux new-session -d -s cmus cmus - alacritty -e tmux attach-session -t cmus + foot -e tmux attach-session -t cmus fi