Browse Source

restored deleted entities just to be sure

main
Cian Butler 1 month ago
parent
commit
e0044bb393
Signed by: butlerx GPG Key ID: B37CA765BAA89170
12 changed files with 506 additions and 50 deletions
  1. +0
    -17
      Xresources
  2. +7
    -6
      config/nvim/filetype.vim
  3. +9
    -0
      config/nvim/ftplugin/go.vim
  4. +4
    -3
      config/nvim/plug.vim
  5. +5
    -1
      config/nvim/plugin/ale.vim
  6. +147
    -0
      config/rofi/config.rasi
  7. +143
    -0
      config/rofi/monokai.rasi
  8. +173
    -0
      config/rofi/slate.rasi
  9. +3
    -1
      gitconfig
  10. +6
    -6
      ssh/config
  11. +1
    -14
      zsh.d/aliases.zsh
  12. +8
    -2
      zsh.d/functions.zsh

+ 0
- 17
Xresources View File

@@ -194,20 +194,3 @@ URxvt*color15 : #EEEEEC
*.color14 : xcolor14
*.color15 : xcolor15
*.depth : 32

! ROFI setup
rofi.bw : 1
rofi.color-active : xbackground, xcolor1, xbackground, xbackground, xcolor0
rofi.color-enabled : true
rofi.color-normal : xbackground, xforeground, xbackground, xbackground, xcolor5
rofi.color-urgent : xbackground, xcolor4, xbackground, xbackground, xcolor0
rofi.color-window : xbackground, xcolor3, xcolor2
rofi.font : Hack 20
rofi.fullscreen : false
rofi.kb-row-tab : Tab,Alt+Tab
rofi.kb-row-up : Up,Control+p,Shift+Tab,Shift+Alt+Tab
rofi.opacity : 90
rofi.padding : 25
rofi.separator-style : dashed
rofi.terminal : kitty
rofi.width : 50

+ 7
- 6
config/nvim/filetype.vim View File

