diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 19e1877..fee1dc9 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -7,7 +7,8 @@ root, system, ... -}: { +}: +{ imports = [ inputs.zen.homeModules.twilight @@ -68,7 +69,8 @@ fonts.fontconfig.enable = true; - home.file.".mozilla/native-messaging-hosts/tridactyl.json".source = "${upkgs.tridactyl-native}/lib/mozilla/native-messaging-hosts/tridactyl.json"; + home.file.".mozilla/native-messaging-hosts/tridactyl.json".source = + "${upkgs.tridactyl-native}/lib/mozilla/native-messaging-hosts/tridactyl.json"; # some packages are enabled from their own module in ./modules home.packages = with upkgs; [ @@ -91,7 +93,7 @@ ripgrep # rlly fast grep :3 zip # zips .zip unzip # unzips .zip - (btop.override {rocmSupport = true;}) # btop + amd gpu support + (btop.override { rocmSupport = true; }) # btop + amd gpu support nmap # network discovery and mapping tool! distrobox # use any linux distro inside ur terminal x3 parted # create, resize, copy, image partitions @@ -291,6 +293,22 @@ }; }; + alacritty = { + enable = true; + package = upkgs.alacritty-graphics; + + settings = { + general.import = [ + "theme.toml" + ]; + font = { + normal.family = "DepartureMono Nerd Font Mono"; + size = 10; + }; + scrolling.history = 100000; + }; + }; + zen-browser = { enable = true; package = inputs.zen.packages.${system}.twilight; diff --git a/homes/modules/programs/yazi/yazi.nix b/homes/modules/programs/yazi/yazi.nix index fc3e7a6..13831f2 100644 --- a/homes/modules/programs/yazi/yazi.nix +++ b/homes/modules/programs/yazi/yazi.nix @@ -1,4 +1,5 @@ -{upkgs, ...}: { +{ upkgs, ... }: +{ # optional dependencies can be found here: # https://yazi-rs.github.io/docs/installation/ home.packages = with upkgs; [ @@ -23,12 +24,12 @@ mgr.prepend_keymap = [ # drag and drop!! { - on = [""]; + on = [ "" ]; run = ''shell "ripdrag -x -a \"$@\"" --confirm''; } # copy hovered file to clipboard { - on = [""]; + on = [ "" ]; run = ''shell -- path=%h; echo "file://$path" | wl-copy -t text/uri-list''; } ]; @@ -170,7 +171,7 @@ [filechooser] cmd=${upkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh default_dir=$HOME - env=TERMCMD='foot --title filechooser' + env=TERMCMD='alacritty --title filechooser' open_mode=suggested save_mode=last ''; diff --git a/homes/modules/scripts/task-manager.sh b/homes/modules/scripts/task-manager.sh index ceb4ac2..1242fa4 100755 --- a/homes/modules/scripts/task-manager.sh +++ b/homes/modules/scripts/task-manager.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -pkill -f "foot --title btop -e btop" || { foot --title btop -e btop & disown; } +pkill -f "alacritty --title btop -e btop" || { alacritty --title btop -e btop & disown; } diff --git a/homes/modules/themeing/wallust/templates/alacritty-template.toml b/homes/modules/themeing/wallust/templates/alacritty-template.toml new file mode 100644 index 0000000..c1a06de --- /dev/null +++ b/homes/modules/themeing/wallust/templates/alacritty-template.toml @@ -0,0 +1,27 @@ +[colors.primary] +background = '{{ background }}' +foreground = '{{ foreground }}' + +[colors.cursor] +cursor = '{{ cursor }}' +text = '{{ cursor }}' + +[colors.normal] +black = '{{ color0 }}' +red = '{{ color1 }}' +green = '{{ color2 }}' +yellow = '{{ color3 }}' +blue = '{{ color4 }}' +magenta = '{{ color5 }}' +cyan = '{{ color6 }}' +white = '{{ color7 }}' + +[colors.bright] +black = '{{ color8 }}' +red = '{{ color9 }}' +green = '{{ color10 }}' +yellow = '{{ color11 }}' +blue = '{{ color12 }}' +magenta = '{{ color13 }}' +cyan = '{{ color14 }}' +white = '{{ color15 }}' diff --git a/homes/modules/themeing/wallust/wallust.toml b/homes/modules/themeing/wallust/wallust.toml index 39c0d57..cccd8d5 100644 --- a/homes/modules/themeing/wallust/wallust.toml +++ b/homes/modules/themeing/wallust/wallust.toml @@ -22,6 +22,9 @@ mango.target = "~/.config/mango/colors.conf" foot.template = "foot-template.ini" foot.target = "~/.config/foot/theme.ini" +alacritty.template = "alacritty-template.toml" +alacritty.target = "~/.config/alacritty/theme.toml" + waybar.template = "waybar-template.css" waybar.target = "~/.config/waybar/colors.css" diff --git a/homes/modules/wm/hyprland/hypr/windowrules.conf b/homes/modules/wm/hyprland/hypr/windowrules.conf index 0d93e18..cbda8e0 100644 --- a/homes/modules/wm/hyprland/hypr/windowrules.conf +++ b/homes/modules/wm/hyprland/hypr/windowrules.conf @@ -1,10 +1,19 @@ # window rules +# ---------------------------------------------------------------------------- # +# terminal - blur +windowrule { + name = terminal-blur + match:class = ^(foot|Alacritty)$ + match:fullscreen = false + opacity = 0.95 +} + # ---------------------------------------------------------------------------- # # task manager windowrule { - name = task-manager - match:class = ^(foot)$ + name = terminal-manager + match:class = ^(foot|Alacritty)$ match:title = ^(btop)$ float = true center = true @@ -15,33 +24,13 @@ windowrule { # terminal filechooser windowrule { name = terminal-filechooser - match:class = ^(foot)$ + match:class = ^(foot|Alacritty)$ match:title = ^(filechooser)$ float = true center = true size = (monitor_w*0.85) (monitor_h*0.85) } -# ---------------------------------------------------------------------------- # -# yazi explorer -#windowrule { - #name = yazi - #match:class = ^(foot)$ - #match:title = ^(yazi)$ - #float = true - #center = true - #size = (monitor_w*0.85) (monitor_h*0.85) -#} - -# ---------------------------------------------------------------------------- # -# foot - blur -windowrule { - name = foot-blur - match:class = ^(foot)$ - match:fullscreen = false - opacity = 0.95 -} - # ---------------------------------------------------------------------------- # # imhex - blur windowrule { diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index 96b5312..e0a7d21 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -1,4 +1,5 @@ -{...}: { +{ ... }: +{ wayland.windowManager.hyprland = { enable = true; package = null; @@ -23,8 +24,8 @@ "$mod" = "SUPER"; # applications - "$terminal" = "foot"; - "$explorer" = "foot -e yazi"; + "$terminal" = "alacritty"; + "$explorer" = "alacritty -e yazi"; "$browser" = "zen-twilight"; # menu @@ -278,15 +279,15 @@ ]; layerrule = [ - #"blur, aurorashell" - #"ignorealpha 0.7, aurorashell" + #"blur, aurorashell" + #"ignorealpha 0.7, aurorashell" - "blur on, match:namespace waybar" - "ignore_alpha 0, match:namespace waybar" + "blur on, match:namespace waybar" + "ignore_alpha 0, match:namespace waybar" - "blur on, match:namespace rofi" - "xray on, match:namespace rofi" - "ignore_alpha 0, match:namespace rofi" + "blur on, match:namespace rofi" + "xray on, match:namespace rofi" + "ignore_alpha 0, match:namespace rofi" ]; env = [ diff --git a/homes/modules/wm/mango/mango/config.conf b/homes/modules/wm/mango/mango/config.conf index dc8c6c4..f21e81c 100644 --- a/homes/modules/wm/mango/mango/config.conf +++ b/homes/modules/wm/mango/mango/config.conf @@ -73,8 +73,8 @@ accel_profile = 0 ################################################################################ # applications -bind = SUPER, t, spawn, foot -bind = SUPER, e, spawn, foot -e yazi +bind = SUPER, t, spawn, alacritty +bind = SUPER, e, spawn, alacritty -e yazi bind = SUPER, r, spawn, zen-twilight # rofi diff --git a/homes/modules/wm/mango/mango/windowrules.conf b/homes/modules/wm/mango/mango/windowrules.conf index f38ede2..82ba205 100644 --- a/homes/modules/wm/mango/mango/windowrules.conf +++ b/homes/modules/wm/mango/mango/windowrules.conf @@ -1,3 +1,3 @@ # ---------------------------------------------------------------------------- # -# foot - blur -windowrule=focused_opacity:0.95,unfocused_opacity:0.95,appid:^(foot)$ +# terminal - blur +windowrule=focused_opacity:0.95,unfocused_opacity:0.95,appid:^(foot|alacritty)$ diff --git a/homes/modules/wm/river.nix b/homes/modules/wm/river.nix index 59f8a4c..33daf83 100644 --- a/homes/modules/wm/river.nix +++ b/homes/modules/wm/river.nix @@ -1,79 +1,84 @@ -{spkgs, ...}: { - wayland.windowManager.river = let - layout = "rivertile"; - in { - enable = true; - xwayland.enable = true; - package = spkgs.river-classic; # FIX: using spkgs version as zls is broken rn ;-; +{ spkgs, ... }: +{ + wayland.windowManager.river = + let + layout = "rivertile"; + in + { + enable = true; + xwayland.enable = true; + package = spkgs.river-classic; # FIX: using spkgs version as zls is broken rn ;-; - settings = let - main = "Super"; + settings = + let + main = "Super"; - # applications - terminal = "foot"; - browser = "firefox"; - in { - default-layout = "${layout}"; - output-layout = "${layout}"; - border-width = 1; + # applications + terminal = "alacritty"; + browser = "firefox"; + in + { + default-layout = "${layout}"; + output-layout = "${layout}"; + border-width = 1; - spawn = [ - ''${layout}'' + spawn = [ + "${layout}" - "awww-daemon" - "waybar" - ]; + "awww-daemon" + "waybar" + ]; - map.normal = { - "${main} C" = "close"; # close focused window - "${main}+Alt Delete" = "exit"; # exit river + map.normal = { + "${main} C" = "close"; # close focused window + "${main}+Alt Delete" = "exit"; # exit river - # app launcher - "${main} D" = ''spawn "pkill -x rofi || rofi -show drun -show-icons"''; - "Alt Tab" = ''spawn "pkill -x rofi || rofi -modi window -show window -show-icons"''; + # app launcher + "${main} D" = ''spawn "pkill -x rofi || rofi -show drun -show-icons"''; + "Alt Tab" = ''spawn "pkill -x rofi || rofi -modi window -show window -show-icons"''; - # spawn applications - "${main} T" = ''spawn "${terminal}"''; - "${main} R" = ''spawn "${browser}"''; + # spawn applications + "${main} T" = ''spawn "${terminal}"''; + "${main} R" = ''spawn "${browser}"''; - # move focused view to top of layout stack - "${main} N" = ''zoom''; + # move focused view to top of layout stack + "${main} N" = "zoom"; - # focus next/previous view - "${main} J" = "focus-view previous"; - "${main} K" = "focus-view next"; - # move to next/previous output - "${main} H" = "focus-output previous"; - "${main} L" = "focus-output next"; + # focus next/previous view + "${main} J" = "focus-view previous"; + "${main} K" = "focus-view next"; + # move to next/previous output + "${main} H" = "focus-output previous"; + "${main} L" = "focus-output next"; - # swap next/previous view - "${main}+Alt J" = "swap previous"; - "${main}+Alt K" = "swap next"; - # send view to next/previous output - # and switch to that output (wip) - "${main}+Alt H" = "send-to-output previous"; - #"${main}+Alt H" = "focus-output previous"; - "${main}+Alt L" = "send-to-output next"; - #"${main}+Alt L" = "focus-output next"; + # swap next/previous view + "${main}+Alt J" = "swap previous"; + "${main}+Alt K" = "swap next"; + # send view to next/previous output + # and switch to that output (wip) + "${main}+Alt H" = "send-to-output previous"; + #"${main}+Alt H" = "focus-output previous"; + "${main}+Alt L" = "send-to-output next"; + #"${main}+Alt L" = "focus-output next"; - # move views - #"${main}+Alt H" = "move left 100"; - #"${main}+Alt J" = "move down 100"; - #"${main}+Alt K" = "move up 100"; - #"${main}+Alt L" = "move right 100"; + # move views + #"${main}+Alt H" = "move left 100"; + #"${main}+Alt J" = "move down 100"; + #"${main}+Alt K" = "move up 100"; + #"${main}+Alt L" = "move right 100"; - # snap views - #"${main}+Control H" = "snap left"; - #"${main}+Control J" = "snap down"; - #"${main}+Control K" = "snap up"; - #"${main}+Control L" = "snap right"; + # snap views + #"${main}+Control H" = "snap left"; + #"${main}+Control J" = "snap down"; + #"${main}+Control K" = "snap up"; + #"${main}+Control L" = "snap right"; - # resize views - #"${main}+Shift H" = "resize horizontal -100"; - #"${main}+Shift J" = "resize vertical -100"; - #"${main}+Shift K" = "resize vertical 100"; - #"${main}+Shift L" = "resize horizontal 100"; - }; + # resize views + #"${main}+Shift H" = "resize horizontal -100"; + #"${main}+Shift J" = "resize vertical -100"; + #"${main}+Shift K" = "resize vertical 100"; + #"${main}+Shift L" = "resize horizontal 100"; + }; + }; }; - }; } diff --git a/homes/modules/wm/sway.nix b/homes/modules/wm/sway.nix index 53d9741..a5c2f58 100644 --- a/homes/modules/wm/sway.nix +++ b/homes/modules/wm/sway.nix @@ -1,49 +1,52 @@ -{config, ...}: { +{ config, ... }: +{ wayland.windowManager.sway = { enable = true; config = rec { modifier = "Mod4"; # Mod4 = Super/Meta - terminal = "foot"; + terminal = "alacritty"; # disable sway bar - bars = []; + bars = [ ]; # set border colors #colors = { #focused = startup = [ - {command = "awww-daemon";} - {command = "waybar";} + { command = "awww-daemon"; } + { command = "waybar"; } ]; - keybindings = let - main = config.wayland.windowManager.sway.config.modifier; - terminal = config.wayland.windowManager.sway.config.terminal; - browser = "firefox"; - in { - "${main}+c" = "kill"; # close focused window - "${main}+Alt+Delete" = "exit"; # exit sway + keybindings = + let + main = config.wayland.windowManager.sway.config.modifier; + terminal = config.wayland.windowManager.sway.config.terminal; + browser = "firefox"; + in + { + "${main}+c" = "kill"; # close focused window + "${main}+Alt+Delete" = "exit"; # exit sway - # open launcher - "${main}+d" = "exec pkill -x rofi || rofi -show drun -show-icons"; - "Alt+Tab" = "exec pkill -x rofi || rofi -modi window -show window -show-icons"; + # open launcher + "${main}+d" = "exec pkill -x rofi || rofi -show drun -show-icons"; + "Alt+Tab" = "exec pkill -x rofi || rofi -modi window -show window -show-icons"; - "${main}+t" = "exec ${terminal}"; # open terminal - "${main}+r" = "exec ${browser}"; # open browser + "${main}+t" = "exec ${terminal}"; # open terminal + "${main}+r" = "exec ${browser}"; # open browser - # move focus - "${main}+h" = "focus left"; - "${main}+j" = "focus down"; - "${main}+k" = "focus up"; - "${main}+l" = "focus right"; + # move focus + "${main}+h" = "focus left"; + "${main}+j" = "focus down"; + "${main}+k" = "focus up"; + "${main}+l" = "focus right"; - # move focused window - "${main}+Alt+h" = "move left"; - "${main}+Alt+j" = "move down"; - "${main}+Alt+k" = "move up"; - "${main}+Alt+l" = "move right"; - }; + # move focused window + "${main}+Alt+h" = "move left"; + "${main}+Alt+j" = "move down"; + "${main}+Alt+k" = "move up"; + "${main}+Alt+l" = "move right"; + }; }; }; }