Makefile: cleanup i3 directory

.gitignore

@@ -1,2 +1 @@
 .luarc.json
-/zsh/plugins

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "zsh/plugins/zsh-autosuggestions"]
+	path = zsh/plugins/zsh-autosuggestions
+	url = git@github.com:zsh-users/zsh-autosuggestions.git

Makefile

@@ -0,0 +1,78 @@
+install_base:
+	sudo dnf install -y \
+		NetworkManager-tui \
+		btop \
+		cava \
+		cbonsai \
+		cloc \
+		cmatrix \
+		fastfetch \
+		fzf \
+		git \
+		git-lfs \
+		htop \
+		httpie \
+		light \
+		lynx \
+		mc \
+		ncdu \
+		neovim \
+		profanity \
+		pwgen \
+		ranger \
+		ripgrep \
+		sen \
+		stow \
+		telnet \
+		vim \
+		zsh
+
+install_gui:
+	sudo dnf install -y \
+		dino \
+		epiphany \
+		firefox \
+		gimp \
+		gparted \
+		inkscape \
+		kitty \
+		mediawriter \
+		qt5ct \
+		telegram-desktop \
+		thunderbird \
+		vlc \
+		fontawesome-fonts \
+		terminus-fonts \
+		unifont-fonts
+
+install_multimedia:
+	sudo dnf group install Multimedia
+
+install_i3: install_base install_gui
+	sudo dnf install -y \
+		arandr \
+		dunst \
+		gpick \
+		i3 \
+		picom \
+		polybar \
+		rofi \
+		rxvt-unicode \
+		unclutter-xfixes \
+		xclip \
+		xdotool \
+		xdpyinfo \
+		xev \
+		xkill \
+		xprop
+
+remove_default_configs:
+	rm -f ~/.zshrc
+	rm -fr ~/.config/i3/
+
+apply_configs: remove_default_configs
+	stow -Rvt ~ home
+
+desktop_i3: install_i3 apply_configs
+
+# vim: set ts=4 sw=4 autoindent noexpandtab:

README.md

@@ -2,10 +2,12 @@
 
 ## Bootstrap
 