@@ -322,6 +322,13 @@ augroup filetypedetect
\ ?*.rb
\,Puppetfile
\ setfiletype ruby
" Puppet files
autocmd BufNewFile,BufRead
\ ?*.pp
\ setfiletype puppet
autocmd BufNewFile,BufRead
\ ?*.epp
\ setfiletype embeddedpuppet
" sed files
autocmd BufNewFile,BufRead
\ ?*.sed
@@ -466,12 +473,6 @@ augroup filetypedetect
\ */log/*
\,?*.log
\ setfiletype messages
autocmd BufNewFile,BufRead
\ *.pp
\ setfiletype puppet
autocmd BufNewFile,BufRead
\ *.epp
\ setfiletype embeddedpuppet

" Clumsy attempt at typing files in `sudo -e` if a filename hasn't already
" been found; strip temporary extension and re-run


+ 9
- 0
config/nvim/ftplugin/go.vim View File

@@ -0,0 +1,9 @@
let g:go_fmt_autosave = 0
let g:go_imports_autosave = 0
let g:go_metalinter_autosave_= 0
let g:go_fmt_command='gopls'
let g:go_metalinter_command = 'golangci-lint'
let g:go_gopls_gofumpt=1
let g:go_highlight_function_calls = 1
let g:go_highlight_fields = 1
let g:go_highlight_types = 1

+ 4
- 3
config/nvim/plug.vim View File

@@ -5,9 +5,9 @@ Plug 'chrisbra/csv.vim', { 'for': 'csv' }
Plug 'christoomey/vim-tmux-navigator'
Plug 'dense-analysis/ale'
Plug 'ekalinin/Dockerfile.vim', { 'for': ['Dockerfile', 'docker-compose'] }
Plug 'elzr/vim-json',
Plug 'elzr/vim-json'
Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries', 'for': ['go', 'gohtmltmpl'] }
Plug 'google/vim-jsonnet',
Plug 'google/vim-jsonnet'
Plug 'godlygeek/tabular' |
Plug 'plasticboy/vim-markdown'
Plug 'gregsexton/gitv'
@@ -16,6 +16,7 @@ Plug 'leafgarland/typescript-vim', { 'for': ['typescript.tsx', 'typescriptreact'
Plug 'mhinz/vim-signify'
Plug 'mhinz/vim-startify'
Plug 'moll/vim-node'
Plug 'nvim-treesitter/nvim-treesitter', { 'branch': '0.5-compat', 'do': ':TSUpdate'} " We recommend updating the parsers on update
Plug 'ncm2/ncm2' |
Plug 'ncm2/ncm2-tern', {'do': 'npm install'} |
Plug 'filipekiss/ncm2-look.vim'|
@@ -23,7 +24,7 @@ Plug 'ncm2/ncm2' |
Plug 'ncm2/ncm2-bufword' |
Plug 'ncm2/ncm2-cssomni'|
Plug 'ncm2/ncm2-github' |
Plug 'ncm2/ncm2-go', {'do': 'go get -u github.com/mdempsky/gocode' }|
"Plug 'ncm2/ncm2-go', {'do': 'go get -u github.com/mdempsky/gocode' }|
Plug 'ncm2/ncm2-html-subscope'|
Plug 'ncm2/ncm2-jedi'|
Plug 'ncm2/ncm2-markdown-subscope'|


+ 5
- 1
config/nvim/plugin/ale.vim View File

@@ -1,4 +1,5 @@
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
\ 'javascript': ['prettier', 'eslint'],
\ 'typescript': ['prettier', 'tslint', 'eslint'],
\ 'typescriptreact': ['prettier', 'tslint', 'eslint'],
@@ -18,12 +19,15 @@ let g:ale_fixers = {
\ 'markdown': ['prettier'],
\ 'vimwiki': ['prettier'],
\ 'vue': ['prettier'],
\ 'yaml': ['prettier'],
\ 'ansible': ['prettier'],
\ 'puppet': ['puppetlint'],
\ 'java': ['google_java_format']}
let g:ale_fix_on_save = 1
let g:ale_go_gofmt_options = '-s'
let g:ale_go_gometalinter_options = '--enable=gosimple --enable=staticcheck'
let g:ale_go_gometalinter_options = '--fast'
let g:ale_go_golangci_lint_options = '--fast'
let g:ale_go_golangci_lint_package = 1
let g:ale_rust_cargo_use_clippy = 1
let g:ale_rust_analyzer_config = {
\'rust-analyzer': {


+ 147
- 0
config/rofi/config.rasi View File

@@ -0,0 +1,147 @@
configuration {
modi: "window,run,ssh";
font: "Hack 14";
/* location: 0;*/
/* yoffset: 0;*/
/* xoffset: 0;*/
/* fixed-num-lines: true;*/
show-icons: true;
terminal: "kitty";
/* ssh-client: "ssh";*/
/* ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
/* run-command: "{cmd}";*/
/* run-list-command: "";*/
/* run-shell-command: "{terminal} -e {cmd}";*/
/* window-command: "wmctrl -i -R {window}";*/
/* window-match-fields: "all";*/
/* icon-theme: ;*/
/* drun-match-fields: "name,generic,exec,categories,keywords";*/
/* drun-categories: ;*/
/* drun-show-actions: false;*/
/* drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";*/
/* drun-url-launcher: "xdg-open";*/
/* disable-history: false;*/
/* ignored-prefixes: "";*/
/* sort: false;*/
/* sorting-method: "normal";*/
/* case-sensitive: false;*/
/* cycle: true;*/
/* sidebar-mode: false;*/
/* hover-select: false;*/
/* eh: 1;*/
/* auto-select: false;*/
/* parse-hosts: false;*/
/* parse-known-hosts: true;*/
/* combi-modi: "window,run";*/
/* matching: "normal";*/
/* tokenize: true;*/
/* m: "-5";*/
/* filter: ;*/
/* dpi: -1;*/
/* threads: 0;*/
/* scroll-method: 0;*/
/* window-format: "{w} {c} {t}";*/
/* click-to-exit: true;*/
theme: "slate";
/* max-history-size: 25;*/
/* combi-hide-mode-prefix: false;*/
/* matching-negate-char: '-' /* unsupported */;*/
/* cache-dir: ;*/
/* window-thumbnail: false;*/
/* drun-use-desktop-cache: false;*/
/* drun-reload-desktop-cache: false;*/
/* normalize-match: false;*/
/* steal-focus: false;*/
/* application-fallback-icon: ;*/
/* pid: "/run/user/1000/rofi.pid";*/
/* display-window: ;*/
/* display-windowcd: ;*/
/* display-run: ;*/
/* display-ssh: ;*/
/* display-drun: ;*/
/* display-combi: ;*/
/* display-keys: ;*/
/* display-filebrowser: ;*/
/* kb-primary-paste: "Control+V,Shift+Insert";*/
/* kb-secondary-paste: "Control+v,Insert";*/
/* kb-clear-line: "Control+w";*/
/* kb-move-front: "Control+a";*/
/* kb-move-end: "Control+e";*/
/* kb-move-word-back: "Alt+b,Control+Left";*/
/* kb-move-word-forward: "Alt+f,Control+Right";*/
/* kb-move-char-back: "Left,Control+b";*/
/* kb-move-char-forward: "Right,Control+f";*/
/* kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
/* kb-remove-word-forward: "Control+Alt+d";*/
/* kb-remove-char-forward: "Delete,Control+d";*/
/* kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/
/* kb-remove-to-eol: "Control+k";*/
/* kb-remove-to-sol: "Control+u";*/
/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
/* kb-accept-custom: "Control+Return";*/
/* kb-accept-custom-alt: "Control+Shift+Return";*/
/* kb-accept-alt: "Shift+Return";*/
/* kb-delete-entry: "Shift+Delete";*/
/* kb-mode-next: "Shift+Right,Control+Tab";*/
/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
/* kb-mode-complete: "Control+l";*/
/* kb-row-left: "Control+Page_Up";*/
/* kb-row-right: "Control+Page_Down";*/
kb-row-up: "Up,Control+p,Shift+Tab,Shift+Alt+Tab";
kb-row-down: "Down,Control+n";
kb-row-tab: "Tab,Alt+Tab";
/* kb-page-prev: "Page_Up";*/
/* kb-page-next: "Page_Down";*/
/* kb-row-first: "Home,KP_Home";*/
/* kb-row-last: "End,KP_End";*/
/* kb-row-select: "Control+space";*/
/* kb-screenshot: "Alt+S";*/
/* kb-ellipsize: "Alt+period";*/
/* kb-toggle-case-sensitivity: "grave,dead_grave";*/
/* kb-toggle-sort: "Alt+grave";*/
/* kb-cancel: "Escape,Control+g,Control+bracketleft";*/
/* kb-custom-1: "Alt+1";*/
/* kb-custom-2: "Alt+2";*/
/* kb-custom-3: "Alt+3";*/
/* kb-custom-4: "Alt+4";*/
/* kb-custom-5: "Alt+5";*/
/* kb-custom-6: "Alt+6";*/
/* kb-custom-7: "Alt+7";*/
/* kb-custom-8: "Alt+8";*/
/* kb-custom-9: "Alt+9";*/
/* kb-custom-10: "Alt+0";*/
/* kb-custom-11: "Alt+exclam";*/
/* kb-custom-12: "Alt+at";*/
/* kb-custom-13: "Alt+numbersign";*/
/* kb-custom-14: "Alt+dollar";*/
/* kb-custom-15: "Alt+percent";*/
/* kb-custom-16: "Alt+dead_circumflex";*/
/* kb-custom-17: "Alt+ampersand";*/
/* kb-custom-18: "Alt+asterisk";*/
/* kb-custom-19: "Alt+parenleft";*/
/* kb-select-1: "Super+1";*/
/* kb-select-2: "Super+2";*/
/* kb-select-3: "Super+3";*/
/* kb-select-4: "Super+4";*/
/* kb-select-5: "Super+5";*/
/* kb-select-6: "Super+6";*/
/* kb-select-7: "Super+7";*/
/* kb-select-8: "Super+8";*/
/* kb-select-9: "Super+9";*/
/* kb-select-10: "Super+0";*/
/* ml-row-left: "ScrollLeft";*/
/* ml-row-right: "ScrollRight";*/
/* ml-row-up: "ScrollUp";*/
/* ml-row-down: "ScrollDown";*/
/* me-select-entry: "MousePrimary";*/
/* me-accept-entry: "MouseDPrimary";*/
/* me-accept-custom: "Control+MouseDPrimary";*/
timeout {
action: "kb-cancel";
delay: 0;
}
filebrowser {
directories-first: true;
sorting-method: "name";
}
}

