clear_console not available

dot_bash_logout

@@ -0,0 +1,5 @@
+#
+# ~/.bash_logout
+#
+
+reset

dot_bash_profile

@@ -1,9 +0,0 @@
-#
-# ~/.bash_profile
-#
-[[ -f ~/.profile ]] && . ~/.profile
-
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-
-[[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]] && exec startx
-

dot_bash_profile.tmpl

@@ -1,7 +1,10 @@
 #
-# ~/.profile
+# ~/.bash_profile
 #
 
+export EDITOR=nvim
+export VISUAL=emacs
+
 # Ensure XDG env vars are set correctly
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_CONFIG_HOME="$HOME/.config"
@@ -14,6 +17,9 @@ export PATH="$HOME/.local/bin:$PATH"
 # make Java behave when not using a DE
 export _JAVA_AWT_WM_NONREPARENTING=1
 
+# Sometimes needed for gpg passphrase prompt
+export GPG_TTY=$(tty)
+
 # xsecurelock settings
 export XSECURELOCK_AUTH=auth_x11
 export XSECURELOCK_AUTHPROTO=authproto_pam
@@ -64,3 +70,12 @@ export WINEPREFIX="$XDG_DATA_HOME"/wine
 # Xorg
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
+
+# Source other dotfiles
+[[ -f ~/.profile ]] && . ~/.profile
+
+[[ -f ~/.bashrc ]] && . ~/.bashrc
+
+# startx
+[[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]] && exec startx
+

dot_bashrc

@@ -2,20 +2,18 @@
 # ~/.bashrc
 #
 
-# If not running interactively, don't do anything
+# Return if non-interactive
 [[ $- != *i* ]] && return
 
+PS1='[\e[38;5;107m\u\e[0m@\h \e[38;5;74m\w\e[0m]\$ '
+
+alias diff='diff --color=auto'
+alias grep='grep --color=auto'
+alias ip='ip -color=auto'
 alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '
 
-export GPG_TTY=$(tty)
-export EDITOR=nvim
-
-alias nv=nvim
-alias r="urxvt -name Ranger -e ranger & disown"
+alias vim=nvim
+alias r="kitty --class=Ranger ranger & disown"
 alias kssh="/usr/bin/kitty +kitten ssh"
 alias wget=wget --hsts-file="$XDG_STATE_HOME/wget-hsts"
 
