From fb28aaac780f0df03524d09ab4d71d9a3ff85a7c Mon Sep 17 00:00:00 2001 From: Eli Fouts <116454864+elifouts@users.noreply.github.com> Date: Tue, 21 Jan 2025 06:42:04 -0500 Subject: [PATCH] Some more updates including Starship! --- .bashrc | 1 + .config/cava/config | 4 +- .config/hypr/hypridle.conf | 1 - .config/hypr/hyprland.conf | 6 +- .config/hypr/hyprlock.conf | 2 +- .config/hypr/obscure-scripts/spotify.sh | 32 --- .config/hypr/wallpaper.sh | 1 - .config/kitty/current-theme.conf | 52 ++--- .config/kitty/kitty.conf | 8 +- .config/nvim/lazy-lock.json | 10 +- .config/nvim/lua/plugins/alpha.lua | 3 + .config/nvim/lua/plugins/csscolors.lua | 8 + .config/nvim/lua/plugins/snacks.lua | 15 -- .config/nvim/lua/plugins/tab.lua | 4 +- .config/starship.toml | 256 ++++++++++++++++++++++++ .config/waybar/config | 2 +- .config/wlogout/style.css | 27 +-- 17 files changed, 322 insertions(+), 110 deletions(-) delete mode 100755 .config/hypr/obscure-scripts/spotify.sh create mode 100644 .config/nvim/lua/plugins/csscolors.lua create mode 100644 .config/starship.toml diff --git a/.bashrc b/.bashrc index 20d8e4f..4d3f1fb 100644 --- a/.bashrc +++ b/.bashrc @@ -16,6 +16,7 @@ alias Docs="cd ~/Documents && nvim" alias Settings="cd ~/.config/hypr && nvim" alias spot="ncspot" alias untar="tar -xf" +alias n="nvim" export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" PS1='[\u@\h \W]\$ ' diff --git a/.config/cava/config b/.config/cava/config index 43ed94f..842b5f5 100644 --- a/.config/cava/config +++ b/.config/cava/config @@ -1,6 +1,6 @@ [color] gradient = 1 gradient_count = 2 -gradient_color_1 = '#393b3b' -gradient_color_2 = '#484b48' +gradient_color_1 = '#4f3a2a' +gradient_color_2 = '#2f3030' diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf index 8880887..ed4998a 100644 --- a/.config/hypr/hypridle.conf +++ b/.config/hypr/hypridle.conf @@ -1,4 +1,3 @@ -# Source the colors-hyprland file to load environment variables source /home/$USER/.cache/wal/colors-hyprland general { diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 834b24d..be523f3 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -24,7 +24,7 @@ general { decoration { rounding = 10 active_opacity = 0.8 - inactive_opacity = 0.5 + inactive_opacity = 0.7 fullscreen_opacity = 1 blur { enabled = true @@ -37,8 +37,8 @@ decoration { } shadow { enabled = true - range = 15 - render_power = 3 + range = 5 + render_power = 2 color = $color0 } } diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 4d132a0..b30d889 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -14,7 +14,7 @@ input-field { dots_rounding = 4 dots_spacing = .5 dots_fase_time = 300 - inner_color = $backgroundCol # no fill + inner_color = $backgroundCol outer_color = $backgroundCol $backgroundCol check_color= $backgroundCol $backgroundCol fail_color= $backgroundCol $backgroundCol diff --git a/.config/hypr/obscure-scripts/spotify.sh b/.config/hypr/obscure-scripts/spotify.sh deleted file mode 100755 index 63af9e9..0000000 --- a/.config/hypr/obscure-scripts/spotify.sh +++ /dev/null @@ -1,32 +0,0 @@ -ACCENT=$(jq -r '.colors.color6' ~/.cache/wal/colors.json | sed 's/#//') -ACCENT_ACTIVE=$(jq -r '.colors.color1' ~/.cache/wal/colors.json | sed 's/#//') -ACCENT_INACTIVE=$(jq -r '.colors.color9' ~/.cache/wal/colors.json | sed 's/#//') -BANNER=$(jq -r '.colors.color4' ~/.cache/wal/colors.json | sed 's/#//') -BORDER_ACTIVE=$(jq -r '.colors.color4' ~/.cache/wal/colors.json | sed 's/#//') -BORDER_INACTIVE=$(jq -r '.colors.color12' ~/.cache/wal/colors.json | sed 's/#//') -HEADER=$(jq -r '.colors.color6' ~/.cache/wal/colors.json | sed 's/#//') -HIGHLIGHT=$(jq -r '.colors.color7' ~/.cache/wal/colors.json | sed 's/#//') -MAIN=$(jq -r '.colors.color0' ~/.cache/wal/colors.json | sed 's/#//') -NOTIFICATION=$(jq -r '.colors.color10' ~/.cache/wal/colors.json | sed 's/#//') -NOTIFICATION_ERROR=$(jq -r '.colors.color12' ~/.cache/wal/colors.json | sed 's/#//') -SUBTEXT=$(jq -r '.colors.color12' ~/.cache/wal/colors.json | sed 's/#//') -TEXT=$(jq -r '.colors.color15' ~/.cache/wal/colors.json | sed 's/#//') - -# Apply these colors to Spicetify theme's color.ini file -sed -i "s/accent = .*/accent = $ACCENT/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/accent-active = .*/accent-active = $ACCENT_ACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/accent-inactive = .*/accent-inactive = $ACCENT_INACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/banner = .*/banner = $BANNER/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/border-active = .*/border-active = $BORDER_ACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/border-inactive = .*/border-inactive = $BORDER_INACTIVE/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/header = .*/header = $HEADER/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/highlight = .*/highlight = $HIGHLIGHT/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/main = .*/main = $MAIN/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/notification = .*/notification = $NOTIFICATION/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/notification-error = .*/notification-error = $NOTIFICATION_ERROR/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/subtext = .*/subtext = $SUBTEXT/" ~/.config/spicetify/Themes/themefr/color.ini -sed -i "s/text = .*/text = $TEXT/" ~/.config/spicetify/Themes/themefr/color.ini - -spicetify apply - - diff --git a/.config/hypr/wallpaper.sh b/.config/hypr/wallpaper.sh index c654efe..970dd01 100755 --- a/.config/hypr/wallpaper.sh +++ b/.config/hypr/wallpaper.sh @@ -19,6 +19,5 @@ main() { sed -i "s/^gradient_color_2 = .*/gradient_color_2 = '$color2'/" $cava_config pkill -USR2 cava || cava -p $cava_config source ~/.cache/wal/colors.sh && cp -r $wallpaper ~/wallpapers/pywallpaper.jpg - rm -rf /home/eli/.cache/nvim/snacks } main diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf index 55e10bf..511ac2a 100644 --- a/.config/kitty/current-theme.conf +++ b/.config/kitty/current-theme.conf @@ -1,30 +1,30 @@ -foreground #c3c5c6 -background #121a1b +foreground #c1c1c0 +background #070705 background_opacity 1.0 -cursor #c3c5c6 +cursor #c1c1c0 -active_tab_foreground #121a1b -active_tab_background #c3c5c6 -inactive_tab_foreground #c3c5c6 -inactive_tab_background #121a1b +active_tab_foreground #070705 +active_tab_background #c1c1c0 +inactive_tab_foreground #c1c1c0 +inactive_tab_background #070705 -active_border_color #c3c5c6 -inactive_border_color #121a1b -bell_border_color #2d4b34 +active_border_color #c1c1c0 +inactive_border_color #070705 +bell_border_color #36362a -color0 #121a1b -color8 #5c7171 -color1 #2d4b34 -color9 #3D6446 -color2 #393b3b -color10 #4C4F4F -color3 #484b48 -color11 #616561 -color4 #69514c -color12 #8C6D66 -color5 #53674d -color13 #6F8A67 -color6 #66695a -color14 #888D78 -color7 #90989b -color15 #c3c5c6 +color0 #070705 +color8 #656553 +color1 #36362a +color9 #484939 +color2 #4f3a2a +color10 #6A4E38 +color3 #2f3030 +color11 #3F4041 +color4 #3f3f34 +color12 #555546 +color5 #4d493f +color13 #676255 +color6 #4e4c40 +color14 #696656 +color7 #949488 +color15 #c1c1c0 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index a495fd9..8d78e58 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -243,7 +243,7 @@ include current-theme.conf #: }}} -#: Text cursor customization {{{ +#i: Text cursor customization {{{ # cursor #cccccc @@ -743,7 +743,7 @@ include current-theme.conf #: }}} -#: Performance tuning {{{ +i#: Performance tuning {{{ # repaint_delay 10 @@ -1405,7 +1405,7 @@ include current-theme.conf #: }}} #: }}} -# background #181815 + #: Advanced {{{ # shell . @@ -2649,3 +2649,5 @@ bold_font auto italic_font auto bold_italic_font auto # END_KITTY_FONTS +window_padding_width 5 + diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 7c909bf..1b0e358 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "gitsigns.nvim": { "branch": "main", "commit": "817bd848fffe82e697b4da656e3f2834cd0665c5" }, + "gitsigns.nvim": { "branch": "main", "commit": "ac38d7860b258ec07085d8d1931e1a487bcee21d" }, "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, @@ -8,14 +8,14 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" }, "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, - "nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, + "nvim-treesitter": { "branch": "master", "commit": "0fb02ac5c39423b5c863eb7c8dd7b093879f1488" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "pywal.nvim": { "branch": "main", "commit": "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9" }, - "snacks.nvim": { "branch": "main", "commit": "0b67934bb9c2ba4b9797759315d8cec1734209e8" }, + "snacks.nvim": { "branch": "main", "commit": "233356e6c9fecf6dfcfddac788580a79d6a3ab6e" }, "tabline.nvim": { "branch": "main", "commit": "ff33d12a20d52daafa5393162cae4108faf8128b" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" } } diff --git a/.config/nvim/lua/plugins/alpha.lua b/.config/nvim/lua/plugins/alpha.lua index b9881a9..4b80e0c 100644 --- a/.config/nvim/lua/plugins/alpha.lua +++ b/.config/nvim/lua/plugins/alpha.lua @@ -81,8 +81,11 @@ return { dashboard.button( "r", " > Recent" , ":Telescope oldfiles"), dashboard.button( "c", " > Config" , ":cd ~/.config/nvim | Telescope find_files"), dashboard.button( "l", "󰒲 > Lazy", ":Lazy"), + dashboard.button( "h", " > Settings" , ":cd ~/.config/hypr | Telescope find_files"), + dashboard.button( "q", " > Quit", ":qa"), + } dashboard.section.footer.val = { "", diff --git a/.config/nvim/lua/plugins/csscolors.lua b/.config/nvim/lua/plugins/csscolors.lua new file mode 100644 index 0000000..8ceec3c --- /dev/null +++ b/.config/nvim/lua/plugins/csscolors.lua @@ -0,0 +1,8 @@ +return { + 'norcalli/nvim-colorizer.lua', + config = function() + require('colorizer').setup { + '*' + } + end +} diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua index c4661df..f44b0b1 100644 --- a/.config/nvim/lua/plugins/snacks.lua +++ b/.config/nvim/lua/plugins/snacks.lua @@ -5,21 +5,6 @@ return { ---@type snacks.Config opts = { bigfile = { enabled = true }, - dashboard = { - sections = { - { - section = "terminal", - cmd = "chafa ~/wallpapers/pywallpaper.jpg --format symbols --symbols vhalf --size 60x17 --stretch;", - height = 17, - padding = 1, - }, - { - pane = 2, - { section = "keys", gap = 1, padding = 1 }, - { section = "startup" }, - }, - }, - }, indent = { enabled = true }, input = { enabled = true }, quickfile = { enabled = true }, diff --git a/.config/nvim/lua/plugins/tab.lua b/.config/nvim/lua/plugins/tab.lua index c686731..9ec70c1 100644 --- a/.config/nvim/lua/plugins/tab.lua +++ b/.config/nvim/lua/plugins/tab.lua @@ -4,8 +4,8 @@ return { require'tabline'.setup { enable = true, options = { - section_separators = { '','' }, - component_separators = {'', ''}, + section_separators = { '', ''}, + component_separators = {'|', '|'}, max_bufferline_percent = 80, show_tabs_always = true, show_devicons = true, diff --git a/.config/starship.toml b/.config/starship.toml new file mode 100644 index 0000000..d7d4967 --- /dev/null +++ b/.config/starship.toml @@ -0,0 +1,256 @@ +format = """ +\ +[](fg:blue)\ +$os\ +[](bg:blue fg:red)\ +$username\ +[](bg:red fg:green)\ +$directory\ +[ ](fg:green)\ +$git_branch\ +$git_status\ +$all\ +$character""" + +[username] +show_always = true +format = '[$user ](bg:red fg:black)' +disabled = false + +[os] +disabled = false +style = 'bg:blue fg:black' +[os.symbols] +Alpaquita = " " +Alpine = " " +AlmaLinux = " " +Amazon = " " +Android = " " +Arch = " " +Artix = " " +CachyOS = " " +CentOS = " " +Debian = " " +DragonFly = " " +Emscripten = " " +EndeavourOS = " " +Fedora = " " +FreeBSD = " " +Garuda = "󰛓 " +Gentoo = " " +HardenedBSD = "󰞌 " +Illumos = "󰈸 " +Kali = " " +Linux = " " +Mabox = " " +Macos = " " +Manjaro = " " +Mariner = " " +MidnightBSD = " " +Mint = " " +NetBSD = " " +NixOS = " " +Nobara = " " +OpenBSD = "󰈺 " +openSUSE = " " +OracleLinux = "󰌷 " +Pop = " " +Raspbian = " " +Redhat = " " +RedHatEnterprise = " " +RockyLinux = " " +Redox = "󰀘 " +Solus = "󰠳 " +SUSE = " " +Ubuntu = " " +Unknown = " " +Void = " " +Windows = "󰍲 " + +[cmd_duration] +format = "[$duration](fg:red)" + +[directory] +format = "[$path](bg:green fg:black)" +truncation_length = 2 +truncation_symbol = "…/" + +[character] +success_symbol = "[](bold blue)" +error_symbol = "[✗](bold red)" +disabled = false + +[directory.substitutions] +"Documents" = "󰈙 " +"Downloads" = " " +"Music" = "󰝚 " +"Pictures" = " " +"Scripts" = "󰲋 " + +[fossil_branch] +symbol = "  " +format = '[$symbol($version)]($style)' + +[git_branch] +symbol = "  " +format = '[$symbol($version)]($style)' + +[git_commit] +tag_symbol = '  ' +format = '[$symbol($version)]($style)' + +[aws] +symbol = "  " +format = '[$symbol($version)]($style)' + +[buf] +symbol = "  " +format = '[$symbol($version)]($style)' + +[c] +symbol = "  " +format = '[$symbol($version)]($style)' + +[cmake] +symbol = "  " +format = '[$symbol($version)]($style)' + +[conda] +symbol = "  " +format = '[$symbol($version)]($style)' + +[crystal] +symbol = "  " +format = '[$symbol($version)]($style)' + +[dart] +symbol = "  " +format = '[$symbol($version)]($style)' + +[docker_context] +symbol = "  " +format = '[$symbol($version)]($style)' + +[elixir] +symbol = "  " +format = '[$symbol($version)]($style)' + +[elm] +symbol = "  " +format = '[$symbol($version)]($style)' + +[fennel] +symbol = "  " +format = '[$symbol($version)]($style)' + +[golang] +symbol = "  " +format = '[$symbol($version)]($style)' + +[guix_shell] +symbol = "  " +format = '[$symbol($version)]($style)' + +[haskell] +symbol = "  " +format = '[$symbol($version)]($style)' + +[haxe] +symbol = "  " +format = '[$symbol($version)]($style)' + +[hg_branch] +symbol = "  " +format = '[$symbol($version)]($style)' + +[hostname] +ssh_symbol = "  " +format = '[$symbol($version)]($style)' + +[java] +symbol = "  " +format = '[$symbol($version)]($style)' + +[julia] +symbol = "  " +format = '[$symbol($version)]($style)' + +[kotlin] +symbol = "  " +format = '[$symbol($version)]($style)' + +[lua] +symbol = "  " +format = '[$symbol($version)]($style)' + +[memory_usage] +symbol = " 󰍛 " +format = '[$symbol($version)]($style)' + +[meson] +symbol = " 󰔷 " +format = '[$symbol($version)]($style)' + +[nim] +symbol = " 󰆥 " +format = '[$symbol($version)]($style)' + +[nix_shell] +symbol = "  " +format = '[$symbol($version)]($style)' + +[nodejs] +symbol = "  " +format = '[$symbol($version)]($style)' + +[ocaml] +symbol = "  " +format = '[$symbol($version)]($style)' + +[package] +symbol = " 󰏗 " +format = '[$symbol($version)]($style)' + +[perl] +symbol = "  " +format = '[$symbol($version)]($style)' + +[php] +symbol = "  " +format = '[$symbol($version)]($style)' + +[pijul_channel] +symbol = "  " +format = '[$symbol($version)]($style)' + +[python] +symbol = "  " +format = '[$symbol($version)]($style)' + +[rlang] +symbol = " 󰟔 " +format = '[$symbol($version)]($style)' + +[ruby] +symbol = "  " +format = '[$symbol($version)]($style)' + +[rust] +symbol = " 󱘗 " +format = '[$symbol($version)]($style)' + +[scala] +symbol = "  " +format = '[$symbol($version)]($style)' + +[swift] +symbol = "  " +format = '[$symbol($version)]($style)' + +[zig] +symbol = "  " +format = '[$symbol($version)]($style)' + +[gradle] +symbol = "  " +format = '[$symbol($version)]($style)' diff --git a/.config/waybar/config b/.config/waybar/config index 3d75063..1122c67 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -81,7 +81,7 @@ }, "custom/pacman": { "format": "󰅢 {}", - "interval": 1800, + "interval": 30, "exec": "checkupdates | wc -l", "exec-if": "exit 0", "on-click": "kitty sh -c 'yay; sudo pacman -Syu; echo Done - Press enter to exit; read'; pkill -SIGRTMIN+8 waybar", diff --git a/.config/wlogout/style.css b/.config/wlogout/style.css index 1f6012b..5c801ae 100644 --- a/.config/wlogout/style.css +++ b/.config/wlogout/style.css @@ -1,4 +1,4 @@ -@import url('/home/eli/.cache/wal/colors-waybar.css'); +@import url('../../.cache/wal/colors-waybar.css'); * { all: unset; background-image: none; @@ -16,55 +16,46 @@ button { } #lock { - background-image: image(url("/home/eli/.config/wlogout/lock.png")); + background-image: image(url("../../.config/wlogout/lock.png")); margin : 5px 5px 5px 300px; padding: 5px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6px rgba(0, 0, 0, 0.6); } #shutdown { - background-image: image(url("/home/eli/.config/wlogout/power.png")); + background-image: image(url("../../.config/wlogout/power.png")); margin : 5px 300px 5px 5px; padding: 5px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6px rgba(0, 0, 0, 0.6); } #logout { - background-image: image(url("/home/eli/.config/wlogout/logout.png")); + background-image: image(url("../../.config/wlogout/logout.png")); margin : 5px 300px 5px 5px; padding: 5px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6px rgba(0, 0, 0, 0.6); } #reboot { - background-image: image(url("/home/eli/.config/wlogout/restart.png")); + background-image: image(url("../../.config/wlogout/restart.png")); margin : 5px 5px 5px 300px; padding: 5px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + box-shadow: 0 0 6px rgba(0, 0, 0, 0.6); } #lock:focus { - background-image: image(url("/home/eli/.config/wlogout/lock.png")); margin : 5px 5px 5px 200px; - padding: 5px; } #shutdown:focus { - background-image: image(url("/home/eli/.config/wlogout/power.png")); margin : 5px 200px 5px 5px; - padding: 5px; } #logout:focus { - background-image: image(url("/home/eli/.config/wlogout/logout.png")); margin : 5px 200px 5px 5px; - padding: 5px; } #reboot:focus { - background-image: image(url("/home/eli/.config/wlogout/restart.png")); margin : 5px 5px 5px 200px; - padding: 5px; } button:focus{ background-color: alpha(@color5,1); color: #000000; - background-position:center; }