+ 143
- 0
config/rofi/monokai.rasi View File

@@ -0,0 +1,143 @@
/* vim:ft=css */
/**
* ROFI Color theme
* User: milouse
* Copyright: Étienne Deparis
*/

* {
selected-normal-foreground: rgba ( 248, 248, 242, 100 % );
foreground: rgba ( 248, 248, 242, 100 % );
normal-foreground: @foreground;
alternate-normal-background: rgba ( 39, 40, 34, 0 % );
red: rgba ( 220, 50, 47, 100 % );
selected-urgent-foreground: rgba ( 248, 248, 242, 100 % );
blue: rgba ( 38, 139, 210, 100 % );
urgent-foreground: rgba ( 249, 38, 114, 100 % );
alternate-urgent-background: rgba ( 39, 40, 34, 0 % );
active-foreground: rgba ( 166, 226, 42, 100 % );
lightbg: rgba ( 238, 232, 213, 100 % );
selected-active-foreground: rgba ( 166, 226, 42, 100 % );
alternate-active-background: rgba ( 39, 40, 34, 0 % );
background: rgba ( 39, 40, 34, 93 % );
bordercolor: rgba ( 0, 43, 54, 100 % );
alternate-normal-foreground: @foreground;
normal-background: rgba ( 39, 40, 34, 0 % );
lightfg: rgba ( 88, 104, 117, 100 % );
selected-normal-background: rgba ( 20, 20, 17, 100 % );
border-color: @foreground;
spacing: 2;
separatorcolor: rgba ( 230, 219, 116, 100 % );
urgent-background: rgba ( 39, 40, 34, 0 % );
selected-urgent-background: rgba ( 249, 38, 114, 100 % );
alternate-urgent-foreground: @urgent-foreground;
background-color: rgba ( 0, 0, 0, 0 % );
alternate-active-foreground: @active-foreground;
active-background: rgba ( 39, 40, 34, 0 % );
selected-active-background: rgba ( 20, 20, 17, 100 % );
}
#window {
background-color: @background;
border: 1;
padding: 5;
}
#mainbox {
border: 0;
padding: 0;
}
#message {
border: 2px 0px 0px ;
border-color: @separatorcolor;
padding: 1px ;
}
#textbox {
text-color: @foreground;
}
#listview {
fixed-height: 0;
border: 2px 0px 0px ;
border-color: @separatorcolor;
spacing: 2px ;
scrollbar: true;
padding: 2px 0px 0px ;
}
#element {
border: 0;
padding: 1px ;
}
#element.normal.normal {
background-color: @normal-background;
text-color: @normal-foreground;
}
#element.normal.urgent {
background-color: @urgent-background;
text-color: @urgent-foreground;
}
#element.normal.active {
background-color: @active-background;
text-color: @active-foreground;
}
#element.selected.normal {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
#element.selected.urgent {
background-color: @selected-urgent-background;
text-color: @selected-urgent-foreground;
}
#element.selected.active {
background-color: @selected-active-background;
text-color: @selected-active-foreground;
}
#element.alternate.normal {
background-color: @alternate-normal-background;
text-color: @alternate-normal-foreground;
}
#element.alternate.urgent {
background-color: @alternate-urgent-background;
text-color: @alternate-urgent-foreground;
}
#element.alternate.active {
background-color: @alternate-active-background;
text-color: @alternate-active-foreground;
}
#scrollbar {
width: 4px ;
border: 0;
handle-width: 8px ;
padding: 0;
}
#mode-switcher {
border: 2px 0px 0px ;
border-color: @separatorcolor;
}
#button.selected {
background-color: @selected-normal-background;
text-color: @selected-normal-foreground;
}
#inputbar {
spacing: 0;
text-color: @normal-foreground;
padding: 1px ;
}
#case-indicator {
spacing: 0;
text-color: @normal-foreground;
}
#entry {
spacing: 0;
text-color: @normal-foreground;
}
#prompt {
spacing: 0;
text-color: @normal-foreground;
}
#inputbar {
children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
}
#textbox-prompt-colon {
expand: false;
str: ":";
margin: 0px 0.3em 0em 0em ;
text-color: @normal-foreground;
}

