diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini index 9f67a53..69025db 100644 --- a/foot/.config/foot/foot.ini +++ b/foot/.config/foot/foot.ini @@ -3,21 +3,21 @@ font=Hack Nerd Font:pixelsize=12,Font Awesome 6 Free:pixelsize=12 color=000000 ffffff [colors] -foreground=dcdccc -background=111111 -regular0=222222 -regular1=cc9393 -regular2=7f9f7f -regular3=d0bf8f -regular4=6ca0a3 -regular5=dc8cc3 -regular6=93e0e3 -regular7=dcdccc -bright0=666666 -bright1=dca3a3 -bright2=bfebbf -bright3=f0dfaf -bright4=8cd0d3 -bright5=fcace3 -bright6=b3ffff -bright7=ffffff +background=1d2021 +foreground=ebdbb2 +regular0=282828 +regular1=cc241d +regular2=98971a +regular3=d79921 +regular4=458588 +regular5=b16286 +regular6=689d6a +regular7=a89984 +bright0=928374 +bright1=fb4934 +bright2=b8bb26 +bright3=fabd2f +bright4=83a598 +bright5=d3869b +bright6=8ec07c +bright7=ebdbb2 diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index bcbd2db..dd1e89c 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -26,7 +26,8 @@ Plug 'neomutt/neomutt.vim' Plug 'kassio/neoterm' " pretty bits -Plug 'jeffkreeftmeijer/vim-dim' +Plug 'gruvbox-community/gruvbox' +Plug 'vim-airline/vim-airline' Plug 'luochen1990/rainbow' " Git @@ -44,8 +45,10 @@ call plug#end() autocmd BufRead,BufNewFile *.nasm set filetype=nasm " Theme -colorscheme dim - +set termguicolors +let g:gruvbox_contrast_dark = 'hard' +colorscheme gruvbox +let g:airline_theme = 'gruvbox' let g:rainbow_active = 1 " rainbow delimiters " langmap russian @@ -67,7 +70,6 @@ let maplocalleader = "\\" set nobackup nowritebackup set noswapfile -set guicursor= " autosmartident set ai @@ -148,6 +150,3 @@ match RedundantSpaces /\s\+$/ " fzf nmap f :Files nmap b :Buffers - -" set terminal title -set title diff --git a/sway/.config/i3status-rust/config.toml b/sway/.config/i3status-rust/config.toml index 26c6f16..2418ac5 100644 --- a/sway/.config/i3status-rust/config.toml +++ b/sway/.config/i3status-rust/config.toml @@ -1,5 +1,7 @@ [theme] -name = "foot.toml" +name = "gruvbox-dark" +[theme.overrides] +idle_bg = "#1d2021" [icons] name = "awesome6" @@ -11,7 +13,13 @@ inboxes = ["/home/grue/mail/mail@oxapentane.com/INBOX", "/home/grue/mail/mail@ox threshold_warning = 1 threshold_critical = 10 display_type = "new" -on_click = "foot mbsync -a" +on_click = "foot neomutt" + +[[block]] +block = "backlight" +minimum = 5 +maximum = 100 +cycle = [ 100, 50, 10 ] [[block]] block = "net" diff --git a/sway/.config/rofi/config.rasi b/sway/.config/rofi/config.rasi new file mode 100644 index 0000000..5d72d36 --- /dev/null +++ b/sway/.config/rofi/config.rasi @@ -0,0 +1,7 @@ +configuration { + modi: "drun,ssh,run,combi"; + font: "Hack 11"; + combi-modi: "drun,ssh"; + terminal: "foot"; +} +@theme "gruvbox-dark-soft" diff --git a/sway/.config/sway/config b/sway/.config/sway/config index d068535..993b61d 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -18,7 +18,7 @@ set $term foot # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. -set $menu wofi --show drun -i | xargs swaymsg exec -- +set $menu rofi -show combi | xargs swaymsg exec -- ### Output configuration # @@ -74,6 +74,9 @@ focus_follows_mouse no # Start a terminal bindsym --to-code $mod+Return exec $term + # Start an editor + bindsym --to-code $mod+z exec emacsclient -a="" --create-frame + # Kill focused window bindsym --to-code $mod+Shift+q kill @@ -101,7 +104,6 @@ focus_follows_mouse no bindsym --to-code XF86AudioLowerVolume exec 'pamixer -d 1' bindsym --to-code XF86AudioMute exec 'pamixer -t' bindsym --to-code $mod+Delete exec 'swaylock -eFfk -i ~/.config/sway/wall.jpg -s fill' - #bindsym --to-code $mod+Mod1+p exec 'flameshot gui' bindsym --to-code $mod+p exec 'grim -g "$(slurp)" - | wl-copy' bindsym --to-code $mod+Mod1+p exec 'grim -g "$(slurp)" ~/Pictures/$(date +"%Y-%m-%d-%H-%M-%S").png' @@ -220,7 +222,7 @@ mode "resize" { bindsym --to-code $mod+r mode "resize" ## Styling: colors -include colors +include gruvbox ## Window styling # Border BG Text Indicator Child Border @@ -233,7 +235,7 @@ client.focused $color05 $color05 $color00 $color01 $color05 # Read `man 5 sway-bar` for more information about this section. bar { position top - font pango:Hack, Font Awesome 6 Free 9 + font pango:Hack, Font Awesome 6 Free 8 icon_theme "Adwaita" status_command /run/current-system/sw/bin/i3status-rs colors { @@ -249,9 +251,10 @@ bar { # default border default_border pixel 2 # Set font -font pango:Hack, Font Awesome 6 Free 9 +font pango:Hack, Font Awesome 6 Free 8 exec nextcloud --background exec iwgtk -i +exec blueman-applet include /etc/sway/config.d/* diff --git a/sway/.config/sway/gruvbox b/sway/.config/sway/gruvbox new file mode 100644 index 0000000..09a1337 --- /dev/null +++ b/sway/.config/sway/gruvbox @@ -0,0 +1,18 @@ +set $colorBG #1d2021 +set $colorFG #ebdbb2 +set $color00 #282828 +set $color01 #cc241d +set $color02 #98971a +set $color03 #d79921 +set $color04 #458588 +set $color05 #b16286 +set $color06 #689d6a +set $color07 #a89984 +set $color10 #928374 +set $color11 #fb4934 +set $color12 #b8bb26 +set $color13 #fabd2f +set $color14 #83a598 +set $color15 #d3869b +set $color16 #8ec07c +set $color17 #ebdbb2