Compare commits

..

No commits in common. "1c493a18d50b703beb55b0e9f8f47bdb6d7feed8" and "de6455136e476104152490b403ea8cde1a0f529a" have entirely different histories.

12 changed files with 86 additions and 266 deletions

View File

@ -9,22 +9,20 @@ alias cp='cp -i'
alias mv='mv -i'
# useful commands
alias pp="paruz -S"
alias pr="paruz -R"
alias upgrade="sudo pacman -Syyu"
alias ls="exa --icons"
alias l="exa --icons --group-directories-first -lh"
alias la="exa --icons --group-directories-first -alh"
alias lt="exa --icons --group-directories-first -lh --tree"
alias llt="exa --icons --group-directories-first -alh --tree"
alias p="sudo pacman"
alias y="yay"
alias upgrade="sudo pacman -Syyu && yay -Syyu"
alias ls="exa --group-directories-first -lh"
alias l="exa --group-directories-first -lh"
alias la="exa --group-directories-first -alh"
alias print="printf"
alias q="exit"
alias x="exit"
# nvim edits
alias cfi3="nvim ~/.config/i3/config"
alias cfi3s="nvim ~/.config/i3status/config"
alias cfn="nvim ~/.config/nvim/init.vim"
alias e="nvim"
alias e="nvim ."
# cd commands
alias c="cd ~/.config"
@ -37,14 +35,6 @@ alias yt="youtube-viewer"
alias gs="git status"
alias gp="git push"
alias ga="git add"
alias gd="git diff origin/master"
#cat is now bat!
alias cat="bat"
# kitty
alias icat="kitty +kitten icat "
function fman() {
man -k . | fzf -q "$1" --prompt='man> ' --preview $'echo {} | tr -d \'()\' | awk \'{printf "%s ", $2} {print $1}\' | xargs -r man' | tr -d '()' | awk '{printf "%s ", $2} {print $1}' | xargs -r man
}

15
.bashrc
View File