+ 173
- 0
config/rofi/slate.rasi View File

@@ -0,0 +1,173 @@
/* vim:ft=css */

* {
active-background: var(background);
active-foreground: #ff3388;
alternate-active-background: var(background);
alternate-active-foreground: var(active-foreground);
alternate-normal-background: var(background);
alternate-normal-foreground: var(foreground);
alternate-urgent-background: var(background);
alternate-urgent-foreground: var(urgent-foreground);
background-color: rgba (0, 0, 0, 0 %);
background: #000022;
blue: rgba (38, 139, 210, 100 %);
border-color: #aa2288;
foreground: #bb2244;
normal-background: var(background);
normal-foreground: var(foreground);
red: rgba (220, 50, 47, 100 %);
selected-active-background: var(background);
selected-active-foreground: #ffaa55;
selected-normal-background: var(background);
selected-normal-foreground: #bb55bb;
selected-urgent-background: var(background);
selected-urgent-foreground: #ffaa55;
separatorcolor: #771144;
spacing: 2;
urgent-background: var(background);
urgent-foreground: #ff33dd;
}

element,
inputbar,
message {
padding: 8;
}

element {
spacing: 0.8em;
border: 0;
cursor: pointer;
}
element normal.normal {
background-color: var(normal-background);
text-color: var(normal-foreground);
}
element normal.urgent {
background-color: var(urgent-background);
text-color: var(urgent-foreground);
}
element normal.active {
background-color: var(active-background);
text-color: var(active-foreground);
}
element selected.normal {
background-color: var(selected-normal-background);
text-color: var(selected-normal-foreground);
}
element selected.urgent {
background-color: var(selected-urgent-background);
text-color: var(selected-urgent-foreground);
}
element selected.active {
background-color: var(selected-active-background);
text-color: var(selected-active-foreground);
}
element alternate.normal {
background-color: var(alternate-normal-background);
text-color: var(alternate-normal-foreground);
}
element alternate.urgent {
background-color: var(alternate-urgent-background);
text-color: var(alternate-urgent-foreground);
}
element alternate.active {
background-color: var(alternate-active-background);
text-color: var(alternate-active-foreground);
}
element-text {
background-color: rgba (0, 0, 0, 0 %);
text-color: inherit;
highlight: inherit;
cursor: inherit;
}
element-icon {
background-color: rgba (0, 0, 0, 0 %);
size: 1em;
text-color: inherit;
cursor: inherit;
padding: 0 0.5em 0 0;
}
window {
padding: 25px;
background-color: var(background);
border: 1;
}
mainbox {
padding: 0;
border: 0;
}
message {
border-color: var(separatorcolor);
border: 2px dash 0px 0px;
}
textbox {
text-color: var(foreground);
}
listview {
padding: 2px 0px 0px;
scrollbar: true;
border-color: var(separatorcolor);
spacing: 2px;
fixed-height: 0;
border: 2px dash 0px 0px;
}
scrollbar {
width: 4px;
padding: 0;
handle-width: 8px;
border: 0;
handle-color: var(normal-foreground);
}
sidebar {
border-color: var(separatorcolor);
border: 2px dash 0px 0px;
}
button {
spacing: 0;
text-color: var(normal-foreground);
cursor: pointer;
}
button selected {
background-color: var(selected-normal-background);
text-color: var(selected-normal-foreground);
}