-1. `git clone https://github.com/He4eT/dotfiles.git ~/dotfiles`
-1. Run `./installPackages.sh`
-1. Run `./apply.sh`
+1. Setup SSH keys
+1. [Enable RPM Fusion](https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/)
+1. `sudo dnf install git make`
+1. `git clone --recurse-submodules git@github.com:He4eT/dotfiles.git ~/dotfiles`
 1. Install [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh#basic-installation)
+1. `make desktop_i3`
 
 ## GTK
 
@@ -17,13 +19,6 @@
     XDG_CURRENT_DESKTOP=gnome
     ```
 
-## git
-
-1. `git config --global core.pager 'less -S'`
-1. `git config --global pull.rebase true`
-1. `git config user.email 'email'`
-1. `git config user.name 'name'`
-
 ## Telegram
 
 1. Tinted theme: `#707070`

apply.sh

@@ -1,55 +0,0 @@
-# .Xresources
-rm ~/.Xresources
-ln -sv ~/dotfiles/root/.Xresources ~/.Xresources
-
-# .zshrc
-rm ~/.zshrc
-ln -sv ~/dotfiles/root/.zshrc ~/.zshrc
-
-# .vimrc
-rm ~/.vimrc
-ln -sv ~/dotfiles/root/.vimrc ~/.vimrc
-
-# .lynxrc
-rm ~/.lynxrc
-ln -sv ~/dotfiles/root/.lynxrc ~/.lynxrc
-
-# kitty
-mkdir -p ~/.config/kitty
-rm ~/.config/kitty/kitty.conf
-ln -sv ~/dotfiles/kitty/kitty.conf ~/.config/kitty/kitty.conf
-
-# neovim
-mkdir -p ~/.config/nvim
-rm ~/.config/nvim/init.lua
-ln -sv ~/dotfiles/nvim/init.lua ~/.config/nvim/init.lua
-
-# i3
-mkdir -p ~/.config/i3
-rm ~/.config/i3/config
-ln -sv ~/dotfiles/i3/config ~/.config/i3/config
-# sudo cp ~/dotfiles/i3/i3-gaps.desktop /usr/share/xsessions/i3-gaps.desktop
-
-# dunst
-mkdir -p ~/.config/dunst
-rm ~/.config/dunst/dunstrc
-ln -sv ~/dotfiles/dunst/dunstrc ~/.config/dunst/dunstrc
-
-# polybar
-mkdir -p ~/.config/polybar
-rm ~/.config/polybar/config
-ln -sv ~/dotfiles/polybar/config.ini ~/.config/polybar/config.ini
-
-# ranger
-mkdir -p ~/.config/ranger
-rm ~/.config/ranger/rc.conf
-ln -sv ~/dotfiles/ranger/rc.conf ~/.config/ranger/rc.conf
-rm ~/.config/ranger/scope.sh
-ln -sv ~/dotfiles/ranger/scope.sh ~/.config/ranger/scope.sh
-
-# rofi
-mkdir -p ~/.config/rofi
-rm ~/.config/rofi/config
-ln -sv ~/dotfiles/rofi/config.rasi ~/.config/rofi/config.rasi
-rm ~/.config/rofi/paper-float.rasi
-ln -sv ~/dotfiles/rofi/paper-float.rasi ~/.config/rofi/paper-float.rasi

firefox/README.md

@@ -1,6 +1,12 @@
 # Firefox
 
+## userChrome
+
 1. Set `toolkit.legacyUserProfileCustomizations.stylesheets` to `true` with `about:config`
 1. Locate profile with `about:profiles`
 1. Copy `firefox/userChrome.css` to `{Root Directory}/chrome/userChrome.css`
 1. Customize interface
+
+## userStyles
+
+Styles can be applied using the [CSS Override extension](https://github.com/swcolegrove/css-override-web-extension).

home/.config/nvim/init.lua

@@ -149,13 +149,6 @@ vim.api.nvim_create_autocmd('TermOpen', {
   command = 'setlocal nonumber',
 })
 
--- Switch the keyboard layout to English (US) when leaving Insert Mode
-vim.api.nvim_create_autocmd('InsertLeave', {
-  group = vim.api.nvim_create_augroup('SwitchToEnglishOnLeave', { clear = true }),
-  pattern = '*',
-  command = 'silent !xkb-switch -s us',
-})
-
 --[[ cfg_keymaps: Base keymaps ]]
 
 local leader = ' '
@@ -191,9 +184,8 @@ vim.keymap.set('n', '<leader>l', '<C-i>', { desc = 'Forward' })
 -- Copy'n'Paste
 vim.keymap.set('v', '<leader>y', '"+y', { desc = 'Cop[y] selection to system clipboard' })
 vim.keymap.set('n', '<leader>y', function()
-  local text = vim.fn.getreg '"'
-  vim.fn.system('xclip -i -selection clipboard', text)
-  print 'Copied to system clipboard'
+  vim.fn.setreg('+', vim.fn.getreg('"'))
+  print('Copied to system clipboard')
 end, {
   silent = true,
   desc = 'Copy last [y]anked or deleted text to system clipboard',
@@ -359,6 +351,7 @@ require('lazy').setup({
             .. ' --line-number'
             .. ' --max-columns=512'
             .. ' --smart-case'
+            .. ' --hidden'
             .. ' --vimgrep',
           file_ignore_patterns = {
             '^node_modules/',
@@ -616,7 +609,6 @@ require('lazy').setup({
   },
 }, {
   -- lazy.nvim options
-  lockfile = '~/dotfiles/nvim/lazy-lock.json',
   ui = {
     backdrop = 100,
     border = 'solid',

home/.config/profanity/profrc

@@ -0,0 +1,2 @@
+[ui]
+theme=desolate

home/.gitconfig

@@ -0,0 +1,12 @@
+[user]
+	name = He4eT
+	email = He4eT@oddsquat.org
+[core]
+	pager = less -S
+[pull]
+	rebase = true
+[filter "lfs"]
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f

home/.vimrc

@@ -1,29 +1,3 @@
-""" Common
-
-  set encoding=utf-8
-  set nocompatible
-  set mouse=a
-  set scrolloff=0
-
-  set number
-  set fillchars=eob:\  " No more ~
-
-  set nowrap
-  set autoindent
-  set expandtab
-  set smarttab
-  set tabstop=2
-  set shiftwidth=2
-
-  let mapleader = ' '
-  set ttimeoutlen=10
-
-  nnoremap <SPACE> <Nop>
-
-  nnoremap <Esc> :nohl<CR>
-
-  filetype plugin indent on
-
 """ Plugins
   " :PlugInstall
   if empty(glob('~/.vim/autoload/plug.vim'))
@@ -36,8 +10,26 @@
     Plug 'widatama/vim-phoenix'
   call plug#end()
  
+""" Common
+
+  set mouse=a
+  set nowrap
+  set autoindent
+  set expandtab
+  set tabstop=2
+  set shiftwidth=2
+
+  filetype plugin indent on
+
+  let mapleader = ' '
+  nnoremap <SPACE> <Nop>
+  nnoremap <silent> <Esc> :nohlsearch<CR>
+
 """ Appearance
 
+  set number
+  set fillchars=eob:\ "
+
   colorscheme phoenix
   PhoenixOrange
 
@@ -49,35 +41,38 @@
 
 """ Statusline
 
-  hi StatusLine ctermbg=none ctermfg=white cterm=bold
-
   set noshowmode
   set laststatus=2
 
+  hi StatusLine ctermbg=none ctermfg=white cterm=bold
+  hi StatusLineDim ctermbg=none ctermfg=gray cterm=bold
+
   set statusline=
   set statusline+=%#StatusLine#
-  set statusline+=%{mode()}
-  set statusline+=\ " Space
-
-  set statusline+=%#LineNr#
-  set statusline+=%y
-
-  set statusline+=%#StatusLine#
+  set statusline+=[%{mode()}]
   set statusline+=\ %f
   set statusline+=\ %m
 
   set statusline+=%=
 
-  set statusline+=%#LineNr#
-  set statusline+=%{&fileformat}
+  set statusline+=%#StatusLineDim#
   set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
+  set statusline+=\ %{&fileformat}
+  set statusline+=\ %y
 
   set statusline+=%#StatusLine#
-  set statusline+=\ %l:%c
   set statusline+=\ %p%%
-
+  set statusline+=\ %l:%c
 
 """ Copy'n'paste
 
-  nnoremap <silent><leader>y :call system('xclip -i -selection clipboard', @@)<cr>
-  vnoremap <silent><leader>y y:call system('xclip -i -selection clipboard', @@)<cr>
+  function! PushToClipboard()
+    if !empty($WAYLAND_DISPLAY)
+      call system('wl-copy', @")
+    else
+      call system('xclip -i -selection clipboard', @")
+    endif
+  endfunction
+
+  nnoremap <silent><leader>y :call PushToClipboard()<CR>
+  vnoremap <silent><leader>y y:call PushToClipboard()<CR>

i3/i3-gaps.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=i3-gaps
-Comment=improved dynamic tiling window manager
-Exec=i3
-TryExec=i3
-Type=Application
-X-LightDM-DesktopName=i3
-DesktopNames=i3
-

installPackages.sh

@@ -1,44 +0,0 @@
-sudo dnf install \
-  fontawesome-fonts \
-  terminus-fonts \
-  unifont-fonts \
-  i3 \
-  picom \
-  polybar \
-  rofi \
-  lxappearance \
-  gparted \
-  gimp \
-  vlc \
-  qt5ct \
-  rxvt-unicode \
-  cbonsai \
-  cmatrix \
-  fastfetch \
-  NetworkManager-tui \
-  arandr \
-  gpick \
-  light \
-  btop \
-  htop \
-  ncdu \
-  lynx \
-  sen \
-  vim \
-  neovim \
-  ripgrep \
-  xclip \
-  xdotool \
-  xdpyinfo \
-  xkb-switch \
-  unclutter-xfixes \
-  git \
-  zsh \
-  mc \
-  ranger \
-  telegram-desktop \
-
-sudo dnf group install Multimedia
-
-mkdir ./zsh/plugins
-git clone git@github.com:zsh-users/zsh-autosuggestions.git ~/dotfiles/zsh/plugins/zsh-autosuggestions

oomox/colors/desolate

@@ -1,34 +0,0 @@
-NAME="desolate"
-THEME_STYLE=oomox
-GTK3_GENERATE_DARK=True
-
-ROUNDNESS=0
-GRADIENT=0.0
-SPACING=8
-OUTLINE_WIDTH=0
-BTN_OUTLINE_OFFSET=2
-BTN_OUTLINE_WIDTH=2
-
-ACCENT_BG=CDCDCD
-BG=383838
-BTN_BG=383838
-BTN_FG=CDCDCD
-CARET1_FG=CDCDCD
-CARET2_FG=CDCDCD
-CARET_SIZE=0.08
-FG=CDCDCD
-HDR_BG=383838
-HDR_BTN_BG=383838
-HDR_BTN_FG=CDCDCD
-HDR_FG=CDCDCD
-MENU_BG=383838
-MENU_FG=CDCDCD
-SEL_BG=BDBDBD
-SEL_FG=383838
-TXT_BG=383838
-TXT_FG=CDCDCD
-WM_BORDER_FOCUS=FFFFFF
-WM_BORDER_UNFOCUS=383838
-
-ICONS_ARCHDROID=757575
-ICONS_STYLE=archdroid

oomox/colors/gray

@@ -1,34 +0,0 @@
-NAME="gray"
-THEME_STYLE=oomox
-GTK3_GENERATE_DARK=False
-
-ROUNDNESS=0
-GRADIENT=0.0
-SPACING=4
-OUTLINE_WIDTH=0
-BTN_OUTLINE_OFFSET=2
-BTN_OUTLINE_WIDTH=2
-
-ACCENT_BG=212121
-BG=BDBDBD
-BTN_BG=BDBDBD
-BTN_FG=212121
-CARET1_FG=212121
-CARET2_FG=212121
-CARET_SIZE=0.08
-FG=212121
-HDR_BG=BDBDBD
-HDR_BTN_BG=BDBDBD
-HDR_BTN_FG=212121
-HDR_FG=212121
-MENU_BG=BDBDBD
-MENU_FG=212121
-SEL_BG=A3A3A3
-SEL_FG=212121
-TXT_BG=E0E0E0
-TXT_FG=212121
-WM_BORDER_FOCUS=9E9E9E
-WM_BORDER_UNFOCUS=BDBDBD
-
-ICONS_ARCHDROID=757575
-ICONS_STYLE=archdroid

zsh/plugins/zsh-autosuggestions

@@ -0,0 +1 @@
+Subproject commit 85919cd1ffa7d2d5412f6d3fe437ebdbeeec4fc5