From 429dfd069f844602136f8d58494e863899f3073c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 6 May 2024 12:46:49 -0400 Subject: [PATCH] updated alacritty, fish, lazygit, sway, waybar configs --- config/alacritty/alacritty.toml | 79 ++++++++++++++++ config/alacritty/alacritty.yml | 113 ++++++++++++++--------- config/fish/config.fish | 28 +++++- config/fish/functions/fish_greeting.fish | 22 +++++ config/lazygit/config.yml | 23 +++++ config/sway/config | 56 +++++------ config/waybar/config | 17 +++- config/waybar/style.css | 22 ++--- 8 files changed, 271 insertions(+), 89 deletions(-) create mode 100644 config/alacritty/alacritty.toml create mode 100644 config/fish/functions/fish_greeting.fish create mode 100644 config/lazygit/config.yml diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml new file mode 100644 index 0000000..2d75e9d --- /dev/null +++ b/config/alacritty/alacritty.toml @@ -0,0 +1,79 @@ +[colors.bright] +black = "#444b6a" +blue = "#7da6ff" +cyan = "#0db9d7" +green = "#b9f27c" +magenta = "#bb9af7" +red = "#ff7a93" +white = "#acb0d0" +yellow = "#ff9e64" + +[colors.cursor] +cursor = "#F5E0DC" +text = "#1E1E2E" + +[colors.hints.end] +background = "#A6ADC8" +foreground = "#1E1E2E" + +[colors.hints.start] +background = "#F9E2AF" +foreground = "#1E1E2E" + +[colors.normal] +black = "#32344a" +blue = "#7aa2f7" +cyan = "#449dab" +green = "#9ece6a" +magenta = "#ad8ee6" +red = "#f7768e" +white = "#787c99" +yellow = "#e0af68" + +[colors.primary] +background = "#1a1b26" +bright_foreground = "#CDD6F4" +dim_foreground = "#CDD6F4" +foreground = "#a9b1d6" + +[colors.search.focused_match] +background = "#A6E3A1" +foreground = "#1E1E2E" + +[colors.search.footer_bar] +background = "#A6ADC8" +foreground = "#1E1E2E" + +[colors.search.matches] +background = "#A6ADC8" +foreground = "#1E1E2E" + +[colors.selection] +background = "#F5E0DC" +text = "#1E1E2E" + +[colors.vi_mode_cursor] +cursor = "#B4BEFE" +text = "#1E1E2E" + +[font] +size = 11 + +[font.bold] +family = "Monaspace Argon" +style = "Bold" + +[font.bold_italic] +family = "Monaspace Argon" +style = "Bold Italic" + +[font.italic] +family = "Monaspace Argon" +style = "Italic" + +[font.normal] +family = "Monaspace Argon" +style = "Regular" + +[window] +opacity = 0.95 diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml index 64e9129..2d75e9d 100644 --- a/config/alacritty/alacritty.yml +++ b/config/alacritty/alacritty.yml @@ -1,50 +1,79 @@ -# Font -font: - norrmal: - family: Fira Code - style: Regular +[colors.bright] +black = "#444b6a" +blue = "#7da6ff" +cyan = "#0db9d7" +green = "#b9f27c" +magenta = "#bb9af7" +red = "#ff7a93" +white = "#acb0d0" +yellow = "#ff9e64" - bold: - family: Fira Code - style: Bold +[colors.cursor] +cursor = "#F5E0DC" +text = "#1E1E2E" - italic: - family: Fira Code - style: Italic +[colors.hints.end] +background = "#A6ADC8" +foreground = "#1E1E2E" - bold_italic: - family: Fira Code - style: Bold Italic +[colors.hints.start] +background = "#F9E2AF" +foreground = "#1E1E2E" - size: 11 +[colors.normal] +black = "#32344a" +blue = "#7aa2f7" +cyan = "#449dab" +green = "#9ece6a" +magenta = "#ad8ee6" +red = "#f7768e" +white = "#787c99" +yellow = "#e0af68" -# Opacity -window.opacity: 0.90 +[colors.primary] +background = "#1a1b26" +bright_foreground = "#CDD6F4" +dim_foreground = "#CDD6F4" +foreground = "#a9b1d6" -# Gruvbox -colors: - primary: - background: '#2c323b' - foreground: '#eaeaea' +[colors.search.focused_match] +background = "#A6E3A1" +foreground = "#1E1E2E" - # Normal colors - normal: - black: '#242a32' - red: '#d54e53' - green: '#98c379' - yellow: '#e5c07b' - blue: '#83a598' - magenta: '#c678dd' - cyan: '#70c0ba' - white: '#eaeaea' +[colors.search.footer_bar] +background = "#A6ADC8" +foreground = "#1E1E2E" - bright: - black: '#666666' - red: '#ec3e45' - green: '#90c966' - yellow: '#edbf69' - blue: '#73ba9f' - magenta: '#c858e9' - cyan: '#2bcec2' - white: '#ffffff' - # Bright colors +[colors.search.matches] +background = "#A6ADC8" +foreground = "#1E1E2E" + +[colors.selection] +background = "#F5E0DC" +text = "#1E1E2E" + +[colors.vi_mode_cursor] +cursor = "#B4BEFE" +text = "#1E1E2E" + +[font] +size = 11 + +[font.bold] +family = "Monaspace Argon" +style = "Bold" + +[font.bold_italic] +family = "Monaspace Argon" +style = "Bold Italic" + +[font.italic] +family = "Monaspace Argon" +style = "Italic" + +[font.normal] +family = "Monaspace Argon" +style = "Regular" + +[window] +opacity = 0.95 diff --git a/config/fish/config.fish b/config/fish/config.fish index f5f3486..d4d8b12 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -1,16 +1,22 @@ -# env variables -set -x MOZ_ENABLE_WAYLAND 1 -set -x EDITOR "vim" - set RUST "$HOME/.cargo/bin" set GOPATH "$HOME/source/go" set PYTHON_PATH "$HOME/.local/bin" +set DENO_PATH "$HOME/.deno/" +set DOTNET_PATH "$HOME/.dotnet/tools" +set XDG_CURRENT_DESKTOP sway +set GRADLE_PATH "/opt/gradle/gradle-8.4" +set MOZ_ENABLE_WAYLAND 1 +set TERM "xterm-256color" # aliases function ls command exa --color always $argv end +function la + command exa --long --header --all --color always $argv +end + function ll command exa --long --header --color always $argv end @@ -27,5 +33,17 @@ function less command bat $argv end +function more + command bat $argv +end + # path -set PATH "$RUST:$GOPATH:$PYTHON_PATH:$PATH" +set PATH "$HOME:$DOTNET_PATH:$DENO_PATH/bin:$RUST:$GOPATH:$PYTHON_PATH:$GRADLE_PATH/bin:$PATH" + +# editor env +set EDITOR nvim + +# bun +set --export BUN_INSTALL "$HOME/.bun" +set --export PATH $BUN_INSTALL/bin $PATH +atuin init fish | source diff --git a/config/fish/functions/fish_greeting.fish b/config/fish/functions/fish_greeting.fish new file mode 100644 index 0000000..03b80e1 --- /dev/null +++ b/config/fish/functions/fish_greeting.fish @@ -0,0 +1,22 @@ +function fish_greeting + set memes \ + "Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \ + "Daddy, chill!" \ + "What the hell is even that?!" \ + "Road work ahead? Yeah, I sure hope it does!" \ + "Look at all those chickens!" \ + "I smell like beef" \ + "Say, Coloardo \'I\'M A GIRAFFE\'" \ + "I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \ + "This is the dollar store, how good can it be?" \ + "That was legitness" \ + "Deez nuts" \ + "I wanna be a cowboy baby" \ + "Can I get a waffle? Can I please get a waffle?" \ + "I'm lesbian. I thought you were American." + + set choose_meme (random)"%"(count $memes) + set choose_meme $memes[(math $choose_meme"+1")] + + printf (set_color F90)"%s\n" $choose_meme +end diff --git a/config/lazygit/config.yml b/config/lazygit/config.yml new file mode 100644 index 0000000..bfb9e1b --- /dev/null +++ b/config/lazygit/config.yml @@ -0,0 +1,23 @@ +gui: + theme: + activeBorderColor: + - "#a6e3a1" + - bold + inactiveBorderColor: + - "#a6adc8" + optionsTextColor: + - "#89b4fa" + selectedLineBgColor: + - "#313244" + selectedRangeBgColor: + - "#313244" + cherryPickedCommitBgColor: + - "#45475a" + cherryPickedCommitFgColor: + - "#a6e3a1" + unstagedChangesColor: + - "#f38ba8" + defaultFgColor: + - "#cdd6f4" + searchingActiveBorderColor: + - "#f9e2af" diff --git a/config/sway/config b/config/sway/config index 0a4d6ec..30775df 100644 --- a/config/sway/config +++ b/config/sway/config @@ -8,40 +8,40 @@ set $up k set $right l # Alacritty set $term alacritty -# Wofi -set $menu wofi --show run + +# Menu (rofi) +set $rofi_cmd rofi -terminal '$term' +set $menu $rofi_cmd -show combi -combi-modes drun#run -modes combi ### Output configuration -output DP-1 pos 0 0 res 1920x1080 -output HDMI-A-1 pos -1920 0 res 1920x1080 -output DVI-D-1 pos 1920 0 res 1920x1080 +output DP-3 pos 3840 0 res 1920x1080@59Hz +output HDMI-A-1 pos 0 0 res 1920x1080@59Hz +output DP-2 pos 1920 0 res 1920x1080@60Hz ### Wallpaper -output HDMI-A-1 bg ~/.wallpaper.png fill -output DVI-D-1 bg ~/.wallpaper.png fill -output DP-1 bg ~/.wallpaper.png fill +output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill +output DP-2 bg ~/.wallpaper/.wallpaper.png fill +output DP-3 bg ~/.wallpaper/.wallpaper.png fill ### Workspace binding -## DP-1 bindings -workspace 1 output DP-1 -workspace 2 output DP-1 -workspace 4 output DP-1 +## DP-3 bindings +workspace 1 output DP-2 +workspace 2 output DP-2 ## HDMI-A-1 bindings workspace 3 output HDMI-A-1 -## DVI-D-1 bindings -workspace 6 output DVI-D-1 -workspace 7 output DVI-D-1 +## DP-2 bindings +workspace 6 output DP-3 +workspace 7 output DP-3 ### Colour options -set $bg #40291a +set $bg #24283b set $bg-inactive #323232 set $bg-urgent #000000 set $text #eeeeec set $text-inactive #babdb6 - set $bar #323232 set $statusline #e0e0e0 @@ -52,12 +52,10 @@ client.urgent $bg-urgent $bg-urgent $text $bar $bar ### Idle configuration - - exec swayidle -w \ - timeout 300 'swaylock -f -i /home/wyatt/.wallpaper_lock.jpeg' \ - timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ - before-sleep 'swaylock -f -c 000000' - +# exec swayidle -w \ +# timeout 600 'swaylock -f -i /home/wyatt/.wallpaper_lock.jpeg' \ +# timeout 1200 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ +# before-sleep 'swaylock -f -c 000000' # Workspaces set $workspace_www 1 @@ -67,8 +65,6 @@ set $workspace_documents 4 set $workspace_multimedia 5 # Gaps -gaps inner 4 -gaps outer 16 floating_modifier $mod normal ### Key bindings @@ -170,6 +166,7 @@ floating_modifier $mod normal # Take a screenshot of a given selection bindsym $mod+Print exec grim -t jpeg -g "$(slurp)" ~/Pictures/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpeg + ### Resizing containers mode "resize" { bindsym $left resize shrink width 10px @@ -196,10 +193,12 @@ bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle bindsym XF86AudioPlay exec playerctl play-pause bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous +bindsym XF86MonBrightnessUp exec light -A 5 +bindsym XF86MonBrightnessDown exec light -U 5 ### Lock the screen so my brother ### won't dick with my computer -bindsym ctrl+alt+l 'swaylock -f -i /home/wyatt/.wallpaper_lock.jpeg' +bindsym $mod+Ctrl+l 'swaylock -f -i /home/wyatt/.wallpaper_lock.jpeg' ### Status Bar: bar { @@ -217,7 +216,10 @@ gaps inner 10px # Applications exec_always /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway exec mako +#exec swww init +#exec bash /home/wyatt/.wallpaper/wallpaper.sh /home/wyatt/.wallpaper set $opacity 1.00 for_window [class=".*"] opacity $opacity @@ -226,5 +228,7 @@ for_window [app_id=".*"] opacity $opacity # Disable locking when conditions are met for_window [class="streaming_client"] inhibit_idle fullscreen for_window [app_id="firefox"] inhibit_idle fullscreen +for_window [app_id="neovide"] inhibit_idle fullscreen +for_window [title="Beyond All Reason"] inhibit_idle fullscreen include /etc/sway/config.d/* diff --git a/config/waybar/config b/config/waybar/config index 46adc2c..d9db3ce 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -2,7 +2,7 @@ "layer": "top", "modules-left": ["sway/workspaces"], "modules-center": ["clock"], - "modules-right": ["custom/playerctl","pulseaudio", "network", "battery", "tray"], + "modules-right": ["custom/playerctl", "custom/weather", "pulseaudio", "network", "tray"], "sway/workspaces": { "disable-scroll": true, "all-outputs": true, @@ -12,7 +12,7 @@ "2":"", "3":"", "4":"", - "5":"", + "5":"", "6":"", "urgent": "", "focused": "", @@ -24,9 +24,16 @@ "tooltip": false }, "clock": { - "format-alt": "{:%d-%m-%Y}", + "format-alt": "{:%m-%d-%Y}", "tooltip": false }, +"custom/weather": { + "format": "{} °", + "tooltip": true, + "interval": 3600, + "exec": "wttrbar --fahrenheit --main-indicator 'temp_F' --location 'Grand Rapids'", + "return-type": "json" +}, "network": { "format-wifi": " {essid} ({signalStrength}%)", "format-ethernet": " {ipaddr}", @@ -48,10 +55,10 @@ "tooltip": false }, "custom/playerctl": { - "format": " {}", + "format": "♬ {}", "max-length": 40, "interval": 5, "exec": "playerctl metadata --format '{{ artist }} - {{ title }}'", "tooltip": false - } + }, } diff --git a/config/waybar/style.css b/config/waybar/style.css index 7417943..1997440 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,16 +1,16 @@ * { border: none; border-radius: 0; - font-family: "Fira Code"; + font-family: "Monaspace Krypton"; font-size: 13px; min-height: 0; } window#waybar { - background: #282828; - border-bottom: 1px solid #504945; - color: #ebdbb2; - opacity: 0.8080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080; + background: #1f2335; + border-bottom: 1px solid #24283b; + color: #c0caf5; + opacity: 0.808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808; } #workspaces button { @@ -18,14 +18,14 @@ window#waybar { padding-left: 12px; padding-right: 12px; background: transparent; - color: #ebdbb2; + color: #c0caf5; border-bottom: 1px solid transparent; } #workspaces button.focused { - background: #ebdbb2; + background: #c0caf5; color: #1d2021; - border-bottom: 1px solid #ebdbb2; + border-bottom: 1px solid #c0caf5; } #cpu, @@ -40,11 +40,11 @@ window#waybar { } #battery.charging { - color: #689d6a; + color: #9ece6a; } #battery.warning:not(.charging) { - color: #d79921; + color: #ff9e64; } @keyframes blink { @@ -55,7 +55,7 @@ window#waybar { } #battery.critical:not(.charging) { - background: #cc241d; + background: #f7768e; color: #ebdbb2; border-bottom: 1px solid #ebdbb2; animation-name: blink;