num-filtered-rows,
num-rows {
text-color: grey;
expand: false;
}
textbox-num-sep {
text-color: grey;
expand: false;
str: "/";
}
inputbar {
spacing: 0px;
text-color: var(normal-foreground);
children: [ prompt, textbox-prompt-colon, entry, num-filtered-rows,
textbox-num-sep, num-rows, case-indicator ];
}
case-indicator {
spacing: 0;
text-color: var(normal-foreground);
}
entry {
spacing: 0;
text-color: var(normal-foreground);
placeholder-color: grey;
placeholder: "Type to filter";
cursor: text;
}
prompt {
spacing: 0;
text-color: var(normal-foreground);
}
textbox-prompt-colon {
margin: 0px 0.3em 0em 0em;
expand: false;
str: ":";
text-color: inherit;
}

+ 3
- 1
gitconfig View File

@@ -61,7 +61,7 @@
ignore = "!gi() { curl -sL https://www.gitignore.io/api/$@ ;}; gi"

[core]
autocrlf = input
autocrlf = input
[fetch]
prune = true
[filter "lfs"]
@@ -83,3 +83,5 @@
insteadOf = https://github.ihs.demonware.net
[init]
defaultBranch = main
[rerere]
enabled = 1

+ 6
- 6
ssh/config View File

