diff --git a/colors/paper b/colors/paper new file mode 100644 index 0000000..c53ccc9 --- /dev/null +++ b/colors/paper @@ -0,0 +1,42 @@ +#!/bin/bash + +declare -A COLORS + +COLORS=(\ + [color0]="#000000" \ + [color1]="#CC3E28" \ + [color2]="#216609" \ + [color3]="#B58900" \ + [color4]="#1E6FCC" \ + [color5]="#5C21A5" \ + [color6]="#158C86" \ + [color7]="#FFFFFF" \ + [color8]="#555555" \ + [color9]="#CC3E28" \ + [color10]="#216609" \ + [color11]="#B58900" \ + [color12]="#1E6FCC" \ + [color13]="#5C21A5" \ + [color14]="#158c86" \ + [color15]="#3E4452" \ + [background]="#F2EEDE" \ + [lightbackground]="${COLORS[color7]}" \ + [foreground]="#000000" \ + [darkforeground]="${COLORS[color8]}" \ + [red]="${COLORS[color1]}" \ + [green]="${COLORS[color2]}" \ + [yellow]="${COLORS[color3]}" \ + [blue]="${COLORS[color4]}" \ + [purple]="${COLORS[color5]}" \ + [magenta]="${COLORS[color5]}" \ + [cyan]="${COLORS[color6]}" \ + [orange]="${COLORS[color3]}" \ + [currentline]="${COLORS[color8]}" \ + [selection]="#D8D5C7" \ + [comment]="${COLORS[darkforeground]}" \ + [cursor]="${COLORS[foreground]}" \ +) + +VIMCOLORSCHEME="paper" +VIMLIGHTLINE="nord" +VIMBACKGROUND="light" diff --git a/template/environment/.aliasrc b/template/environment/.aliasrc index 6f52b96..453b6f5 100644 --- a/template/environment/.aliasrc +++ b/template/environment/.aliasrc @@ -13,8 +13,6 @@ alias \ # Color alias \ - ls="ls -hN --group-directories-first --color=auto" \ - ll="ls -lahN --group-directories-first --color=auto" \ grep="grep -i --color=auto" \ Grep="grep --color=auto" \ diff="diff --color=auto" @@ -24,11 +22,12 @@ alias startx="startx ~/.xinitrc" # Improved coreutils alias \ - ls="ls-icons" \ + ls="ls-icons -hN --group-directories-first --color=auto" \ + ll="ls-icons -lahN --group-directories-first --color=auto" \ cat="bat" \ top="gotop"\ cp="advcp -pi" \ - mv="advmv -pi" + mv="advmv -gi" # Other software alias \ diff --git a/template/environment/.envrc b/template/environment/.envrc index 3cd7282..13bb988 100644 --- a/template/environment/.envrc +++ b/template/environment/.envrc @@ -52,10 +52,10 @@ n() { } export NNN_BMS='D:~/Documents;n:~/Nextcloud;d:~/Downloads/;s:~/Sandbox;p:~/Pictures' -export NNN_SSHFS="sshfs -o follow_symlinks" # make sshfs follow symlinks on the remote -export NNN_COLORS="2136" # use a different color for each context -export NNN_TRASH=1 # trash (needs trash-cli) instead of delete -export NNN_PLUG='p:preview-tabbed;m:nmount;b:bookmarks;c:chksum;l:launch;n:nuke' +export NNN_SSHFS="sshfs -o follow_symlinks" # make sshfs follow symlinks on the remote +export NNN_COLORS="2136" # use a different color for each context +export NNN_TRASH=1 # trash (needs trash-cli) instead of delete +export NNN_PLUG='p:preview-tabbed;m:nmount;c:chksum;l:launch;n:nuke;d:dragdrop' # fzf export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""' diff --git a/template/i3/.config/i3/config b/template/i3/.config/i3/config index c34dffb..63798cf 100755 --- a/template/i3/.config/i3/config +++ b/template/i3/.config/i3/config @@ -153,6 +153,8 @@ bindsym $mod+Shift+p exec --no-startup-id ~/.bin/rofi-passmenu bindsym $mod+p exec --no-startup-id ~/.bin/rofi-xrandr bindsym $mod+Shift+c exec --no-startup-id ~/.bin/rofi-project +# nnn +bindsym $mod+n exec --no-startup-id ~/.bin/nnnfm ############## # Workspaces # @@ -194,6 +196,7 @@ assign [class="^Nautilus$"] → $ws1 assign [class="^pcmanfm$"] → $ws1 assign [class="^Pcmanfm$"] → $ws1 assign [class="^Thunar$"] → $ws1 +assign [class="^nnn$"] → $ws1 assign [class="^Firefox$"] → $ws2 assign [class="^Chromium$" window_role="^browser$"] → $ws2 diff --git a/template/kitty/.config/kitty/kitty.conf b/template/kitty/.config/kitty/kitty.conf index 77f8a95..bfc0613 100644 --- a/template/kitty/.config/kitty/kitty.conf +++ b/template/kitty/.config/kitty/kitty.conf @@ -69,7 +69,7 @@ adjust_column_width 0 #: symbol_map codepoints Font Family Name -disable_ligatures never +disable_ligatures always #: Choose how you want to handle multi-character ligatures. The #: default is to always render them. You can tell kitty to not render @@ -372,7 +372,7 @@ command_on_bell none #: Window layout -remember_window_size yes +remember_window_size no initial_window_width 640 initial_window_height 400 @@ -413,7 +413,7 @@ draw_minimal_borders yes #: that setting a non-zero window margin overrides this and causes all #: borders to be drawn. -window_margin_width 18 +window_margin_width 12 #: The window margin (in pts) (blank area outside the border). A #: single value sets all four sides. Two values set the vertical and diff --git a/template/nvim/.config/nvim/init.vim b/template/nvim/.config/nvim/init.vim index cd6caf3..565bfe9 100755 --- a/template/nvim/.config/nvim/init.vim +++ b/template/nvim/.config/nvim/init.vim @@ -11,6 +11,7 @@ Plug 'dracula/vim', { 'as': 'dracula' } Plug 'altercation/vim-colors-solarized' Plug 'arcticicestudio/nord-vim' Plug 'joshdick/onedark.vim' +Plug 'https://gitlab.com/yorickpeterse/vim-paper' Plug 'itchyny/lightline.vim' Plug 'daviesjamie/vim-base16-lightline' diff --git a/themes/iosevka b/themes/iosevka index 440043e..fb63adc 100644 --- a/themes/iosevka +++ b/themes/iosevka @@ -12,7 +12,7 @@ FONTBOLDITALIC="$FONT $FONTSTYLE $FONTBOLDSTYLE $FONTITALICSTYLE" ICONFONT="Noto Color Emoji" FONTSIZE="11" -TERMINAL="alacritty" +TERMINAL="kitty" declare -A POLYBAR POLYBAR=(\ diff --git a/themes/sourcecode b/themes/sourcecode new file mode 100644 index 0000000..d7274ce --- /dev/null +++ b/themes/sourcecode @@ -0,0 +1,42 @@ +#!/bin/bash + +FONT="Source Code Pro" +FONTSTYLE="Medium" +FONTBOLDSTYLE="Bold" +FONTITALICSTYLE="Italic" +FONTBOLDITALICSTYLE="$FONTBOLDSTYLE $FONTITALICSTYLE" +FONTNORMAL="$FONT $FONTSTYLE" +FONTITALIC="$FONT $FONTSTYLE $FONTITALICSTYLE" +FONTBOLD="$FONT $FONTSTYLE $FONTBOLDSTYLE" +FONTBOLDITALIC="$FONT $FONTSTYLE $FONTBOLDSTYLE $FONTITALICSTYLE" +ICONFONT="Noto Color Emoji" +FONTSIZE="11" + +TERMINAL="kitty" + +declare -A POLYBAR +POLYBAR=(\ + [modulesleft]="i3" \ + [modulescenter]="" \ + [modulesright]="eth wifi cpu memory volume batteryemoji time date xkeyboard" \ + [textoffset]="3" \ + [iconfontscale]="8" \ + [antialias]="true" \ + [bottom]="false" \ + [height]="32" \ + [i3label]="%icon%" \ + [wifidev]="wlp3s0" \ + [wifiicon]="📡" \ + [ethdev]="enp2s0" \ + [ethicon]="🔌" \ + [cpuicon]="💻" \ + [ramicon]="🧠" \ + [dateicon]="📅" \ + [timeicon]="🕖" \ + [volumeicon]="🔊" \ + [muteicon]="🔈" \ + [layouticon]="⌨️" \ + [chargingicon]="🔋⬆️" \ + [fullicon]="🔋" \ + [dischargingicon]="🔋⬇️" \ +)