diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index d7737de..68ca71f 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -2,50 +2,50 @@ import = [] live_config_reload = true [window] -opacity = 0.5 +opacity = 0.7 [font] -normal = { family = "FantasqueSansM Nerd Font", style = "Regular" } -size = 13 +normal = { family = "Source Code Pro", style = "Regular" } +size = 11 [colors] draw_bold_text_with_bright_colors = true [colors.primary] -foreground = "#d3c6aa" -dim_foreground = "#d3c6aa" -bright_foreground = "#dfddc8" -background = "#3a464c" +foreground = "#ffffff" +dim_foreground = "#f0dada" +bright_foreground = "#ffffff" +background = "#2c3746" [colors.normal] -black = "#3a464c" -red = "#e67e80" -green = "#a7c080" -yellow = "#dbcc7f" -blue = "#7fbbb3" -magenta = "#d699b6" -cyan = "#83c092" -white = "#d3c6aa" +black = "#176ef1" +red = "#fd3762" +green = "#2aacaa" +yellow = "#f7c067" +blue = "#f77067" +magenta = "#cb75f7" +cyan = "#5cc6d1" +white = "#9cacad" [colors.bright] -black = "#5c6a72" -red = "#f8fff2" -green = "#8da101" -yellow = "#dfa000" -blue = "#3a94c5" -magenta = "#df69ba" -cyan = "#35a77c" -white = "#dfddc8" +black = "#1874ff" +red = "#ff4772" +green = "#2ebdbb" +yellow = "#ffc66a" +blue = "#ff7c77" +magenta = "#ce79ff" +cyan = "#60ccd8" +white = "#aabcbd" [colors.dim] -black = "#3a464c" -red = "#e67e80" -green = "#a7c080" -yellow = "#dbcc7f" -blue = "#7fbbb3" -magenta = "#d699b6" -cyan = "#83c092" -white = "#d3c6aa" +black = "#156bdc" +red = "#f22c57" +green = "#28a09c" +yellow = "#ddab5c" +blue = "#df635d" +magenta = "#af69dd" +cyan = "#4fb0b3" +white = "#879596" [cursor.style] shape = "Underline" diff --git a/environment.d/user.conf b/environment.d/user.conf deleted file mode 100644 index ef40eb9..0000000 --- a/environment.d/user.conf +++ /dev/null @@ -1 +0,0 @@ -XDG_CURRENT_DESKTOP=river diff --git a/etc/lemurs/wayland/river b/etc/lemurs/wayland/river deleted file mode 100755 index 03476e0..0000000 --- a/etc/lemurs/wayland/river +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/river diff --git a/ignored b/ignored index f99495c..ff62286 100644 --- a/ignored +++ b/ignored @@ -1 +1 @@ -ignored setup.fish clean.fish README.MD etc mimeapps.list local +ignored setup.fish clean.fish README.MD diff --git a/local/share/applications/neovim-alacritty.desktop b/local/share/applications/neovim-alacritty.desktop deleted file mode 100644 index 74c1e1b..0000000 --- a/local/share/applications/neovim-alacritty.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Neovim (Alacritty) -Exec=alacritty -e nvim %F -Terminal=false -Categories=Utility;TextEditor diff --git a/local/share/applications/ranger-alacritty.desktop b/local/share/applications/ranger-alacritty.desktop deleted file mode 100644 index 6f3dd92..0000000 --- a/local/share/applications/ranger-alacritty.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Ranger (Alacritty) -Exec=alacritty -e ranger %F -Terminal=false -Categories=Utility;FileManager diff --git a/mako/config b/mako/config index 2cc57e0..d18a857 100644 --- a/mako/config +++ b/mako/config @@ -1,7 +1,7 @@ -font=FantasqueSansM Nerd Font Normal Regular 12 -background-color=#3a464c88 +font=SourceCodePro Normal Regular 12 +background-color=#2C374688 border-size=2 -border-color=#35a77cff +border-color=#81A1C1FF icon-location=right text-alignment=right default-timeout=2000 diff --git a/mimeapps.list b/mimeapps.list deleted file mode 100644 index e2cca3f..0000000 --- a/mimeapps.list +++ /dev/null @@ -1,36 +0,0 @@ -[Default Applications] -image/apng=librewolf.desktop -image/avif=librewolf.desktop -image/bmp=librewolf.desktop -image/gif=librewolf.desktop -image/vnd.microsoft.icon=librewolf.desktop -image/jpeg=librewolf.desktop -image/png=librewolf.desktop -image/svg+xml=librewolf.desktop -image/tiff=librewolf.desktop -image/webp=librewolf.desktop - -video/x-msvideo=librewolf.desktop -video/mp4=librewolf.desktop -video/mpeg=librewolf.desktop -video/ogg=librewolf.desktop -video/mp2t=librewolf.desktop -video/webm=librewolf.desktop -video/3gpp=librewolf.desktop - -text/css=nvim-alacritty.desktop -text/csv=nvim-alacritty.desktop -text/html=librewolf.desktop -text/calendar=nvim-alacritty.desktop -text/javascript=nvim-alacritty.desktop -text/markdown=nvim-alacritty.desktop -text/xml=nvim-alacritty.desktop -text/plain=nvim-alacritty.desktop - -application/json=nvim-alacritty.desktop -application/ld+json=nvim-alacritty.desktop -application/x-httpd-php=nvim-alacritty.desktop -application/xml=nvim-alacritty.desktop - -x-scheme-handler/discord=vesktop.desktop -x-scheme-handler/discord-1345366770436800533=discord-1345366770436800533.desktop diff --git a/nvim/init.lua b/nvim/init.lua index 317ecb1..8ff029f 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -8,6 +8,14 @@ vim.o.cursorline = true vim.cmd( 'syntax enable' ) vim.cmd( 'filetype plugin indent on' ) +vim.cmd( 'colorscheme slate' ) + +vim.cmd [[ + highlight Normal guibg=NONE ctermbg=NONE + highlight NonText guibg=NONE ctermbg=NONE + highlight EndOfBuffer guibg=NONE ctermbg=NONE +]] + vim.cmd [[ call plug#begin() Plug 'preservim/nerdtree' @@ -20,20 +28,9 @@ vim.cmd [[ Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' - Plug 'stevedylandev/ansi-nvim' call plug#end() ]] -vim.cmd( 'colorscheme ansi' ) -vim.opt.termguicolors = false - -vim.cmd [[ - highlight Normal guibg=NONE ctermbg=NONE - highlight NonText guibg=NONE ctermbg=NONE - highlight EndOfBuffer guibg=NONE ctermbg=NONE -]] - - local cmp = require 'cmp' cmp.setup({ diff --git a/river/init.lua b/river/init.lua index 921135c..efc036f 100755 --- a/river/init.lua +++ b/river/init.lua @@ -80,11 +80,11 @@ local inputs = { local river_options = { -- Theme options ['border-width'] = 2, - ['border-color-focused'] = '0x83c092', - ['border-color-unfocused'] = '0x35a77c', - ['border-color-urgent'] = '0xf85552', + ['border-color-focused'] = '0xeceff4', + ['border-color-unfocused'] = '0x81a1c1', + ['border-color-urgent'] = '0xbf616a', ['xcursor-theme'] = { 'Vimix-cursors', 24 }, - ['background-color'] = '0x343f44', + ['background-color'] = '0x2e3440', -- Other options ['set-repeat'] = { 25, 300 }, diff --git a/swaylock/config b/swaylock/config index 1415c05..b0518be 100644 --- a/swaylock/config +++ b/swaylock/config @@ -7,31 +7,31 @@ indicator-caps-lock indicator-idle-visible indicator-radius=60 -inside-color=83c092b2 -inside-clear-color=7fbbb3b2 -inside-caps-lock-color=dbcc7fb2 -inside-ver-color=a7c080b2 -inside-wrong-color=e67e80b2 +inside-color=28a09cb2 +inside-clear-color=60ccd8b2 +inside-caps-lock-color=ddab6cb2 +inside-ver-color=ff7c77b2 +inside-wrong-color=f22c57b2 -key-hl-color=35a77c -caps-lock-key-hl-color=dfa000 +key-hl-color=2ebdbb +caps-lock-key-hl-color=ffc66a -bs-hl-color=f8fff2 -caps-lock-bs-hl-color=f8fff2 +bs-hl-color=ff4772 +caps-lock-bs-hl-color=ff4772 separator-color=00000000 -ring-color=83c092 -ring-clear-color=7fbbb3 -ring-caps-lock-color=dbcc7f -ring-ver-color=a7c080 -ring-wrong-color=e67e80 +ring-color=28a09c +ring-clear-color=5cc6d1 +ring-caps-lock-color=ddab5c +ring-ver-color=df635d +ring-wrong-color=fd3762 -line-color=3a464c -line-clear-color=3a464c -line-caps-lock-color=3a464c -line-ver-color=3a464c -line-wrong-color=3a464c +line-color=000000b2 +line-clear-color=000000b2 +line-caps-lock-color=000000b2 +line-ver-color=000000b2 +line-wrong-color=000000b2 text-color=000000 text-clear-color=000000 @@ -39,11 +39,10 @@ text-caps-lock-color=000000 text-ver-color=000000 text-wrong-color=000000 -layout-bg-color=a7c080b2 -layout-border-color=3a464c -layout-text-color=000000 +layout-bg-color=2c3746b2 +layout-border-color=81a1c1 scaling=stretch -font=FantasqueSansM Nerd Font +font=SourceCodePro font-size=18 diff --git a/waybar/config.jsonc b/waybar/config.jsonc index f3e175f..22ca4d0 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -59,7 +59,7 @@ "temperature", "backlight", "battery", - "river/tags" + "river/tags", ], "modules-center": [ "river/window" @@ -169,6 +169,6 @@ "car": "", "default": ["", "", ""] }, - "on-click": "alacritty -e 'pulsemixer'" + "on-click": "pavucontrol" } }] diff --git a/waybar/style.css b/waybar/style.css index bdc7f92..b75e291 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,13 +1,13 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: FantasqueSansM Nerd Font; + font-family: FontAwesome, SourceCodePro; font-size: 13px; } window#waybar { - background-color: rgba(50, 70, 76, 0.5); + background-color: rgba(44, 37, 46, 0.7); padding-bottom: 6px; - border-bottom: 2px solid rgba(53, 167, 124, 0.5); + border-bottom: 2px solid rgba(129, 161, 193, 0.5); color: #ffffff; transition-property: background-color; transition-duration: .5s; @@ -59,12 +59,12 @@ button:hover { } #tags button.focused { - background-color: #3a464c; + background-color: #64727D; box-shadow: inset 0 -3px #ffffff; } #tags button.urgent { - background-color: #d3c6aa; + background-color: #eb4d4b; } #clock, @@ -81,7 +81,7 @@ button:hover { margin: 0 3px; padding: 0 8px; color: #ffffff; - border: 2px solid #35a77c; + border: 2px solid #81a1c1; } #cpu, @@ -100,16 +100,11 @@ button:hover { #network:hover, #pulseaudio:hover, #mpd:hover { - border: 2px solid #83c092; + border: 2px solid #eceff4; } #window { margin: 0 4px; - font-size: 12px; -} - -#mpd { - font-size: 11px; } @keyframes blink { diff --git a/wofi/style.css b/wofi/style.css index fbb01d0..a43aa08 100644 --- a/wofi/style.css +++ b/wofi/style.css @@ -1,13 +1,13 @@ #expander-box, #window, #input { - background-color: rgba(50, 70, 76, 0.5); + background-color: rgba(44, 37, 46, 0.7); border-radius: 0; color: white; - font-family: FantasqueSansM Nerd Font; - font-size: 16px; + font-family: SourceCodePro; + font-size: 11pt; } #window, #input { - border: 2px solid #35a77c; + border: 2px solid #81a1c1; } #expander-box { @@ -16,8 +16,8 @@ } #entry:selected { - background-color: #3a464c; - border-top: 2px solid #83c092; - border-bottom: 2px solid #83c092; + background-color: #2c3746; + border-top: 2px solid #eceff4; + border-bottom: 2px solid #eceff4; border-radius: 0; }