@@ -9,7 +9,7 @@ Host pyg

Host meth
HostName metharme.internal
ProxyJump azazel
ProxyJump pyg
user root

Host rb
@@ -46,27 +46,27 @@ Host azazel

Host icarus
Hostname icarus.internal
ProxyJump azazel
ProxyJump pyg
user root

Host daedalus
Hostname daedalus.internal
ProxyJump azazel
ProxyJump pyg
user root

Host hardcase
Hostname hardcase.internal
ProxyJump azazel
ProxyJump pyg
user root

Host butlerxvm
Hostname butlerxvm.internal
ProxyJump azazel
ProxyJump pyg
user root

Host m1cr0man
Hostname m1cr0man.internal
ProxyJump azazel
ProxyJump pyg
user root

Host notthe.cloud


+ 1
- 14
zsh.d/aliases.zsh View File

@@ -1,9 +1,3 @@
# -------------------------------------------------------------------
# use nocorrect alias to prevent auto correct from "fixing" these
# -------------------------------------------------------------------
alias foobar='nocorrect foobar'
alias g8='nocorrect g8'

# -------------------------------------------------------------------
# Ruby stuff
# -------------------------------------------------------------------
@@ -70,13 +64,6 @@ fi
# -------------------------------------------------------------------
alias grep='grep --color=auto'

# -------------------------------------------------------------------
# remote machines
# -------------------------------------------------------------------
alias rb='ssh -L 6697:irc.redbrick.dcu.ie:6667 redbrick.dcu.ie'
alias rbtunnel='ssh -N -f -n -L 6697:irc.redbrick.dcu.ie:6667 136.206.15.25'
#alias rbvm ='ssh -L 5900:136.206.16.1:5913 butlerx@login.redbrick.dcu.ie'

# -------------------------------------------------------------------
# database
# -------------------------------------------------------------------
@@ -150,7 +137,7 @@ alias sz='source ~/.zshrc'
# -------------------------------------------------------------------
# Source: http://aur.archlinux.org/packages/lolbash/lolbash/lolbash.sh
# -------------------------------------------------------------------
#alias wtf='dmesg'
alias wtf='dmesg'
alias onoz='cat /var/log/errors.log'
alias rtfm='man'
alias visible='echo'


+ 8
- 2
zsh.d/functions.zsh View File

@@ -557,8 +557,14 @@ weather() {
}

touch.py() {
mkdir -p "$@"
touch "$@"/__init__.py
DIR="$1"
mkdir -p "$DIR"
FILE="${DIR}.py"
if [ -f "$FILE" ]; then
mv "$FILE" "${DIR}/__init__.py"
else
touch "${DIR}/__init__.py"
fi
}

abbr() {


Loading…
Cancel
Save