diff options
author | Süleyman Fərəcli <suleyman@farajli.net> | 2025-06-20 17:22:54 +0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-06-20 17:22:54 +0400 |
commit | eb312b971b85c117e02799d72d6dfdcc15c478ed (patch) | |
tree | 210d516c35c370cb851c59c0b0d177128e109552 | |
parent | 4d14ace3c5180ec0827408c1222cb35fe27cf484 (diff) | |
parent | f2ca88c01f88fe3234b196202cd86b19cd9b72bb (diff) |
Merge pull request #11 from sfarajli/dev
Dev
-rw-r--r-- | Makefile | 12 | ||||
-rw-r--r-- | config/bash/bashrc | 2 | ||||
-rw-r--r-- | config/git/gitconfig | 5 | ||||
-rw-r--r-- | config/mimeapps.list | 43 | ||||
-rw-r--r-- | config/nvim/init.lua | 16 | ||||
-rw-r--r-- | config/shell/aliasrc | 86 | ||||
-rw-r--r-- | config/vim/vimrc | 52 | ||||
-rw-r--r-- | config/x11/themes/catppuccin | 28 | ||||
-rw-r--r-- | config/x11/themes/light-nord | 28 | ||||
-rw-r--r-- | config/x11/themes/material | 28 | ||||
-rw-r--r-- | config/x11/themes/nord | 25 | ||||
-rw-r--r-- | config/x11/themes/one-dark | 27 | ||||
-rw-r--r-- | config/x11/themes/one-light | 27 | ||||
-rw-r--r-- | config/x11/themes/solarized-dark | 27 | ||||
-rw-r--r-- | config/x11/themes/solarized-light | 27 | ||||
-rw-r--r-- | config/x11/xinitrc | 15 | ||||
l--------- | config/x11/xresources | 1 | ||||
-rwxr-xr-x | config/zathura/zathurarc | 115 | ||||
-rwxr-xr-x | config/zsh/zshrc | 25 | ||||
-rwxr-xr-x | scripts/br | 4 | ||||
-rwxr-xr-x | scripts/nospac | 3 | ||||
-rwxr-xr-x | scripts/nsend | 7 | ||||
-rwxr-xr-x | scripts/qw | 7 | ||||
-rwxr-xr-x | scripts/sdev | 13 | ||||
-rwxr-xr-x | scripts/shot | 7 | ||||
-rwxr-xr-x | scripts/slight | 13 | ||||
-rwxr-xr-x | scripts/svol | 13 | ||||
-rwxr-xr-x | scripts/swall | 7 |
28 files changed, 515 insertions, 148 deletions
@@ -4,7 +4,7 @@ DWM = dwm-farajli-6.5 ST = st-farajli-0.9.2 DMENU = dmenu-farajli-5.3 SLSTATUS = slstatus-farajli-1.0 - + CONFDIR = $(HOME)/.config MUSICDIR = $(HOME)/music PROJDIR = $(HOME)/proj @@ -48,8 +48,10 @@ config: $(LINK) $(CONFDIR)/shell/profile $(ZPROFILE) git: - sed '/^# signingkey =/d' config/git/gitconfig > $(GITCONFIG) + sed '/# signingkey = <to be set manually>/d' config/git/gitconfig > $(GITCONFIG) + @echo "#####################################################################" @echo "Warning: Git commit/tag signing is enabled but signingKey is not set." >&2 + @echo "#####################################################################" @echo "Configure it manually using:" >&2 @echo " gpg --list-secret-keys --keyid-format=long" >&2 @echo " git config --global user.signingkey <YOUR_KEY_ID>" >&2 @@ -84,11 +86,11 @@ $(ST): $(ST).tar.gz $(DMENU): $(DMENU).tar.gz $(SLSTATUS): $(SLSTATUS).tar.gz -$(DWM) $(ST) $(DMENU) $(SLSTATUS): +$(DWM) $(ST) $(DMENU) $(SLSTATUS): tar -xf $< cd $@; PREFIX=~/.local make install -check: +check: @-./dep.sh dist: clean @@ -102,6 +104,6 @@ clean: $(DWM) $(DWM).tar.gz \ $(ST) $(ST).tar.gz \ $(DMENU) $(DMENU).tar.gz \ - $(SLSTATUS) $(SLSTATUS).tar.gz + $(SLSTATUS) $(SLSTATUS).tar.gz .PHONY: all config desktop scripts server arch-linux directory full check diff --git a/config/bash/bashrc b/config/bash/bashrc index f143fd2..8396d9f 100644 --- a/config/bash/bashrc +++ b/config/bash/bashrc @@ -13,7 +13,7 @@ PS1='\[\e[01;31m\]$(code=$?; [ "$code" -ne 0 ] && echo "[${code}] ")\[\e[00m\]\[ if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ];then source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" -else +else # Fallback aliases where aliasrc isn't present (e.g., on servers) alias \ vi="vim" \ diff --git a/config/git/gitconfig b/config/git/gitconfig index 8a69554..bf61c21 100644 --- a/config/git/gitconfig +++ b/config/git/gitconfig @@ -5,9 +5,12 @@ branch = false [alias] - co = checkout + a = add br = branch ci = commit + co = checkout + df = diff + ds = diff --staged st = status pushall = "!for r in $(git remote); do git push --all \"$r\"; done" diff --git a/config/mimeapps.list b/config/mimeapps.list index cab0678..976b369 100644 --- a/config/mimeapps.list +++ b/config/mimeapps.list @@ -1,17 +1,36 @@ [Default Applications] application/pdf=org.pwmt.zathura.desktop -[Default Applications] -image/jpeg=sxiv.desktop -image/png=sxiv.desktop -image/jpg=sxiv.desktop - -[Default Applications] -text/plain=nvim.desktop +image/jpeg=nsxiv.desktop;sxiv.desktop; +image/png=nsxiv.desktop;sxiv.desktop; +image/gif=nsxiv.desktop;sxiv.desktop; +image/svg+xml=nsxiv.desktop;sxiv.desktop; +image/jxl=nsxiv.desktop;sxiv.desktop; +image/webp=nsxiv.desktop;sxiv.desktop; +image/tiff=nsxiv.desktop;sxiv.desktop; +image/heif=nsxiv.desktop;sxiv.desktop; +image/heic=nsxiv.desktop;sxiv.desktop; +image/avif=nsxiv.desktop;sxiv.desktop; +image/x-icon=nsxiv.desktop;sxiv.desktop; +image/bmp=nsxiv.desktop;sxiv.desktop; +image/x-portable-anymap=nsxiv.desktop;sxiv.desktop; +image/x-portable-bitmap=nsxiv.desktop;sxiv.desktop; +image/x-portable-pixmap=nsxiv.desktop;sxiv.desktop; +image/x-tga=nsxiv.desktop;sxiv.desktop; +image/qoi=nsxiv.desktop;sxiv.desktop; +image/ff=nsxiv.desktop;sxiv.desktop; -[Default Applications] -text/html=org.qutebrowser.qutebrowser.desktop +text/plain=nvim.desktop;vim.desktop; -[Default Application] -x-scheme-handler/http=org.qutebrowser.qutebrowser.desktop -x-scheme-handler/https=org.qutebrowser.qutebrowser.desktop +video/mp4=mpv.desktop; +video/webm=mpv.desktop; +video/x-matroska=mpv.desktop; +video/x-msvideo=mpv.desktop; +video/ogg=mpv.desktop; +video/mpeg=mpv.desktop; +video/3gpp=mpv.desktop; +video/quicktime=mpv.desktop; +video/x-flv=mpv.desktop; +video/x-ms-wmv=mpv.desktop; +video/x-ms-asf=mpv.desktop; +video/x-ms-dvr=mpv.desktop; diff --git a/config/nvim/init.lua b/config/nvim/init.lua index ea8a3d2..dc96c1a 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -3,7 +3,7 @@ require("plugins") vim.g.mapleader = ' ' vim.opt.background = "dark" vim.opt.clipboard = "unnamedplus" -- Use system clipboard -vim.opt.list = true -- Show spaces, tabs, etc. +-- vim.opt.list = true -- Show spaces, tabs, etc. vim.opt.number = true vim.opt.relativenumber = true vim.opt.shortmess:append("I") -- Disable intro message @@ -40,16 +40,24 @@ vim.api.nvim_create_autocmd("FileType", { end, }) +-- Enable spellcheck for certain file types +vim.api.nvim_create_autocmd("FileType", { + pattern = { + "gitcommit", "markdown", "text", "rst", + "asciidoc", "org", "norg", "latex", "tex", "mail", "pandoc" + }, + callback = function() + vim.opt_local.spell = true + end, +}) -- NOTE: On some terminal emulators, the keybinds -- <C-j> and <C-k> don't work either in normal or insert mode. -- Tabs vim.keymap.set('n', '<C-t>', '<cmd>tabnew<CR>' , { noremap = true, silent = true }) -vim.keymap.set('n', 'H' , '<cmd>wincmd h<CR>', { noremap = true, silent = true }) vim.keymap.set('n', 'J' , '<cmd>tabn<CR>' , { noremap = true, silent = true }) vim.keymap.set('n', 'K' , '<cmd>tabp<CR>' , { noremap = true, silent = true }) -vim.keymap.set('n', 'L' , '<cmd>wincmd l<CR>', { noremap = true, silent = true }) -- Windows vim.keymap.set('n', '<C-Down>' , '<cmd>split<CR>' , { noremap = true, silent = true }) @@ -71,4 +79,4 @@ vim.keymap.set('n', '<leader>e', '<cmd>Neotree toggle right<CR>', { noremap = tr -- Other vim.keymap.set('n', '<leader><leader>', '<cmd>w!<CR>' , { noremap = true, silent = true }) -vim.keymap.set('n', '<leader>q' , '<cmd>wq!<CR>', { noremap = true, silent = true }) +vim.keymap.set('n', '<leader>q' , '<cmd>wqa!<CR>', { noremap = true, silent = true }) diff --git a/config/shell/aliasrc b/config/shell/aliasrc index a95f6f1..6f822e9 100644 --- a/config/shell/aliasrc +++ b/config/shell/aliasrc @@ -1,57 +1,63 @@ #!/bin/sh -[ -f $XINITRC ] && alias startx="startx $XINITRC" +[ -f "${XINITRC}" ] && alias startx='startx ${XINITRC}' [ -x "$(command -v vim)" ] && alias vi="vim" [ -x "$(command -v nvim)" ] && alias vi="nvim" [ -x "$(command -v neomutt)" ] && alias mutt="neomutt" -alias ls="ls --color=auto --group-directories-first -p" -alias ip="ip -color=auto" -alias diff="diff --color=auto" -alias grep="grep --color=auto" -alias ping="ping -c 2" -alias clear="clear -x" -alias open="xdg-open" -alias lf="lfcd" -alias py="python3" -alias makeb="make -C ../" -alias fren="trans fr:en" -alias enfr="trans en:fr" -alias clip="xclip -selection clipboard" -alias push="git remote show | xargs -I remote git push remote master" # push master branch of all remotes +# TODO: Deal with the flags that are not supported on BSD +# Older versions of ip doesn't support -color flg, so don't use it +alias \ + clear="clear -x" \ + clip="xclip -selection clipboard" \ + diff="diff --color=auto" \ + enfr="trans en:fr" \ + fren="trans fr:en" \ + g="git" \ + grep="grep --color=auto" \ + lf="lfcd" \ + ls="ls --color=auto --group-directories-first -p" \ + makeb="make -C ../" \ + open="xdg-open" \ + ping="ping -c 2" \ + py="python3" \ + push="git remote show | xargs -I remote git push remote master" # push master branch of all remotes # Occasionally mistyped commands -alias suod="sudo" -alias maek="make" -alias meak="make" -alias sl="ls --color=auto --group-directories-first -p" -alias claer="clear -x" -alias clera="clear -x" -alias gti="git" +alias \ + claer="clear -x" \ + clera="clear -x" \ + gti="git" \ + maek="make" \ + meak="make" \ + suod="sudo" \ + sl="ls --color=auto --group-directories-first -p" # Directory change aliases -alias gp="cd ~/proj" -alias gt="cd ~/tproj" -alias gc="cd ~/.config" -alias gu="cd /usr/local/bin" +alias \ + gk="cd /tmp" \ + gp="cd ~/proj" \ + gt="cd ~/tproj" \ + gw="cd ~/work" # Init system aliases if [ -x "$(command -v systemctl)" ]; then - alias systemctl="sudo systemctl" - alias net="sudo systemctl start NetworkManager" - alias is="systemctl stop NetworkManager" - alias blue="sudo systemctl start bluetooth" - alias red="sudo systemctl stop bluetooth" - + alias \ + blue="sudo systemctl start bluetooth" \ + net="sudo systemctl start NetworkManager" \ + netstop="systemctl stop NetworkManager" \ + red="sudo systemctl stop bluetooth" \ + systemctl="sudo systemctl" elif [ -x "$(command -v rc-service)" ]; then - alias rc-service="sudo rc-service" - alias net="sudo rc-service NetworkManager start" - alias is="sudo rc-service NetworkManager stop" - alias blue="sudo rc-service bluetooth start" - alias red="sudo rc-service bluetooth stop" - + alias \ + blue="sudo rc-service bluetooth start" \ + net="sudo rc-service NetworkManager start" \ + netstop="sudo rc-service NetworkManager stop" \ + rc-service="sudo rc-service" \ + red="sudo rc-service bluetooth stop" fi # Arch linux specific aliases -alias pacman="sudo pacman --color=always" -alias arch-wiki="cd /usr/share/doc/arch-wiki/html/en/" +alias \ + pacman="sudo pacman --color=always" \ + arch-wiki="cd /usr/share/doc/arch-wiki/html/en/" diff --git a/config/vim/vimrc b/config/vim/vimrc index 7c66eef..a7d1c0c 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -1,15 +1,16 @@ -" Suleyman's minimal vim config for servers -" at https://git.farajli.net/slcf - let mapleader = " " +set background=dark +set clipboard=unnamedplus " Use system clipboard +" set list " Show spaces, tabs, etc. set number -set scrolloff=5 " Smooth scroll -set clipboard=unnamedplus " Use system clipboard -set shortmess+=I " Deactivate intro text -set fillchars=eob:\ " Remove "~" for empty lines (`eob:\` must end with a trailing space) -:set nowrap " Disable wrapping -autocmd BufwritePost * %s/\s\+$//e " Remove useless trailing spaces when saving -autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Disable autocomments +set relativenumber +set shortmess+=I " Deactivate intro text +set nowrap " Disable wrapping +set fillchars=eob:\ " Remove "~" for empty lines (`eob:\` must end with a trailing space) + +autocmd BufwritePost * %s/\s\+$//e " Remove trailing spaces when saving +" Disable autocomments +autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Different cursor shapes for insert and normal modes let &t_SI = "\e[6 q" @@ -18,19 +19,26 @@ set ttimeout set ttimeoutlen=1 set ttyfast -" Normal mode maps -map <leader><leader> :w!<CR> -map <leader>q :wqa!<CR> -map <C-t> :tabnew<CR> -map <C-w> :tabclose!<CR> -map J :tabn <CR> -map K :tabp <CR> +" Tabs +nnoremap <silent> <C-t> :tabnew<CR> +nnoremap <silent> J :tabn<CR> +nnoremap <silent> K :tabp<CR> -" Insert mode maps +" Windows +nnoremap <silent> <C-Down> :split<CR> +nnoremap <silent> <C-Right> :vsplit<CR> +nnoremap <C-h> <C-w>h +nnoremap <C-j> <C-w>j +nnoremap <C-k> <C-w>k +nnoremap <C-l> <C-w>l + +" Imitate normal mode in insert mode inoremap <C-h> <Left> +inoremap <C-j> <Down> +inoremap <C-k> <Up> inoremap <C-l> <Right> -inoremap <C-j> <C-o>gj -inoremap <C-k> <C-o>gk -inoremap <C-o> <C-o>o +inoremap <C-Space> <Esc> -set background=dark +" Other +nnoremap <silent> <leader><leader> :w!<CR> +nnoremap <silent> <leader>q :wqa!<CR> diff --git a/config/x11/themes/catppuccin b/config/x11/themes/catppuccin new file mode 100644 index 0000000..addc742 --- /dev/null +++ b/config/x11/themes/catppuccin @@ -0,0 +1,28 @@ +! Catppuccin Macchiato Palette (soft pastel/dark) + +*color0: #1e1e2e ! background dark purple-gray +*color1: #f38ba8 ! pink (red) +*color2: #a6e3a1 ! green +*color3: #f9e2af ! yellow +*color4: #89b4fa ! blue +*color5: #f5c2e7 ! magenta +*color6: #94e2d5 ! cyan +*color7: #cdd6f4 ! light text + +*color8: #585b70 ! dark gray (bright black) +*color9: #f38ba8 ! bright pink (red) +*color10: #a6e3a1 ! bright green +*color11: #f9e2af ! bright yellow +*color12: #89b4fa ! bright blue +*color13: #f5c2e7 ! bright magenta +*color14: #94e2d5 ! bright cyan +*color15: #f7faff ! bright white + +XTerm.vt100.background: #1e1e2e +XTerm.vt100.foreground: #cdd6f4 + +Sxiv.background: #1e1e2e +Sxiv.foreground: #cdd6f4 + +Nsxiv.window.background: #1e1e2e +Nsxiv.window.foreground: #cdd6f4 diff --git a/config/x11/themes/light-nord b/config/x11/themes/light-nord new file mode 100644 index 0000000..085b5d8 --- /dev/null +++ b/config/x11/themes/light-nord @@ -0,0 +1,28 @@ +! Light Nord Theme + +*color0: #d8dee9 ! nord4 - light background base +*color1: #bf616a ! nord11 - red +*color2: #a3be8c ! nord14 - green +*color3: #ebcb8b ! nord13 - yellow +*color4: #81a1c1 ! nord10 - blue +*color5: #b48ead ! nord15 - magenta +*color6: #88c0d0 ! nord8 - cyan +*color7: #434c5e ! nord1 - dark gray (text) +*color8: #e5e9f0 ! nord6 - bright background (lighter) +*color9: #bf616a ! nord11 - bright red +*color10: #a3be8c ! nord14 - bright green +*color11: #ebcb8b ! nord13 - bright yellow +*color12: #81a1c1 ! nord10 - bright blue +*color13: #b48ead ! nord15 - bright magenta +*color14: #8fbcbb ! nord7 - bright cyan +*color15: #2e3440 ! nord0 - dark text for contrast + +! Background and foreground for terminal and apps +XTerm.vt100.background: #d8dee9 ! light background +XTerm.vt100.foreground: #434c5e ! dark text + +Sxiv.background: #d8dee9 +Sxiv.foreground: #434c5e + +Nsxiv.window.background: #d8dee9 +Nsxiv.window.foreground: #434c5e diff --git a/config/x11/themes/material b/config/x11/themes/material new file mode 100644 index 0000000..a159177 --- /dev/null +++ b/config/x11/themes/material @@ -0,0 +1,28 @@ +! Material Theme (default/dark variant) + +*color0: #263238 ! background dark blue-gray +*color1: #e06c75 ! red (error) +*color2: #98c379 ! green (success) +*color3: #e5c07b ! yellow (warning) +*color4: #61afef ! blue (info) +*color5: #c678dd ! magenta (purple) +*color6: #56b6c2 ! cyan +*color7: #abb2bf ! light gray (foreground) + +*color8: #5c6370 ! dark gray (bright black) +*color9: #e06c75 ! bright red +*color10: #98c379 ! bright green +*color11: #e5c07b ! bright yellow +*color12: #61afef ! bright blue +*color13: #c678dd ! bright magenta +*color14: #56b6c2 ! bright cyan +*color15: #ffffff ! white + +XTerm.vt100.background: #263238 +XTerm.vt100.foreground: #abb2bf + +Sxiv.background: #263238 +Sxiv.foreground: #abb2bf + +Nsxiv.window.background: #263238 +Nsxiv.window.foreground: #abb2bf diff --git a/config/x11/themes/nord b/config/x11/themes/nord new file mode 100644 index 0000000..b3b1fb9 --- /dev/null +++ b/config/x11/themes/nord @@ -0,0 +1,25 @@ +! nord theme colors +*color0: #2e3440 +*color1: #bf616a +*color2: #a3be8c +*color3: #ebcb8b +*color4: #81a1c1 +*color5: #b48ead +*color6: #88c0d0 +*color7: #e5e9f0 +*color8: #4c566a +*color9: #bf616a +*color10: #a3be8c +*color11: #ebcb8b +*color12: #81a1c1 +*color13: #b48ead +*color14: #8fbcbb +*color15: #eceff4 + +Sxiv.background: #2e3440 +Sxiv.foreground: #d8dee9 +Nsxiv.window.background: #2e3440 +Nsxiv.window.foreground: #d8dee9 + +XTerm.vt100.background: #2e3440 +XTerm.vt100.foreground: #d8dee9 diff --git a/config/x11/themes/one-dark b/config/x11/themes/one-dark new file mode 100644 index 0000000..99e2564 --- /dev/null +++ b/config/x11/themes/one-dark @@ -0,0 +1,27 @@ +! One Dark Theme (dark) + +*color0: #282c34 ! background +*color1: #e06c75 ! red +*color2: #98c379 ! green +*color3: #e5c07b ! yellow +*color4: #61afef ! blue +*color5: #c678dd ! magenta +*color6: #56b6c2 ! cyan +*color7: #abb2bf ! light gray (foreground) +*color8: #5c6370 ! dark gray +*color9: #e06c75 ! bright red +*color10: #98c379 ! bright green +*color11: #e5c07b ! bright yellow +*color12: #61afef ! bright blue +*color13: #c678dd ! bright magenta +*color14: #56b6c2 ! bright cyan +*color15: #ffffff ! white + +XTerm.vt100.background: #282c34 +XTerm.vt100.foreground: #abb2bf + +Sxiv.background: #282c34 +Sxiv.foreground: #abb2bf + +Nsxiv.window.background: #282c34 +Nsxiv.window.foreground: #abb2bf diff --git a/config/x11/themes/one-light b/config/x11/themes/one-light new file mode 100644 index 0000000..dea790d --- /dev/null +++ b/config/x11/themes/one-light @@ -0,0 +1,27 @@ +! One Light Theme (light) + +*color0: #fafafa ! background +*color1: #e45649 ! red +*color2: #50a14f ! green +*color3: #c18401 ! yellow +*color4: #0184bc ! blue +*color5: #a626a4 ! magenta +*color6: #0997b3 ! cyan +*color7: #383a42 ! dark gray (foreground) +*color8: #a0a1a7 ! light gray +*color9: #e45649 ! bright red +*color10: #50a14f ! bright green +*color11: #c18401 ! bright yellow +*color12: #0184bc ! bright blue +*color13: #a626a4 ! bright magenta +*color14: #0997b3 ! bright cyan +*color15: #fafafa ! white + +XTerm.vt100.background: #fafafa +XTerm.vt100.foreground: #383a42 + +Sxiv.background: #fafafa +Sxiv.foreground: #383a42 + +Nsxiv.window.background: #fafafa +Nsxiv.window.foreground: #383a42 diff --git a/config/x11/themes/solarized-dark b/config/x11/themes/solarized-dark new file mode 100644 index 0000000..a76850a --- /dev/null +++ b/config/x11/themes/solarized-dark @@ -0,0 +1,27 @@ +! Solarized Dark + +*color0: #073642 +*color1: #dc322f +*color2: #859900 +*color3: #b58900 +*color4: #268bd2 +*color5: #d33682 +*color6: #2aa198 +*color7: #eee8d5 +*color8: #002b36 +*color9: #cb4b16 +*color10: #586e75 +*color11: #657b83 +*color12: #839496 +*color13: #6c71c4 +*color14: #93a1a1 +*color15: #fdf6e3 + +XTerm.vt100.background: #002b36 +XTerm.vt100.foreground: #839496 + +Sxiv.background: #002b36 +Sxiv.foreground: #839496 + +Nsxiv.window.background: #002b36 +Nsxiv.window.foreground: #839496 diff --git a/config/x11/themes/solarized-light b/config/x11/themes/solarized-light new file mode 100644 index 0000000..8a89223 --- /dev/null +++ b/config/x11/themes/solarized-light @@ -0,0 +1,27 @@ +! Solarized Light + +*color0: #eee8d5 +*color1: #dc322f +*color2: #859900 +*color3: #b58900 +*color4: #268bd2 +*color5: #d33682 +*color6: #2aa198 +*color7: #073642 +*color8: #fdf6e3 +*color9: #cb4b16 +*color10: #586e75 +*color11: #657b83 +*color12: #839496 +*color13: #6c71c4 +*color14: #93a1a1 +*color15: #002b36 + +XTerm.vt100.background: #fdf6e3 +XTerm.vt100.foreground: #586e75 + +Sxiv.background: #fdf6e3 +Sxiv.foreground: #586e75 + +Nsxiv.window.background: #fdf6e3 +Nsxiv.window.foreground: #586e75 diff --git a/config/x11/xinitrc b/config/x11/xinitrc index 3cf201f..fee3943 100644 --- a/config/x11/xinitrc +++ b/config/x11/xinitrc @@ -1,15 +1,13 @@ #!/bin/sh -userresources="$HOME/config/x11/Xresources" +userresources="$HOME/.config/x11/xresources" # merge in defaults and keymaps - if [ -f "$userresources" ]; then xrdb -merge "$userresources" fi # start some nice programs - if [ -d /etc/X11/xinit/xinitrc.d ] ; then for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do [ -x "$f" ] && . "$f" @@ -17,13 +15,12 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -dunst & -picom & setxkbmap -option "caps:ctrl_modifier" # change caps_lock to ctrl -slstatus & -swall # set wallpaper -xgamma -gamma 0.8 # change gamma xset r rate 300 50 # increase cursor speed xset s off && xset -dpms # disable screen blackening - +xgamma -gamma 0.8 # change gamma +swall # set wallpaper +dunst & +picom & +slstatus & exec dwm diff --git a/config/x11/xresources b/config/x11/xresources new file mode 120000 index 0000000..2ed52bc --- /dev/null +++ b/config/x11/xresources @@ -0,0 +1 @@ +themes/one-dark
\ No newline at end of file diff --git a/config/zathura/zathurarc b/config/zathura/zathurarc index 0e3d717..ea95f22 100755 --- a/config/zathura/zathurarc +++ b/config/zathura/zathurarc @@ -1,3 +1,118 @@ +# NORD (Dark) +# set background "#2e3440" +# set foreground "#d8dee9" +# set highlight "#88c0d0" +# set selection "#434c5e" +# set statusbar-bg "#3b4252" +# set statusbar-fg "#d8dee9" +# set inputbar-bg "#3b4252" +# set inputbar-fg "#d8dee9" +# set error-fg "#bf616a" +# set recolor-lightcolor "#2e3440" +# set recolor-darkcolor "#d8dee9" +# set default-bg "#2e3440" + +# CATPPUCCIN (Mocha) +# set background "#1e1e2e" +# set foreground "#cdd6f4" +# set highlight "#89b4fa" +# set selection "#585b70" +# set statusbar-bg "#313244" +# set statusbar-fg "#cdd6f4" +# set inputbar-bg "#313244" +# set inputbar-fg "#cdd6f4" +# set error-fg "#f38ba8" +# set recolor-lightcolor "#1e1e2e" +# set recolor-darkcolor "#cdd6f4" +# set default-bg "#1e1e2e" + +# LIGHT-NORD +# set background "#eceff4" +# set foreground "#2e3440" +# set highlight "#5e81ac" +# set selection "#d8dee9" +# set statusbar-bg "#e5e9f0" +# set statusbar-fg "#2e3440" +# set inputbar-bg "#e5e9f0" +# set inputbar-fg "#2e3440" +# set error-fg "#bf616a" +# set recolor-lightcolor "#eceff4" +# set recolor-darkcolor "#2e3440" +# set default-bg "#eceff4" + +# MATERIAL (Dark) +# set background "#263238" +# set foreground "#eeffff" +# set highlight "#82aaff" +# set selection "#37474f" +# set statusbar-bg "#2e3c43" +# set statusbar-fg "#eeffff" +# set inputbar-bg "#2e3c43" +# set inputbar-fg "#eeffff" +# set error-fg "#f07178" +# set recolor-lightcolor "#263238" +# set recolor-darkcolor "#eeffff" +# set default-bg "#263238" + +# ONE DARK +set background "#282c34" +set foreground "#abb2bf" +set highlight "#61afef" +set selection "#3e4451" +set statusbar-bg "#21252b" +set statusbar-fg "#abb2bf" +set inputbar-bg "#21252b" +set inputbar-fg "#abb2bf" +set error-fg "#e06c75" +set recolor-lightcolor "#282c34" +set recolor-darkcolor "#abb2bf" +set default-bg "#282c34" + +# ONE LIGHT +# set background "#fafafa" +# set foreground "#383a42" +# set highlight "#0184bc" +# set selection "#d0d0d0" +# set statusbar-bg "#e5e5e5" +# set statusbar-fg "#383a42" +# set inputbar-bg "#e5e5e5" +# set inputbar-fg "#383a42" +# set error-fg "#e45649" +# set recolor-lightcolor "#fafafa" +# set recolor-darkcolor "#383a42" +# set default-bg "#fafafa" + +# SOLARIZED DARK +# set background "#002b36" +# set foreground "#839496" +# set highlight "#268bd2" +# set selection "#073642" +# set statusbar-bg "#073642" +# set statusbar-fg "#839496" +# set inputbar-bg "#073642" +# set inputbar-fg "#839496" +# set error-fg "#dc322f" +# set recolor-lightcolor "#002b36" +# set recolor-darkcolor "#839496" +# set default-bg "#002b36" + +# SOLARIZED LIGHT +# set background "#fdf6e3" +# set foreground "#657b83" +# set highlight "#268bd2" +# set selection "#eee8d5" +# set statusbar-bg "#eee8d5" +# set statusbar-fg "#657b83" +# set inputbar-bg "#eee8d5" +# set inputbar-fg "#657b83" +# set error-fg "#dc322f" +# set recolor-lightcolor "#fdf6e3" +# set recolor-darkcolor "#002b36" +# set default-bg "#fdf6e3" + +set recolor-keephue +set font "Liberation Mono 9" +map n toggle_statusbar map i recolor map J zoom in map K zoom out diff --git a/config/zsh/zshrc b/config/zsh/zshrc index 892310a..4b50761 100755 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -1,5 +1,3 @@ -# Suleyman's zsh interactive shell config at "https://git.farajli.net/slcf" - PROMPT="%B%F{red}%(?..%? )%B%F{blue}%n%b%f@%m %B%~ %% %b" # Git integration @@ -20,11 +18,11 @@ autoload -U compinit zstyle ':completion:*' menu select zmodload zsh/complist compinit -_comp_options+=(globdots) # Include hidden files. +_comp_options+=(globdots) # Include hidden files. # vi mode -bindkey -v # Vi mode. -export KEYTIMEOUT=1 # Set escape delay to 0.01 sec. +bindkey -v # Vi mode. +export KEYTIMEOUT=0 # Set escape delay to 0.01 sec. # Use vim keys in tab complete menu: bindkey -M menuselect 'h' vi-backward-char @@ -49,17 +47,16 @@ zle-line-init() { echo -ne "\e[5 q" } zle -N zle-line-init -echo -ne '\e[5 q' # Use beam shape cursor on startup. -preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. - +echo -ne '\e[5 q' # Use beam shape cursor on startup. +preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. # Options -setopt autocd # Automatically cd into typed directory. -stty stop undef # Disable ctrl-s to freeze terminal. -setopt interactive_comments -unsetopt nomatch -setopt INC_APPEND_HISTORY # Add commands to history when they are run. -setopt HIST_FIND_NO_DUPS # Don't show duplicate commands when backward searching. +setopt autocd # Automatically cd into typed directory. +stty stop undef # Disable ctrl-s to freeze terminal. +setopt interactive_comments # Write comments in interactive shell +unsetopt nomatch # Allow unmatched globs without error (leave pattern as-is) +setopt INC_APPEND_HISTORY # Add commands to history when they are run. +setopt HIST_FIND_NO_DUPS # Don't show duplicate commands when backward searching. # Custom keybinds bindkey '^R' history-incremental-search-backward @@ -6,8 +6,8 @@ help() { cat << EOF ${0}: Open links from bookmarks through dmenu options: -[link] Open link - -h Print this message and exit +[link] Open link + -h Print this message and exit NOTE: bookmarks file is located at ~/.config/sites/bookmarks EOF diff --git a/scripts/nospac b/scripts/nospac index 650c216..6ba466a 100755 --- a/scripts/nospac +++ b/scripts/nospac @@ -4,9 +4,8 @@ help() { cat << EOF ${0}: Replace all the spaces in file and directory names with "_" in in the current directory. - options: - -h Print this message and exit + -h Print this message and exit EOF } diff --git a/scripts/nsend b/scripts/nsend index 5aef4fd..3d28683 100755 --- a/scripts/nsend +++ b/scripts/nsend @@ -5,11 +5,10 @@ help() { cat << EOF ${0}: Wrapper script to send notifications - options: - -s [Name] [Msg] Send Msg with Name - -s [Msg] Send Msg Without Name - -h Print this message and exit + -s [Name] [Msg] Send Msg with Name + -s [Msg] Send Msg Without Name + -h Print this message and exit EOF exit 0 @@ -6,11 +6,10 @@ help() { cat << EOF ${0}: Qemu Wrapper, very simple script for abriviating \ verbose qemu commands and options - options: - -c create an Image.img with 10G space - -r [input.iso] run input.iso - -x [input.qcow2] run input.qcow2 + -c create an Image.img with 10G space + -r [input.iso] run input.iso + -x [input.qcow2] run input.qcow2 EOF exit 0 diff --git a/scripts/sdev b/scripts/sdev index 39f22c5..c227771 100755 --- a/scripts/sdev +++ b/scripts/sdev @@ -5,15 +5,14 @@ help() { cat << EOF ${0}: Disable and Enable devices - options: - -e [dev] Enable dev - -d [dev] Disable dev - -t [dev] Toggle dev - -l List devices - -h Print this message and exit + -e [dev] Enable dev + -d [dev] Disable dev + -t [dev] Toggle dev + -l List devices + -h Print this message and exit -Note: Nondescriptive inputs may disable (or enable) unwanted devices. +Note: Nondescriptive inputs may disable/enable unwanted devices. EOF exit 0 diff --git a/scripts/shot b/scripts/shot index 4a58dd2..1d296c8 100755 --- a/scripts/shot +++ b/scripts/shot @@ -5,11 +5,10 @@ help() { cat << EOF ${0}: Wrapper script to take screenshots - options: - -d [File] Write to File - -s Select the area with the cursor - -h Print this message and exit + -d [File] Write to File + -s Select the area with the cursor + -h Print this message and exit NOTE: save directory is ~/pics/screenshots EOF diff --git a/scripts/slight b/scripts/slight index 0f8cba0..1562eb9 100755 --- a/scripts/slight +++ b/scripts/slight @@ -5,17 +5,18 @@ help() { cat << EOF ${0}: Wrapper script to change backlight - options: - -i [Brg] Increase backlight by Brg - -d [Brg] Decrease backlight by Brg - -s [Brg] Set backlight to Brg - -p Show the current backlight - -h Print this message and exit + -i [Brg] Increase backlight by Brg + -d [Brg] Decrease backlight by Brg + -s [Brg] Set backlight to Brg + -p Show the current backlight + -h Print this message and exit NOTE: Script interprets values as percentages EOF +help + exit 0 } diff --git a/scripts/svol b/scripts/svol index f0765bb..ec60450 100755 --- a/scripts/svol +++ b/scripts/svol @@ -5,14 +5,13 @@ help() { cat << EOF ${0}: Wrapper script to change volume - options: - -i [Vol] Increase volume by Vol - -d [Vol] Decrease volume by Vol - -s [Vol] Set volume to Vol - -p Show the current volume - -t Toggle between mute and unmute - -h Print this message and exit + -i [Vol] Increase volume by Vol + -d [Vol] Decrease volume by Vol + -s [Vol] Set volume to Vol + -p Show the current volume + -t Toggle between mute and unmute + -h Print this message and exit EOF exit 0 diff --git a/scripts/swall b/scripts/swall index 34c4bc8..2588b4b 100755 --- a/scripts/swall +++ b/scripts/swall @@ -5,11 +5,10 @@ help() { cat << EOF ${0}: Wrapper script to set wallpapers - options: - -d [File] Select a wallpaper or a directory - -c Remove the current wallpaper - -h Print this message and exit + -d [File] Select a wallpaper or a directory + -c Remove the current wallpaper + -h Print this message and exit NOTE: default directory is ~/.config/wallpapers EOF |