@ -5,22 +5,16 @@ export VISUAL=/usr/bin/nvim
export EDITOR=/usr/bin/nvim
export SPOTIPY_CLIENT_ID='aafa7f3fb81f46f681415f2cedfda2c8'
export SPOTIPY_CLIENT_SECRET='6ebee1d932c34fcdb711d4bf14dac0de'
export BW_SESSION="dFERFxdk1zdXiPxf54dULKCONLUSfUsg3KJ65lqIxhSy0SVbNCO5redWZ85YaGQ4ShGAV6zuKif7RO4dAy/K4g=="
export BROWSER=brave
#export GOROOT=/usr/local/go
#export GOPATH=$HOME/go
#export GOBIN=$HOME/go/bin
#export PATH=$PATH:$GOROOT/bin:$GOPATH/bin:$GOBIN
#export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
#export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
# - Ui4axsk9mwfw? -
set -o vi
bind -m vi-command 'Control-l: clear-screen'
bind -m vi-insert 'Control-l: clear-screen'
#ufetch
#bash ~/Git/fetch.sh/fetch.sh
#bash ~/.scripts/we
bash ~/Git/fetch.sh/fetch.sh
#(cat $HOME/.config/wpg/sequences &)
function lazygit() {
@ -172,8 +166,3 @@ eval "$(zoxide init bash)"
eval "$(starship init bash)"
# BEGIN_KITTY_SHELL_INTEGRATION
if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
# END_KITTY_SHELL_INTEGRATION
source /home/simon/.config/broot/launcher/bash/br

View File

@ -105,13 +105,12 @@ colors:
font:
normal:
#family: IBM Plex Mono
family: Source Code Pro
#family: Source Code Pro
#family: BlexMono Nerd Font
#family: Fira Code
family: Fira Code
#family: Blex Mono Bold Nerd Font Complete
#family: Comic Code Ligatures
style:
size: 12
size: 6.95
url:
# URL launcher

View File

@ -3,6 +3,8 @@
#
# Should you change your keyboard layout some time, delete
# this file and re-run i3-config-wizard(1).
#
# i3 config file (v4)
#
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
@ -64,6 +66,9 @@ client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36
client.background #F8F8F2
# The combination of xss-lock, nm-applet and pactl is a popular choice, so
# they are included here as an example. Modify as you see fit.
@ -71,7 +76,6 @@ client.background #F8F8F2
# screen before suspend. Use loginctl lock-session to lock your screen.
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork --color=000000
exec --no-startup-id setxkbmap -option
exec --no-startup-id autotiling
# NetworkManager is the most popular way to manage wireless networks on Linux,
# and nm-applet is a desktop environment-independent system tray GUI for it.
exec --no-startup-id nm-applet
@ -81,22 +85,19 @@ exec --no-startup-id picom -c
exec --no-startup-id xfce4-power-manager
exec --no-startup-id gammy
# Use pactl to adjust volume in PulseAudio.
set $refresh_i3status killall -SIGUSR1 i3status
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
# Binds for - and + for volume on keypad!
# Binds for - and + for volume
bindsym $mod+KP_Add exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
bindsym $mod+KP_Subtract exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
bindsym $mod+KP_Multiply exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
# Binds for SHIFT - and + for brightness on keypad!
#bindsym $mod+Shift+KP_Subtract exec --no-startup-id gummy -b 5
#bindsym $mod+Shift+KP_Multiply exec --no-startup-id
## NOT WORKIN
bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
# Use xev to find the keys on the keypad
@ -104,7 +105,6 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
bindsym $mod+KP_End exec --no-startup-id bash ~/.scripts/laptop
bindsym $mod+KP_Down exec --no-startup-id bash ~/.scripts/ultrawide
bindsym $mod+KP_Next exec --no-startup-id bash ~/.scripts/tf2
bindsym $mod+KP_Left exec --no-startup-id bash ~/.scripts/one-mon.sh
# Make a note and push via gotify
bindsym $mod+n exec --no-startup-id bash ~/.scripts/gnote
@ -139,6 +139,7 @@ bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move right
bindsym $mod+Ctrl+Right resize shrink width 1 px or 1 ppt
bindsym $mod+Ctrl+Up resize grow height 1 px or 1 ppt
bindsym $mod+Ctrl+Down resize shrink height 1 px or 1 ppt
@ -200,12 +201,13 @@ bindsym $mod+shift+o gaps outer current minus 5
bindsym $mod+BackSpace gaps inner all set 14; gaps outer all set 14
bindsym $mod+shift+BackSpace gaps inner all set 0; gaps outer all set 0
#### Programs
bindsym $mod+Return exec kitty
bindsym $mod+Shift+Return exec alacritty -e ~/.scripts/web
bindsym $mod+Ctrl+Return exec alacritty -e ~/.scripts/mc
bindsym $mod+x exec xinput-gui
bindsym $mod+c exec brave https://calendar.google.com/calendar/u/0/r?pli=1
bindsym $mod+Ctrl+Return exec alacritty
bindsym $mod+c exec gnome-calendar
bindsym $mod+Shift+b exec blueman-manager
bindsym $mod+p exec bwmenu
bindsym $mod+Shift+f exec --no-startup-id nautilus
@ -214,25 +216,25 @@ bindsym $mod+Ctrl+f exec --no-startup-id alacritty -e ranger
# Print Screen :::
#WHOLE SCREEN
bindsym Print exec scrot $HOME/Pictures/Screenshots/`date +%Y-%m-%d_%H:%M:%S`.png
#APPLICATION
bindsym $mod+Print exec scrot -u $HOME/Pictures/Screenshots/`date +%Y-%m-%d_%H:%M:%S`.png
##SELECT
#bindsym --release $mod+Shift+Print exec --no-startup-id scrot -s $HOME/Pictures/Screenshots/`date +%Y-%m-%d_%H:%M:%S`.png
bindsym --release $mod+Shift+Print exec --no-startup-id bash /home/simon/.scripts/vscrnpaste
##OPEN DIR
bindsym $mod+s exec --no-startup-id nautilus ~/Pictures/Screenshots/
#### ROFI
#bindsym $mod+e exec --no-startup-id rofi -show
bindsym Menu exec --no-startup-id rofi -show
bindsym $mod+Shift+e exec --no-startup-id rofi -show emoji -modi emoji
bindsym $mod+e exec --no-startup-id rofi -show
bindsym $mod+d exec rofi -show run
bindsym $mod+Shift+d exec rofi -show drun -show-icons true
#neomutt mail
#bindsym $mod+m exec --no-startup-id alacritty -e neomutt
bindsym $mod+m exec --no-startup-id kitty -e neomutt
#bindsym $mod+Shift+m exec --no-startup-id mullvad-vpn #not used atm!
#float certian windows
for_window [class="feh" instance="feh"] floating enable
@ -245,9 +247,9 @@ for_window [instance="gammy"] floating enable
bindsym XF86MonBrightnessDown exec light -U 5 # decrease screen brightness
bindsym XF86MonBrightnessUp exec light -A 5 # increase screen brightness
bindsym $mod+w exec --no-startup-id brave simonkellet.xyz
bindsym $mod+Shift+w exec --no-startup-id qutebrowser simonkellet.xyz
bindsym $mod+Ctrl+w exec --no-startup-id kitty -e amfora simonkellet.xyz
bindsym $mod+w exec --no-startup-id brave www.simonkellet.xyz
bindsym $mod+Shift+w exec --no-startup-id qutebrowser www.simonkellet.xyz
bindsym $mod+Ctrl+w exec --no-startup-id alacritty -e amfora simonkellet.xyz
# Define names for default workspaces for which we configure key bindings later on.
# We use variables to avoid repeating the names in multiple places.
@ -330,10 +332,10 @@ mode "resize" {
bindsym $mod+r mode "default"
}
#bindsym $mod+r mode "resize" #not used!
bindsym $mod+r mode "resize"
set $Locker i3lock --color=000000 && sleep 1
#set $Locker i3lock --color=000000 && sleep 1
set $Locker sh ~/.config/i3lock/lock.sh
set $mode_system (l)lock (e)logout (s)suspend (h)hibernate (r)reboot (Shift+s)shutdown
mode "$mode_system" {
@ -348,8 +350,10 @@ mode "$mode_system" {
bindsym Return mode "default"
bindsym Escape mode "default"
}
bindsym $mod+Escape mode "$mode_system"
#
#set $coloract "#6a8e7a"
#set $colorin "#3c5045"
#set_from_resource $white i3wm.color15 "#fefbec"
@ -390,5 +394,9 @@ bar {
urgent_workspace #FF5555 #FF5555 #F8F8F2
binding_mode #FF5555 #FF5555 #F8F8F2
}
}
bindsym $mod+b bar mode toggle

View File

@ -1,35 +0,0 @@
#!/bin/sh
BLANK='#282a36'
CLEAR='#282a36'
DEFAULT='#bd93f9'
TEXT='#bd93f9'
WRONG='#ff5555'
VERIFYING='#50fa7b'
i3lock \
--insidever-color=$CLEAR \
--ringver-color=$VERIFYING \
\
--insidewrong-color=$CLEAR \
--ringwrong-color=$WRONG \
\
--inside-color=$BLANK \
--ring-color=$DEFAULT \
--line-color=$BLANK \
--separator-color=$DEFAULT \
\
--verif-color=$TEXT \
--wrong-color=$TEXT \
--time-color=$TEXT \
--date-color=$TEXT \
--layout-color=$TEXT \
--keyhl-color=$WRONG \
--bshl-color=$WRONG \
\
--screen 1 \
--blur 5 \
--clock \
--indicator \
--time-str="%H:%M:%S" \
--date-str="%A %d/%m/%Y" \

View File

@ -1,31 +0,0 @@
#!/bin/sh
i3lock \
--blur 5 \
--bar-indicator \
--bar-pos y+h \
--bar-direction 1 \
--bar-max-height 50 \
--bar-base-width 50 \
--bar-color 000000cc \
--keyhl-color 880088cc \
--bar-periodic-step 50 \
--bar-step 50 \
--redraw-thread \
\
--clock \
--force-clock \
--time-pos x+5:y+h-80 \
--time-color 880088ff \
--date-pos tx:ty+15 \
--date-color 990099ff \
--date-align 1 \
--time-align 1 \
--ringver-color 8800ff88 \
--ringwrong-color ff008888 \
--status-pos x+5:y+h-16 \
--verif-align 1 \
--wrong-align 1 \
--verif-color ffffffff \
--wrong-color ffffffff \
--modif-pos -50:-50

View File

@ -7,10 +7,10 @@
#: characters.
#font_family Fira Code Regular
font_family SauceCodePro Nerd Font
#font_family IBM Plex Mono
#font_family BlexMono Nerd Font
#font_family Comic Code Ligatures
font_family Comic Code Ligatures Regular
#font_family Comic Code Ligatures Medium
bold_font auto
italic_font auto
bold_italic_font auto
@ -27,7 +27,7 @@ bold_italic_font auto
#: italic_font Operator Mono Book Italic
#: bold_italic_font Operator Mono Medium Italic
font_size 13.0
font_size 12.0
#: Font size (in pts)
@ -568,7 +568,7 @@ enable_audio_bell no
#: values set top, horizontal and bottom. Four values set top, right,
#: bottom and left.
window_padding_width 0
window_padding_width 20
#: The window padding (in pts) (blank area between the text and the
#: window border). A single value sets all four sides. Two values set
@ -757,12 +757,13 @@ tab_bar_style powerline
#: }}}
#: Color scheme {{{
# foreground #eeeeee
# background #282828
foreground #eeeeee
background #282828
#: The foreground and background colors
background_opacity 1
background_opacity 1.0
#: The opacity of the background. A number between 0 and 1, where 1 is
#: opaque and 0 is fully transparent. This will only work if
@ -832,46 +833,46 @@ tab_bar_style powerline
#: dull and bright version, for the first 16 colors. You can set the
#: remaining 240 colors as color16 to color255.
# Cursor
# cursor #abb2bf
# cursor_text_color #282c34
cursor #abb2bf
cursor_text_color #282c34
# Colors
# foreground #abb2bf
# background #282c34
# selection_foreground #282c34
# selection_background #abb2bf
foreground #abb2bf
background #282c34
selection_foreground #282c34
selection_background #abb2bf
# black
# color0 #282c34
# color8 #3e4452
color0 #282c34
color8 #3e4452
# red
# color1 #e06c75
# color9 #be5046
color1 #e06c75
color9 #be5046
# green
# color2 #98c379
# color10 #98c379
color2 #98c379
color10 #98c379
# yellow
# color3 #e5c07b
# color11 #d19a66
color3 #e5c07b
color11 #d19a66
# blue
# color4 #61afef
# color12 #61afef
color4 #61afef
color12 #61afef
# magenta
# color5 #c678dd
# color13 #c678dd
color5 #c678dd
color13 #c678dd
# cyan
# color7 #56b6c2
# color14 #56b6c2
color7 #56b6c2
color14 #56b6c2
# white
# color7 #abb2bf
# color15 #5c6370
color7 #abb2bf
color15 #5c6370
# mark1_foreground black
#: Color for marks of type 1
@ -1510,10 +1511,4 @@ listen_on unix:/tmp/kitty
#: }}}
#: }}}
include frappe.conf
# BEGIN_KITTY_THEME
# Dracula
include current-theme.conf
# END_KITTY_THEME
include dracula.conf

View File

@ -1,22 +1,6 @@
call plug#begin('~/local/share/nvim/plugged')
" Lightline
Plug 'itchyny/lightline.vim'
let g:lightline ={
\ 'colorscheme' : 'dracula',
\ 'component_function': {
\ 'filetype': 'MyFiletype',
\ 'fileformat': 'MyFileformat',
\ }
\}
function! MyFiletype()
return winwidth(0) > 70 ? (strlen(&filetype) ? &filetype . ' ' . WebDevIconsGetFileTypeSymbol() : 'no ft') : ''
endfunction
function! MyFileformat()
return winwidth(0) > 70 ? (&fileformat . ' ' . WebDevIconsGetFileFormatSymbol()) : ''
endfunction
Plug 'editorconfig/editorconfig-vim'
" Fzf
@ -36,8 +20,8 @@ Plug 'scrooloose/syntastic'
Plug 'jiangmiao/auto-pairs'
"Airline
"Plug 'vim-airline/vim-airline'
"Plug 'vim-airline/vim-airline-themes'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'prabirshrestha/vim-lsp'
" Themes
@ -46,49 +30,22 @@ Plug 'gko/vim-coloresque'
Plug 'dracula/vim', { 'as': 'dracula' }
Plug 'joshdick/onedark.vim'
Plug 'Mofiqul/dracula.nvim'
" Lang. Support
"""""""""""""""""""""""""""""""GO"""""""""""""""""""""""""""""""""""""""
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'}
set completeopt-=preview
" Go related keybinds
autocmd FileType go nmap <leader>r <Plug>(go-run)
" Move through errors easier!
map <C-n> :cnext<CR>
map <C-m> :cprevious<CR>
nnoremap <leader>a :cclose<CR>
Plug 'fatih/vim-go'
" run :GoBuild or :GoTestCompile based on the go file
function! s:build_go_files()
let l:file = expand('%')
if l:file =~# '^\f\+_test\.go$'
call go#test#Test(0, 1)
elseif l:file =~# '^\f\+\.go$'
call go#cmd#Build(0)
endif
endfunction
autocmd FileType go nmap <leader>b :<C-u>call <SID>build_go_files()<CR>
let g:go_def_mode='gopls'
let g:go_info_mode='gopls'
let g:go_list_type = "quickfix"
""""""""""""""""""""""""""""""GO""""""""""""""""""""""""""""""""""""""""
" JAVA
Plug 'artur-shaik/vim-javacomplete2'
autocmd FileType java setlocal omnifunc=javacomplete#Complete
"Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'zchee/deoplete-jedi'
Plug 'deoplete-plugins/deoplete-clang'
Plug 'davidhalter/jedi-vim'
" RUST
Plug 'rust-lang/rust.vim'
Plug 'simrat39/rust-tools.nvim'
Plug 'neovim/nvim-lspconfig'
Plug 'preservim/nerdcommenter'
Plug 'mattn/emmet-vim'
@ -102,7 +59,7 @@ noremap <F3> :Autoformat<CR>
" Indent Blanklines
Plug 'lukas-reineke/indent-blankline.nvim'
" Writing in LaTeX
" Writing
Plug 'junegunn/goyo.vim'
Plug 'lervag/vimtex'
Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
@ -116,15 +73,14 @@ let g:livepreview_engine = 'xelatex'
set conceallevel=1
let g:tex_conceal='abdmg'
" Ultisnips
"Ultisnips
Plug 'sirver/ultisnips'
Plug 'honza/vim-snippets'
let g:UltiSnipsExpandTrigger = '<tab>'
let g:UltiSnipsJumpForwardTrigger="<c-b>"
let g:UltiSnipsJumpBackwardTrigger="<c-z>"
let g:UltiSnipsListSnippets="<c-;>"
" Zoxide
"Zoxide
Plug 'nanotee/zoxide.vim'
" Vim Wiki
@ -148,22 +104,12 @@ Plug 'ryanoasis/vim-devicons'
" Lightspeed
Plug 'ggandor/lightspeed.nvim'
" Markdown Preview
Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': 'markdown' }
call plug#end()
"let g:molokai_original = 1
"let g:airline_theme='onedark'
"let g:airline_theme='dracula'
let g:airline_theme='dracula'
let g:ale_enable=0
let g:ale_linters = {
\ 'python': ['pylint'],
\ 'vim': ['vint'],
\ 'cpp': ['clang'],
\ 'c': ['clang'],
\ 'go': ['gopls'],
\}
syntax on
filetype plugin indent on
set shiftwidth=4
@ -171,13 +117,12 @@ set softtabstop=4
set tabstop=4
set expandtab
set number relativenumber
"colorscheme onedark
colorscheme dracula
set nocompatible
set encoding=UTF-8
set clipboard+=unnamedplus
set mouse=a
set laststatus=3
set termguicolors
" Map Leader
let mapleader = ","
@ -254,9 +199,6 @@ nnoremap <A-o> :e<Space>
nnoremap <A-O> :tabe<Space>
nnoremap <A-v> :vsplit<Space>
" Markdown Preview
nnoremap <leader>m :MarkdownPreviewToggle<CR>
" Screenshot command
nnoremap <silent> <leader>s :!bash /home/simon/.scripts/vscrnpaste<CR><CR>

View File

@ -156,41 +156,3 @@ max
of
maxptr
scanf
Fediverse
microblogging
fediverse
indeti
ActivityPub
W3C
linuxrocks
lgbt
flexability
simonkellet
Pixelfed
Instagram
Bookwyrm
BookWyrm
WebTorrent
Peertube
YouTuber's
PeerTube
Y4
2nd
malloc
JVM
Naur
BNF
src
CSCU9A5
EBNF
EOL
AST
CSCU9E5
toString
equals
Powerpoint
slideshow
HTML5
tannoy
Alexa
YT

Binary file not shown.

View File

@ -228,6 +228,7 @@ config.bind('xx', 'config-cycle tabs.show always never;; config-cycle statusbar.
c.url.searchengines["g"] = "https://www.google.co.uk/search?q={}"
c.url.searchengines = {'DEFAULT': 'https://www.google.co.uk/search?q={}'}
c.url.searchengines["ddg"] = "https://www.duckduckgo.com/?q={}"
c.url.searchengines["b"] = "https://search.brave.com/search?q={}"
c.url.searchengines["aw"] = "https://wiki.archlinux.org/?search={}"
c.url.searchengines["yt"] = "http://www.youtube.com/results?search_query={}"

View File

@ -1,5 +1,5 @@
[directory]
truncation_length = 3
truncation_length = 8
truncation_symbol = "…/"
[line_break]