-neofetch
-
-[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh

dot_config/nvim/init.lua

@@ -0,0 +1,62 @@
+vim.g.mapleader = " "
+
+vim.keymap.set({ "n", "v" }, "<Leader>y", '"+y', { noremap = true, silent = true })
+
+vim.opt.encoding = 'utf-8'
+vim.opt.fileencoding = 'utf-8'
+vim.opt.mouse = 'a'
+vim.opt.hidden = true
+vim.opt.ruler = true
+vim.opt.cmdheight = 2
+vim.opt.splitbelow = true
+vim.opt.splitright = true
+vim.opt.conceallevel = 0
+vim.opt.tabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.smarttab = true
+vim.opt.expandtab = true
+vim.opt.smartindent = true
+vim.opt.autoindent = true
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
+vim.opt.laststatus = 0
+vim.opt.number = false
+vim.opt.wrap = true
+vim.opt.breakindent = true
+vim.opt.cursorline = false
+vim.opt.background = 'dark'
+vim.opt.showtabline = 2
+vim.opt.updatetime = 300
+vim.opt.timeoutlen = 500
+vim.opt.autochdir = true
+vim.opt.swapfile = true
+
+vim.cmd [[
+  syntax enable
+  set dir=~/.cache/nvim
+]]
+
+local Plug = vim.fn['plug#']
+vim.call('plug#begin', '~/.local/share/nvim/plugged')
+
+Plug 'vim-airline/vim-airline'                                                                                                                                                                                                           
+Plug 'sheerun/vim-polyglot'                                                                                                                                                                                                              
+Plug 'jiangmiao/auto-pairs'                                                                                                                                                                                                              
+Plug('sainnhe/everforest', {
+    ['do'] = function()
+      vim.opt.termguicolors = true
+      vim.cmd('colorscheme everforest')
+      vim.g.airline_theme = 'everforest'
+      vim.g.everforest_background = 'soft'
+      vim.g.everforest_better_performance = 1
+    end
+})
+
+vim.call('plug#end')
+
+vim.opt.termguicolors = true
+vim.cmd('colorscheme everforest')
+vim.g.airline_theme = 'everforest'
+vim.g.everforest_background = 'soft'
+vim.g.everforest_better_performance = 1
+

dot_config/nvim/init.vim

@@ -1,116 +0,0 @@
-" set leader key
-let g:mapleader = "\<Space>"
-
-" vim hardcodes background color erase even if the terminfo file does
-" not contain bce (not to mention that libvte based terminals
-" incorrectly contain bce in their terminfo files). This causes
-" incorrect background rendering when using a color theme with a
-" background color.
-let &t_ut=''
-
-syntax enable                           " Enables syntax highlighing
-set hidden                              " Required to keep multiple buffers open
-set nowrap                              " Display long lines as just one line
-set encoding=utf-8                      " The encoding displayed
-set pumheight=10                        " Makes popup menu smaller
-set fileencoding=utf-8                  " The encoding written to file
-set ruler                               " Show the cursor position all the time
-set cmdheight=2                         " More space for displaying messages
-set iskeyword+=-                        " treat dash separated words as a word text object"
-"set mouse=a                             " Enable your mouse
-set splitbelow                          " Horizontal splits will automatically be below
-set splitright                          " Vertical splits will automatically be to the right
-set t_Co=256                            " Support 256 colors
-set conceallevel=0                      " So that I can see `` in markdown files
-set tabstop=4                           " Insert 4 spaces for a tab
-set shiftwidth=4                        " Change the number of space characters inserted for indentation
-set smarttab                            " Makes tabbing smarter will realize you have 2 vs 4
-set expandtab                           " Converts tabs to spaces
-set smartindent                         " Makes indenting smart
-set autoindent                          " Good auto indent
-set laststatus=0                        " Always display the status line
-"set number                              " Line numbers
-"set cursorline                          " Enable highlighting of the current line
-set background=dark                     " tell vim what the background color looks like
-set showtabline=4                       " Always show tabs
-"set noshowmode                          " We don't need to see things like -- INSERT -- anymore
-set nobackup                            " This is recommended by coc
-set nowritebackup                       " This is recommended by coc
-set updatetime=300                      " Faster completion
-set timeoutlen=500                      " By default timeoutlen is 1000 ms
-set formatoptions-=cro                  " Stop newline continution of comments
-"set clipboard=unnamedplus               " Copy paste between vim and everything else
-set autochdir                           " Your working directory will always be the same as your working directory
-set swapfile                            " Save swapfiles to ~/.cache instead of littering source dir
-set dir=~/.cache/nvim
-
-
-au! BufWritePost $MYVIMRC source %      " auto source when writing to init.vim alternatively you can run :source $MYVIMRC
-
-" You can't stop me
-cmap w!! w !sudo tee %
-
-"" Plugins
-" Install neovim-plug-git from AUR
-call plug#begin()
-" A fuzzy file finder
-Plug 'kien/ctrlp.vim'
-" Comment/Uncomment tool
-Plug 'scrooloose/nerdcommenter'
-" Switch to the begining and the end of a block by pressing %
-Plug 'tmhedberg/matchit'
-" A Tree-like side bar for better navigation
-Plug 'scrooloose/nerdtree'
-" A cool status bar
-Plug 'vim-airline/vim-airline'
-" Airline themes
-Plug 'vim-airline/vim-airline-themes'
-" Better syntax-highlighting for filetypes in vim
-Plug 'sheerun/vim-polyglot'
-" Intellisense engine
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-" Git integration
-Plug 'tpope/vim-fugitive'
-" Auto-close braces and scopes
-Plug 'jiangmiao/auto-pairs'
-""Themes
-" Everforest theme
-Plug 'sainnhe/everforest'
-" Nord
-"Plug 'arcticicestudio/nord-vim'
-
-call plug#end()
-
-" Important!!
-if has('termguicolors')
-  set termguicolors
-endif
-
-" Set contrast.
-" This configuration option should be placed before `colorscheme everforest`.
-" Available values: 'hard', 'medium'(default), 'soft'
-let g:everforest_background = 'soft'
-" For better performance
-let g:everforest_better_performance = 1
-colorscheme everforest
-
-" plug-in autostart
-"augroup nerdtree_open
-"  autocmd!
-"  autocmd VimEnter * NERDTree | wincmd p
-"augroup END
-
-" NERDTree Toggle
-nmap <silent> <Leader>k :NERDTreeToggle<CR>
-
-" CoC completion
-inoremap <silent><expr> <TAB>
-      \ pumvisible() ? "\<C-n>" :
-      \ CheckBackspace() ? "\<TAB>" :
-      \ coc#refresh()
-inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
-
-function! CheckBackspace() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~# '\s'
-endfunction

dot_config/polybar/config.ini.tmpl

@@ -49,11 +49,7 @@ font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
 
 modules-left = workspaces sep title
 modules-center =
-{{- if eq .chezmoi.hostname "helix"}}
 modules-right = keyboard sep pulseaudio-control sep date sep
-{{- else }}
-modules-right = keyboard sep pulseaudio-control sep date sep powermenu 
-{{- end}}
 tray-position = right
 tray-detached = false
 {{- if eq .chezmoi.hostname "helix" }}
@@ -124,7 +120,7 @@ font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
 
 modules-left = workspaces sep title                               
 modules-center = spotify                                                  
-modules-right = cpu sep memory sep filesystem
+modules-right = network sep cpu sep memory sep filesystem
 
 tray-position = none
 tray-detached = false

dot_config/polybar/modules.ini

@@ -492,7 +492,7 @@ format-unmounted-prefix-foreground = ${color.red}
 ;   %free%
 ;   %used%
 ; Default: %mountpoint% %percentage_free%%
-label-mounted = " %mountpoint% %percentage_used%% Used "
+label-mounted = " %used% / %total% "
 
 ; Available tokens:
 ;   %mountpoint%
@@ -538,7 +538,7 @@ format-prefix-foreground = ${color.blue}
 ;   %gb_swap_free%
 ;   %gb_swap_used%
 
-label = " %mb_used%"
+label = " %mb_used% / %gb_total%"
 
 ; Only applies if <ramp-used> is used
 ;;ramp-used-0 = ${memory.used0}
@@ -562,7 +562,7 @@ interface = wlp4s0
 ; Normal Module
 [module/network]
 type = internal/network
-interface = wlp4s0
+interface = wlan0
 
 ; Seconds to sleep between updates
 ; Default: 1
@@ -582,12 +582,12 @@ interval = 1.0
 ; Accumulate values from all interfaces
 ; when querying for up/downspeed rate
 ; Default: false
-accumulate-stats = true
+accumulate-stats = false
 
 ; Consider an `UNKNOWN` interface state as up.
 ; Some devices have an unknown state, even when they're running
 ; Default: false
-unknown-as-up = true
+unknown-as-up = false
 
 ; Available tags:
 ;   <label-connected> (default)
@@ -616,7 +616,7 @@ format-disconnected-prefix-foreground = ${color.dark-yellow}
 ;   %downspeed% [wireless+wired]
 ;   %linkspeed% [wired]
 ; Default: %ifname% %local_ip%
-label-connected = " %essid% %downspeed:10%"
+label-connected = " %signal%%   %upspeed%  %downspeed%"
 label-connected-foreground = ${color.magenta}
 ; Available tokens:
 ;   %ifname%    [wireless+wired]