diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 68ca71f..d7737de 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -2,50 +2,50 @@ import = [] live_config_reload = true [window] -opacity = 0.7 +opacity = 0.5 [font] -normal = { family = "Source Code Pro", style = "Regular" } -size = 11 +normal = { family = "FantasqueSansM Nerd Font", style = "Regular" } +size = 13 [colors] draw_bold_text_with_bright_colors = true [colors.primary] -foreground = "#ffffff" -dim_foreground = "#f0dada" -bright_foreground = "#ffffff" -background = "#2c3746" +foreground = "#d3c6aa" +dim_foreground = "#d3c6aa" +bright_foreground = "#dfddc8" +background = "#3a464c" [colors.normal] -black = "#176ef1" -red = "#fd3762" -green = "#2aacaa" -yellow = "#f7c067" -blue = "#f77067" -magenta = "#cb75f7" -cyan = "#5cc6d1" -white = "#9cacad" +black = "#3a464c" +red = "#e67e80" +green = "#a7c080" +yellow = "#dbcc7f" +blue = "#7fbbb3" +magenta = "#d699b6" +cyan = "#83c092" +white = "#d3c6aa" [colors.bright] -black = "#1874ff" -red = "#ff4772" -green = "#2ebdbb" -yellow = "#ffc66a" -blue = "#ff7c77" -magenta = "#ce79ff" -cyan = "#60ccd8" -white = "#aabcbd" +black = "#5c6a72" +red = "#f8fff2" +green = "#8da101" +yellow = "#dfa000" +blue = "#3a94c5" +magenta = "#df69ba" +cyan = "#35a77c" +white = "#dfddc8" [colors.dim] -black = "#156bdc" -red = "#f22c57" -green = "#28a09c" -yellow = "#ddab5c" -blue = "#df635d" -magenta = "#af69dd" -cyan = "#4fb0b3" -white = "#879596" +black = "#3a464c" +red = "#e67e80" +green = "#a7c080" +yellow = "#dbcc7f" +blue = "#7fbbb3" +magenta = "#d699b6" +cyan = "#83c092" +white = "#d3c6aa" [cursor.style] shape = "Underline" diff --git a/environment.d/user.conf b/environment.d/user.conf new file mode 100644 index 0000000..ef40eb9 --- /dev/null +++ b/environment.d/user.conf @@ -0,0 +1 @@ +XDG_CURRENT_DESKTOP=river diff --git a/etc/lemurs/wayland/river b/etc/lemurs/wayland/river new file mode 100755 index 0000000..03476e0 --- /dev/null +++ b/etc/lemurs/wayland/river @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/river diff --git a/ignored b/ignored index ff62286..f99495c 100644 --- a/ignored +++ b/ignored @@ -1 +1 @@ -ignored setup.fish clean.fish README.MD +ignored setup.fish clean.fish README.MD etc mimeapps.list local diff --git a/kanshi/config b/kanshi/config index 47ee638..edb0518 100644 --- a/kanshi/config +++ b/kanshi/config @@ -1,5 +1,5 @@ profile single { - output eDP-2 { + output eDP-1 { mode 1920x1080 position 0,0 adaptive_sync on @@ -7,7 +7,7 @@ profile single { } profile multi { - output eDP-2 { + output eDP-1 { mode 1920x1080 position 0,0 adaptive_sync on diff --git a/local/share/applications/neovim-alacritty.desktop b/local/share/applications/neovim-alacritty.desktop new file mode 100644 index 0000000..74c1e1b --- /dev/null +++ b/local/share/applications/neovim-alacritty.desktop @@ -0,0 +1,6 @@ +[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 new file mode 100644 index 0000000..6f3dd92 --- /dev/null +++ b/local/share/applications/ranger-alacritty.desktop @@ -0,0 +1,6 @@ +[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 d18a857..2cc57e0 100644 --- a/mako/config +++ b/mako/config @@ -1,7 +1,7 @@ -font=SourceCodePro Normal Regular 12 -background-color=#2C374688 +font=FantasqueSansM Nerd Font Normal Regular 12 +background-color=#3a464c88 border-size=2 -border-color=#81A1C1FF +border-color=#35a77cff icon-location=right text-alignment=right default-timeout=2000 diff --git a/mimeapps.list b/mimeapps.list new file mode 100644 index 0000000..e2cca3f --- /dev/null +++ b/mimeapps.list @@ -0,0 +1,36 @@ +[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 8ff029f..317ecb1 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -8,14 +8,6 @@ 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' @@ -28,9 +20,20 @@ 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 22aa4c8..921135c 100755 --- a/river/init.lua +++ b/river/init.lua @@ -21,7 +21,7 @@ local wallpapers = { } local monitors = { - main = 'eDP-2', + main = 'eDP-1', external = 'HDMI-A-1' } @@ -80,11 +80,11 @@ local inputs = { local river_options = { -- Theme options ['border-width'] = 2, - ['border-color-focused'] = '0xeceff4', - ['border-color-unfocused'] = '0x81a1c1', - ['border-color-urgent'] = '0xbf616a', + ['border-color-focused'] = '0x83c092', + ['border-color-unfocused'] = '0x35a77c', + ['border-color-urgent'] = '0xf85552', ['xcursor-theme'] = { 'Vimix-cursors', 24 }, - ['background-color'] = '0x2e3440', + ['background-color'] = '0x343f44', -- Other options ['set-repeat'] = { 25, 300 }, diff --git a/swaylock/config b/swaylock/config index b0518be..1415c05 100644 --- a/swaylock/config +++ b/swaylock/config @@ -7,31 +7,31 @@ indicator-caps-lock indicator-idle-visible indicator-radius=60 -inside-color=28a09cb2 -inside-clear-color=60ccd8b2 -inside-caps-lock-color=ddab6cb2 -inside-ver-color=ff7c77b2 -inside-wrong-color=f22c57b2 +inside-color=83c092b2 +inside-clear-color=7fbbb3b2 +inside-caps-lock-color=dbcc7fb2 +inside-ver-color=a7c080b2 +inside-wrong-color=e67e80b2 -key-hl-color=2ebdbb -caps-lock-key-hl-color=ffc66a +key-hl-color=35a77c +caps-lock-key-hl-color=dfa000 -bs-hl-color=ff4772 -caps-lock-bs-hl-color=ff4772 +bs-hl-color=f8fff2 +caps-lock-bs-hl-color=f8fff2 separator-color=00000000 -ring-color=28a09c -ring-clear-color=5cc6d1 -ring-caps-lock-color=ddab5c -ring-ver-color=df635d -ring-wrong-color=fd3762 +ring-color=83c092 +ring-clear-color=7fbbb3 +ring-caps-lock-color=dbcc7f +ring-ver-color=a7c080 +ring-wrong-color=e67e80 -line-color=000000b2 -line-clear-color=000000b2 -line-caps-lock-color=000000b2 -line-ver-color=000000b2 -line-wrong-color=000000b2 +line-color=3a464c +line-clear-color=3a464c +line-caps-lock-color=3a464c +line-ver-color=3a464c +line-wrong-color=3a464c text-color=000000 text-clear-color=000000 @@ -39,10 +39,11 @@ text-caps-lock-color=000000 text-ver-color=000000 text-wrong-color=000000 -layout-bg-color=2c3746b2 -layout-border-color=81a1c1 +layout-bg-color=a7c080b2 +layout-border-color=3a464c +layout-text-color=000000 scaling=stretch -font=SourceCodePro +font=FantasqueSansM Nerd Font font-size=18 diff --git a/waybar/config.jsonc b/waybar/config.jsonc index e917ff3..f3e175f 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -48,7 +48,7 @@ }, { - "output": "eDP-2", + "output": "eDP-1", "layer": "top", "position": "top", "height": 32, @@ -59,7 +59,7 @@ "temperature", "backlight", "battery", - "river/tags", + "river/tags" ], "modules-center": [ "river/window" @@ -169,6 +169,6 @@ "car": "", "default": ["", "", ""] }, - "on-click": "pavucontrol" + "on-click": "alacritty -e 'pulsemixer'" } }] diff --git a/waybar/style.css b/waybar/style.css index b75e291..bdc7f92 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: FontAwesome, SourceCodePro; + font-family: FantasqueSansM Nerd Font; font-size: 13px; } window#waybar { - background-color: rgba(44, 37, 46, 0.7); + background-color: rgba(50, 70, 76, 0.5); padding-bottom: 6px; - border-bottom: 2px solid rgba(129, 161, 193, 0.5); + border-bottom: 2px solid rgba(53, 167, 124, 0.5); color: #ffffff; transition-property: background-color; transition-duration: .5s; @@ -59,12 +59,12 @@ button:hover { } #tags button.focused { - background-color: #64727D; + background-color: #3a464c; box-shadow: inset 0 -3px #ffffff; } #tags button.urgent { - background-color: #eb4d4b; + background-color: #d3c6aa; } #clock, @@ -81,7 +81,7 @@ button:hover { margin: 0 3px; padding: 0 8px; color: #ffffff; - border: 2px solid #81a1c1; + border: 2px solid #35a77c; } #cpu, @@ -100,11 +100,16 @@ button:hover { #network:hover, #pulseaudio:hover, #mpd:hover { - border: 2px solid #eceff4; + border: 2px solid #83c092; } #window { margin: 0 4px; + font-size: 12px; +} + +#mpd { + font-size: 11px; } @keyframes blink { diff --git a/wofi/style.css b/wofi/style.css index a43aa08..fbb01d0 100644 --- a/wofi/style.css +++ b/wofi/style.css @@ -1,13 +1,13 @@ #expander-box, #window, #input { - background-color: rgba(44, 37, 46, 0.7); + background-color: rgba(50, 70, 76, 0.5); border-radius: 0; color: white; - font-family: SourceCodePro; - font-size: 11pt; + font-family: FantasqueSansM Nerd Font; + font-size: 16px; } #window, #input { - border: 2px solid #81a1c1; + border: 2px solid #35a77c; } #expander-box { @@ -16,8 +16,8 @@ } #entry:selected { - background-color: #2c3746; - border-top: 2px solid #eceff4; - border-bottom: 2px solid #eceff4; + background-color: #3a464c; + border-top: 2px solid #83c092; + border-bottom: 2px solid #83c092; border-radius: 0; }