diff --git a/HOME/.Xresources b/HOME/.Xresources
deleted file mode 100644
index 6b0e8ec..0000000
--- a/HOME/.Xresources
+++ /dev/null
@@ -1,55 +0,0 @@
-Xft.dpi: 109
-Xft.antialias: true
-Xft.hinting: true
-Xft.rgba: rgb
-Xft.autohint: false
-Xft.hintstyle: hintslight
-Xft.lcdfilter: lcddefault
-
-*pointerColorBackground: #2B2C2B
-*pointerColorForeground: #16A085
-Xcursor.theme: Adwaita
-Xcursor.size: 0
-
-#define base00 #2d2d2d
-#define base01 #393939
-#define base02 #515151
-#define base03 #747369
-#define base04 #a09f93
-#define base05 #d3d0c8
-#define base06 #e8e6df
-#define base07 #f2f0ec
-#define base08 #f2777a
-#define base09 #f99157
-#define base0A #ffcc66
-#define base0B #99cc99
-#define base0C #66cccc
-#define base0D #6699cc
-#define base0E #cc99cc
-#define base0F #d27b53
-
-*.foreground: base05
-#ifdef background_opacity
-*.background: [background_opacity]base00
-#else
-*.background: base00
-#endif
-*.cursorColor: base05
-
-*.color0: base00
-*.color1: base08
-*.color2: base0B
-*.color3: base0A
-*.color4: base0D
-*.color5: base0E
-*.color6: base0C
-*.color7: base05
-
-*.color8: base03
-*.color9: base08
-*.color10: base0B
-*.color11: base0A
-*.color12: base0D
-*.color13: base0E
-*.color14: base0C
-*.color15: base07
diff --git a/HOME/.profile b/HOME/.profile
new file mode 100644
index 0000000..766f9f6
--- /dev/null
+++ b/HOME/.profile
@@ -0,0 +1,8 @@
+export EDITOR=/usr/bin/nvim
+export VISUAL=/usr/bin/nvim
+export TERMINAL=/usr/bin/kitty
+export PAGER="bat --style=header,rule,snip"
+export BROWSER=/usr/bin/vivaldi-stable
+
+export QT_QPA_PLATFORMTHEME="qt5ct"
+export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
diff --git a/HOME/.xprofile b/HOME/.xprofile
deleted file mode 100644
index 628fb89..0000000
--- a/HOME/.xprofile
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export TERMINAL=kitty
-export VISUAL=nvim
-export EDITOR=nvim
-export PAGER="bat --style=header,rule,snip"
-export BROWSER=/usr/bin/vivaldi-stable
diff --git a/dunst/dunstrc b/dunst/dunstrc
deleted file mode 100644
index abf5586..0000000
--- a/dunst/dunstrc
+++ /dev/null
@@ -1,152 +0,0 @@
-[global]
- monitor = 0
- follow = keyboard
- geometry = "350x5-0+24"
- indicate_hidden = yes
- shrink = yes
- transparency = 20
- notification_height = 0
- separator_height = 2
- padding = 0
- horizontal_padding = 8
- frame_width = 3
- frame_color = "#282828"
-
- # Define a color for the separator.
- # possible values are:
- # * auto: dunst tries to find a color fitting to the background;
- # * foreground: use the same color as the foreground;
- # * frame: use the same color as the frame;
- # * anything else will be interpreted as a X color.
- separator_color = frame
-
- # Sort messages by urgency.
- sort = yes
-
- idle_threshold = 120
- font = Monospace 14
- line_height = 0
- markup = full
-
- # The format of the message. Possible variables are:
- # %a appname
- # %s summary
- # %b body
- # %i iconname (including its path)
- # %I iconname (without its path)
- # %p progress value if set ([ 0%] to [100%]) or nothing
- # %n progress value if set without any extra characters
- # %% Literal %
- # Markup is allowed
- format = "%s\n%b"
-
- alignment = left
- show_age_threshold = 60
- word_wrap = yes
- ellipsize = middle
- ignore_newline = no
- stack_duplicates = true
- hide_duplicate_count = true
- show_indicators = yes
- icon_position = left
- max_icon_size = 40
- #icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/:/usr/share/icons/Adwaita/256x256/status/
- sticky_history = yes
- history_length = 20
- dmenu = /usr/bin/dmenu -p dunst:
- browser = /usr/bin/firefox -new-tab
-
- # Always run rule-defined scripts, even if the notification is suppressed
- always_run_script = true
-
- title = Dunst
- class = Dunst
- startup_notification = false
- force_xinerama = false
-[experimental]
- per_monitor_dpi = false
-
-[shortcuts]
- close = ctrl+space
- close_all = ctrl+shift+space
- history = ctrl+grave
- context = ctrl+shift+period
-
-[urgency_low]
- # IMPORTANT: colors have to be defined in quotation marks.
- # Otherwise the "#" and following would be interpreted as a comment.
- background = "#282828"
- foreground = "#928374"
- timeout = 5
- # Icon for notifications with low urgency, uncomment to enable
- #icon = /path/to/icon
-
-[urgency_normal]
- background = "#458588"
- foreground = "#ebdbb2"
- timeout = 5
-
-[urgency_critical]
- background = "#cc2421"
- foreground = "#ebdbb2"
- frame_color = "#fabd2f"
- timeout = 0
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-# Messages can be matched by "appname", "summary", "body", "icon", "category",
-# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
-# "background", "new_icon" and "format".
-# Shell-like globbing will get expanded.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-# script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-#[espeak]
-# summary = "*"
-# script = dunst_espeak.sh
-
-#[script-test]
-# summary = "*script*"
-# script = dunst_test.sh
-
-#[ignore]
-# # This notification will not be displayed
-# summary = "foobar"
-# format = ""
-
-#[history-ignore]
-# # This notification will not be saved in history
-# summary = "foobar"
-# history_ignore = yes
-
-#[signed_on]
-# appname = Pidgin
-# summary = "*signed on*"
-# urgency = low
-#
-#[signed_off]
-# appname = Pidgin
-# summary = *signed off*
-# urgency = low
-#
-#[says]
-# appname = Pidgin
-# summary = *says*
-# urgency = critical
-#
-#[twitter]
-# appname = Pidgin
-# summary = *twitter.com*
-# urgency = normal
-#
-# vim: ft=cfg
diff --git a/etc/ssh/sshd_config b/etc/ssh/sshd_config
deleted file mode 100644
index 35ff663..0000000
--- a/etc/ssh/sshd_config
+++ /dev/null
@@ -1,120 +0,0 @@
-# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $
-
-# This is the sshd server system-wide configuration file. See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented. Uncommented options override the
-# default value.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-#PermitRootLogin prohibit-password
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile .ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
-#PermitEmptyPasswords no
-
-# Change to no to disable s/key passwords
-ChallengeResponseAuthentication no
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-# GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication. Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding yes
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-PrintMotd no # pam does that
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-UseDNS no
-#PidFile /run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#VersionAddendum none
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem sftp /usr/lib/ssh/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-# X11Forwarding no
-# AllowTcpForwarding no
-# PermitTTY no
-# ForceCommand cvs server
-
-# HB edits
-AllowUsers hjalmarlucius
-Protocol 2
diff --git a/fish/config.fish b/fish/config.fish
index 6ee2a92..55b537c 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,9 +1,7 @@
-pyenv init - | source
-set -x QT_QPA_PLATFORMTHEME "qt5ct"
-set -x GTK2_RC_FILES "$HOME/.gtkrc-2.0"
-set -x PAGER "less -isgj.5"
-
-# cuda stuff
-set -x CUDA_HOME /opt/cuda
-set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH $CUDA_HOME/lib64
-set -Ua fish_user_paths /home/hjalmarlucius/.local/bin/
+if status is-interactive
+ pyenv init - | source
+ set -x PAGER "less -isgj.5"
+ set -Ua fish_user_paths /home/hjalmarlucius/.local/bin/
+ set -x CUDA_HOME /opt/cuda
+ set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH $CUDA_HOME/lib64
+end
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
deleted file mode 100644
index 371c307..0000000
--- a/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[Settings]
-gtk-theme-name=Arc-Gruvbox
-gtk-icon-theme-name=Adwaita
-gtk-font-name=Sans 10
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_TEXT
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=rgb
-gtk-cursor-theme-name=Adwaita
diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config
deleted file mode 100644
index 9528fc4..0000000
--- a/hjalmar-droneship/i3/config
+++ /dev/null
@@ -1,330 +0,0 @@
-# i3 config file (v4)
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-# Set mod key (Mod1=, Mod4=)
-set $mod Mod4
-
-# set default desktop layout (default is tiling)
-# workspace_layout tabbed
-
-# Configure border style
-default_border pixel 3
-default_floating_border normal
-
-# Hide borders
-hide_edge_borders none
-
-# configure some stuff
-focus_follows_mouse no
-mouse_warping none
-workspace_auto_back_and_forth no
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font xft:URWGothic-Book 11
-
-# Use Mouse+$mod to drag floating windows
-floating_modifier $mod
-
-# Autostart applications
-exec --no-startup-id start-pulseaudio-x11
-exec --no-startup-id pa-applet
-exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec --no-startup-id nm-applet
-exec --no-startup-id nitrogen --restore
-exec --no-startup-id xfce4-power-manager
-exec --no-startup-id pamac-tray
-exec --no-startup-id xautolock -time 10 -locker blurlock
-exec --no-startup-id blueman-applet
-exec_always --no-startup-id sbxkb
-exec_always --no-startup-id fix_xcursor
-
-# HB STARTUP ADDITIONS
-exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys -option caps:escape
-exec --no-startup-id redshift-gtk -l 59.91:10.75
-exec --no-startup-id dropbox start &
-exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60
-exec --no-startup-id xrandr \
- --output DP-0 --auto --primary --gamma 0.9:0.9:0.9 \
- --output DP-2 --auto --right-of DP-0 --gamma 0.9:0.9:0.9
-exec --no-startup-id xinput --set-prop 'ROCCAT ROCCAT Burst Pro' 'libinput Accel Profile Enabled' 0, 1, 0
-
-# div bindings
-bindsym $mod+Shift+q kill
-bindsym $mod+q split toggle
-bindsym $mod+v split h; exec notify-send 'tile horizontally'
-bindsym $mod+s split v; exec notify-send 'tile vertically'
-bindsym $mod+f fullscreen toggle
-
-bindsym $mod+w layout stacking
-bindsym $mod+t layout tabbed
-bindsym $mod+e layout toggle split
-bindsym $mod+a focus parent
-bindsym $mod+Shift+a focus child
-
-bindsym $mod+r reload
-bindsym $mod+Shift+r restart
-
-bindsym $mod+space focus mode_toggle
-bindsym $mod+Shift+space floating toggle
-bindsym $mod+Ctrl+space sticky toggle
-
-bindsym $mod+Shift+p exec picom-trans -c -10
-bindsym $mod+p exec picom-trans -c +10
-
-bindsym $mod+minus scratchpad show
-bindsym $mod+Shift+minus move scratchpad
-
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move down
-bindsym $mod+Shift+k move up
-bindsym $mod+Shift+l move right
-
-bindsym Pause exec pactl set-sink-volume @DEFAULT_SINK@ +10%
-bindsym Print exec pactl set-sink-volume @DEFAULT_SINK@ -10%
-bindsym Scroll_Lock exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-
-set $rofiopts -show-icons -matching fuzzy -lines 10 -eh 2 -width 30
-bindsym $mod+d exec rofi -show drun $rofiopts
-bindsym $mod+Shift+d exec rofi -show run $rofiopts
-
-bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui
-bindsym $mod+Shift+x --release exec --no-startup-id xkill
-
-bindsym $mod+F1 exec i3-sensible-terminal -e 'htop'
-bindsym $mod+Shift+F1 exec i3-sensible-terminal -e 'glances'
-bindsym $mod+F2 exec "vivaldi-stable"
-bindsym $mod+F3 exec i3-sensible-terminal -e 'ranger'
-bindsym $mod+Shift+F3 exec thunar
-bindsym $mod+F4 exec pamac-manager
-bindsym $mod+F5 exec pavucontrol
-bindsym $mod+F6 exec i3-sensible-terminal -e 'mocp'
-bindsym $mod+Shift+F6 exec i3-sensible-terminal -e 'ncspot'
-bindsym $mod+F9 exec --no-startup-id picom -b
-bindsym $mod+Shift+F9 exec --no-startup-id pkill picom
-bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'"
-bindsym $mod+Shift+F12 exec "xrandr --auto"
-
-bindsym $mod+0 mode "$mode_system"
-bindsym $mod+z mode "resize"
-bindsym $mod+g mode "$mode_gaps"
-bindsym $mod+c exec qalculate-gtk
-bindsym $mod+u exec zulip
-
-# Workspace names
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "Ins"
-set $ws6 "Home"
-set $ws7 "PgUp"
-set $ws8 "Del"
-set $ws9 "End"
-set $ws0 "PgDn"
-
-# switch to workspace
-workspace $ws1 output DP-0
-workspace $ws2 output DP-2
-workspace $ws3 output DP-0
-workspace $ws4 output DP-2
-workspace $ws5 output DP-0
-workspace $ws6 output DP-0
-workspace $ws7 output DP-0
-workspace $ws8 output DP-2
-workspace $ws9 output DP-2
-workspace $ws0 output DP-2
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+Insert workspace $ws5
-bindsym $mod+Home workspace $ws6
-bindsym $mod+Prior workspace $ws7
-bindsym $mod+Delete workspace $ws8
-bindsym $mod+End workspace $ws9
-bindsym $mod+Next workspace $ws0
-
-# Move focused container to workspace
-bindsym $mod+Ctrl+1 move container to workspace $ws1
-bindsym $mod+Ctrl+2 move container to workspace $ws2
-bindsym $mod+Ctrl+3 move container to workspace $ws3
-bindsym $mod+Ctrl+4 move container to workspace $ws4
-bindsym $mod+Ctrl+Insert move container to workspace $ws5
-bindsym $mod+Ctrl+Home move container to workspace $ws6
-bindsym $mod+Ctrl+Prior move container to workspace $ws7
-bindsym $mod+Ctrl+Delete move container to workspace $ws8
-bindsym $mod+Ctrl+End move container to workspace $ws9
-bindsym $mod+Ctrl+Next move container to workspace $ws0
-
-# Move to workspace with focused container
-bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+Insert move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+Home move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+Prior move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+Delete move container to workspace $ws8; workspace $ws8
-bindsym $mod+Shift+End move container to workspace $ws9; workspace $ws9
-bindsym $mod+Shift+Next move container to workspace $ws0; workspace $ws0
-
-# Open specific applications in floating mode
-for_window [class=".*"] border pixel 3
-for_window [class="GParted"] floating enable border normal
-for_window [class="Lightdm-settings"] floating enable
-for_window [class="Qalculate-gtk"] floating enable sticky enable border normal
-for_window [class="Zulip"] floating enable sticky enable border normal
-for_window [class="Lxappearance"] floating enable sticky enable border normal
-for_window [class="Manjaro-hello"] floating enable
-for_window [class="Manjaro Settings Manager"] floating enable border normal
-for_window [class="Nitrogen"] floating enable sticky enable border normal
-for_window [class="Pamac-manager"] floating enable
-for_window [class="Pavucontrol"] floating enable
-for_window [class="qt5ct"] floating enable sticky enable border normal
-for_window [title="Origin"] floating enable
-
-# Set shut down, restart and locking features
-set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (s)hutdown
-mode "$mode_system" {
- bindsym l exec --no-startup-id i3exit lock, mode "default"
- bindsym u exec --no-startup-id i3exit switch_user, mode "default"
- bindsym e exec --no-startup-id i3exit logout, mode "default"
- bindsym r exec --no-startup-id i3exit reboot, mode "default"
- bindsym s exec --no-startup-id i3exit shutdown, mode "default"
-
- # exit system mode: "Enter" or "Escape"
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-
-# Resize window (you can also use the mouse for that)
-mode "resize" {
- # These bindings trigger as soon as you enter the resize mode
- bindsym h resize shrink width 10 px or 10 ppt
- bindsym k resize grow height 10 px or 10 ppt
- bindsym j resize shrink height 10 px or 10 ppt
- bindsym l resize grow width 10 px or 10 ppt
-
- # exit resize mode: Enter or Escape
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-
-# Color palette used for the terminal ( ~/.Xresources file )
-set_from_resource $term_background background
-set_from_resource $term_foreground foreground
-set_from_resource $term_color0 color0
-set_from_resource $term_color1 color1
-set_from_resource $term_color2 color2
-set_from_resource $term_color3 color3
-set_from_resource $term_color4 color4
-set_from_resource $term_color5 color5
-set_from_resource $term_color6 color6
-set_from_resource $term_color7 color7
-set_from_resource $term_color8 color8
-set_from_resource $term_color9 color9
-set_from_resource $term_color10 color10
-set_from_resource $term_color11 color11
-set_from_resource $term_color12 color12
-set_from_resource $term_color13 color13
-set_from_resource $term_color14 color14
-set_from_resource $term_color15 color15
-
-# Start i3bar to display a workspace bar (plus the system information i3status if available)
-bar {
- i3bar_command i3bar
- status_command i3status
- position bottom
-
- tray_output primary
- bindsym button4 nop
- bindsym button5 nop
- strip_workspace_numbers yes
-
- colors {
- background #222D31
- statusline #F9FAF9
- separator #454947
-
-# border backgr. text
- focused_workspace #F9FAF9 #16a085 #292F34
- active_workspace #595B5B #353836 #FDF6E3
- inactive_workspace #595B5B #222D31 #EEE8D5
- binding_mode #16a085 #2C2C2C #F9FAF9
- urgent_workspace #16a085 #FDF6E3 #E5201D
- }
-}
-
-# Theme colors
-# class border backgr. text indic. child_border
- client.focused #556064 #f9ce5c #000000 #FDF6E3
- client.focused_inactive #CB4B16 #2F3D44 #1ABC9C #454948
- client.unfocused #556064 #2F3D44 #1ABC9C #454948
- client.urgent #CB4B16 #FDF6E3 #1ABC9C #268BD2
- client.placeholder #000000 #0c0c0c #ffffff #000000
-
- client.background #2B2C2B
-
-#############################
-### settings for i3-gaps: ###
-#############################
-
-# Set inner/outer gaps
-gaps inner 0
-gaps outer 0
-
-# Additionally, you can issue commands with the following syntax. This is useful to bind keys to changing the gap size.
-# gaps inner|outer current|all set|plus|minus
-# gaps inner all set 10
-# gaps outer all plus 5
-
-# Smart gaps (gaps used if only more than one container on the workspace)
-smart_gaps on
-
-# Smart borders (draw borders around container only if it is not the only container on this workspace)
-# on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0)
-smart_borders on
-
-# Press $mod+Shift+g to enter the gap mode. Choose o or i for modifying outer/inner gaps. Press one of + / - (in-/decrement for current workspace) or 0 (remove gaps for current workspace). If you also press Shift with these keys, the change will be global for all workspaces.
-set $mode_gaps Gaps: (o) outer, (i) inner
-set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
-set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
-mode "$mode_gaps" {
- bindsym o mode "$mode_gaps_outer"
- bindsym i mode "$mode_gaps_inner"
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-mode "$mode_gaps_inner" {
- bindsym plus gaps inner current plus 5
- bindsym minus gaps inner current minus 5
- bindsym 0 gaps inner current set 0
-
- bindsym Shift+plus gaps inner all plus 5
- bindsym Shift+minus gaps inner all minus 5
- bindsym Shift+0 gaps inner all set 0
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-mode "$mode_gaps_outer" {
- bindsym plus gaps outer current plus 5
- bindsym minus gaps outer current minus 5
- bindsym 0 gaps outer current set 0
-
- bindsym Shift+plus gaps outer all plus 5
- bindsym Shift+minus gaps outer all minus 5
- bindsym Shift+0 gaps outer all set 0
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
diff --git a/hjalmar-mothership/i3/config b/i3/config
similarity index 74%
rename from hjalmar-mothership/i3/config
rename to i3/config
index 67a8791..6393058 100644
--- a/hjalmar-mothership/i3/config
+++ b/i3/config
@@ -1,14 +1,11 @@
-# i3 config file (v4)
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-# Set mod key (Mod1=, Mod4=)
+# Set mod key to Super
set $mod Mod4
# set default desktop layout (default is tiling)
# workspace_layout tabbed
# Configure border style
-default_border pixel 3
+default_border pixel 1
default_floating_border normal
# Hide borders
@@ -27,7 +24,7 @@ font xft:URWGothic-Book 11
floating_modifier $mod
# Autostart applications
-exec --no-startup-id start-pulseaudio-x11
+exec --no-startup-id pulseaudio
exec --no-startup-id pa-applet
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec --no-startup-id nm-applet
@@ -41,11 +38,8 @@ exec_always --no-startup-id fix_xcursor
# HB STARTUP ADDITIONS
exec --no-startup-id setxkbmap -layout no -model pc105 -variant nodeadkeys -option caps:escape
-exec --no-startup-id redshift-gtk -l 59.91:10.75
-exec --no-startup-id dropbox start &
+exec --no-startup-id redshift-gtk -l 59.91:10.76
exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60
-exec --no-startup-id xrandr --output DP-0 --mode 5120x1440
-exec --no-startup-id xinput --set-prop 'Logitech USB Receiver' 'libinput Accel Profile Enabled' 0, 1, 0
# div bindings
bindsym $mod+Shift+q kill
@@ -91,23 +85,20 @@ set $rofiopts -show-icons -matching fuzzy -lines 10 -eh 2 -width 30
bindsym $mod+d exec rofi -show drun $rofiopts
bindsym $mod+Shift+d exec rofi -show run $rofiopts
-bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui
+bindsym $mod+Return exec kitty
+bindsym $mod+Shift+s --release exec --no-startup-id i3-scrot -s
bindsym $mod+Shift+x --release exec --no-startup-id xkill
-bindsym $mod+F1 exec i3-sensible-terminal -e 'htop'
-bindsym $mod+Shift+F1 exec i3-sensible-terminal -e 'glances'
-bindsym $mod+F2 exec "vivaldi-stable"
-bindsym $mod+F3 exec i3-sensible-terminal -e 'ranger'
-bindsym $mod+Shift+F3 exec thunar
-bindsym $mod+F4 exec pamac-manager
+bindsym $mod+F1 exec kitty -e 'htop'
+bindsym $mod+F2 exec vivaldi-stable
+bindsym $mod+F3 exec pcmanfm
+bindsym $mod+F4 exec kitty -e 'ranger'
bindsym $mod+F5 exec pavucontrol
-bindsym $mod+F6 exec i3-sensible-terminal -e 'mocp'
-bindsym $mod+Shift+F6 exec i3-sensible-terminal -e 'ncspot'
+bindsym $mod+F6 exec kitty -e 'mocp'
+bindsym $mod+F7 exec kitty -e 'ncspot'
bindsym $mod+F9 exec --no-startup-id picom -b
bindsym $mod+Shift+F9 exec --no-startup-id pkill picom
bindsym $mod+Shift+F10 --release exec "killall dunst; exec notify-send 'restart dunst'"
-bindsym $mod+Shift+F12 exec "xrandr --output DP-0 --mode 5120x1440"
bindsym $mod+0 mode "$mode_system"
bindsym $mod+z mode "resize"
@@ -115,63 +106,7 @@ bindsym $mod+g mode "$mode_gaps"
bindsym $mod+c exec qalculate-gtk
bindsym $mod+u exec zulip
-# Workspace names
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-
-# switch to workspace
-workspace $ws1 output DP-0
-workspace $ws2 output DP-0
-workspace $ws3 output DP-0
-workspace $ws4 output DP-0
-workspace $ws5 output DP-0
-workspace $ws6 output DP-0
-workspace $ws7 output DP-0
-workspace $ws8 output DP-0
-workspace $ws9 output DP-0
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-
-# Move focused container to workspace
-bindsym $mod+Ctrl+1 move container to workspace $ws1
-bindsym $mod+Ctrl+2 move container to workspace $ws2
-bindsym $mod+Ctrl+3 move container to workspace $ws3
-bindsym $mod+Ctrl+4 move container to workspace $ws4
-bindsym $mod+Ctrl+5 move container to workspace $ws5
-bindsym $mod+Ctrl+6 move container to workspace $ws6
-bindsym $mod+Ctrl+7 move container to workspace $ws7
-bindsym $mod+Ctrl+8 move container to workspace $ws8
-bindsym $mod+Ctrl+9 move container to workspace $ws9
-
-# Move to workspace with focused container
-bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9
-
# Open specific applications in floating mode
-for_window [class=".*"] border pixel 3
for_window [class="GParted"] floating enable border normal
for_window [class="Lightdm-settings"] floating enable
for_window [class="Qalculate-gtk"] floating enable sticky enable border normal
@@ -183,7 +118,6 @@ for_window [class="Nitrogen"] floating enable sticky enable border normal
for_window [class="Pamac-manager"] floating enable
for_window [class="Pavucontrol"] floating enable
for_window [class="qt5ct"] floating enable sticky enable border normal
-for_window [title="Origin"] floating enable
# Set shut down, restart and locking features
set $mode_system (l)ock, (e)xit, switch_(u)ser, (r)eboot, (s)hutdown
@@ -266,6 +200,10 @@ bar {
client.placeholder #000000 #0c0c0c #ffffff #000000
client.background #2B2C2B
+# Theme colors (ORIGINAL)
+# client.focused #556064 #80FFF9
+# client.focused_inactive #2F3D44
+# client.unfocused #2F3D44
#############################
### settings for i3-gaps: ###
@@ -291,6 +229,7 @@ smart_borders on
set $mode_gaps Gaps: (o) outer, (i) inner
set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
+
mode "$mode_gaps" {
bindsym o mode "$mode_gaps_outer"
bindsym i mode "$mode_gaps_inner"
@@ -321,3 +260,4 @@ mode "$mode_gaps_outer" {
bindsym Return mode "default"
bindsym Escape mode "default"
}
+include ~/.config/i3/local_config
diff --git a/i3/hjalmar-droneship/local_config b/i3/hjalmar-droneship/local_config
new file mode 100644
index 0000000..dd09441
--- /dev/null
+++ b/i3/hjalmar-droneship/local_config
@@ -0,0 +1,66 @@
+exec --no-startup-id xrandr \
+ --output DP-0 --auto --primary --gamma 0.9:0.9:0.9 \
+ --output DP-2 --auto --right-of DP-0 --gamma 0.9:0.9:0.9
+exec --no-startup-id xinput --set-prop 'ROCCAT ROCCAT Burst Pro' 'libinput Accel Profile Enabled' 0, 1, 0
+
+bindsym $mod+Shift+F12 exec "xrandr --auto"
+
+# Workspace names
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "Ins"
+set $ws6 "Home"
+set $ws7 "PgUp"
+set $ws8 "Del"
+set $ws9 "End"
+set $ws0 "PgDn"
+
+# switch to workspace
+workspace $ws1 output DP-0
+workspace $ws2 output DP-2
+workspace $ws3 output DP-0
+workspace $ws4 output DP-2
+workspace $ws5 output DP-0
+workspace $ws6 output DP-0
+workspace $ws7 output DP-0
+workspace $ws8 output DP-2
+workspace $ws9 output DP-2
+workspace $ws0 output DP-2
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+Insert workspace $ws5
+bindsym $mod+Home workspace $ws6
+bindsym $mod+Prior workspace $ws7
+bindsym $mod+Delete workspace $ws8
+bindsym $mod+End workspace $ws9
+bindsym $mod+Next workspace $ws0
+
+# Move focused container to workspace
+bindsym $mod+Ctrl+1 move container to workspace $ws1
+bindsym $mod+Ctrl+2 move container to workspace $ws2
+bindsym $mod+Ctrl+3 move container to workspace $ws3
+bindsym $mod+Ctrl+4 move container to workspace $ws4
+bindsym $mod+Ctrl+Insert move container to workspace $ws5
+bindsym $mod+Ctrl+Home move container to workspace $ws6
+bindsym $mod+Ctrl+Prior move container to workspace $ws7
+bindsym $mod+Ctrl+Delete move container to workspace $ws8
+bindsym $mod+Ctrl+End move container to workspace $ws9
+bindsym $mod+Ctrl+Next move container to workspace $ws0
+
+# Move to workspace with focused container
+bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
+bindsym $mod+Shift+Insert move container to workspace $ws5; workspace $ws5
+bindsym $mod+Shift+Home move container to workspace $ws6; workspace $ws6
+bindsym $mod+Shift+Prior move container to workspace $ws7; workspace $ws7
+bindsym $mod+Shift+Delete move container to workspace $ws8; workspace $ws8
+bindsym $mod+Shift+End move container to workspace $ws9; workspace $ws9
+bindsym $mod+Shift+Next move container to workspace $ws0; workspace $ws0
diff --git a/i3/hjalmar-mothership/local_config b/i3/hjalmar-mothership/local_config
new file mode 100644
index 0000000..6f1012a
--- /dev/null
+++ b/i3/hjalmar-mothership/local_config
@@ -0,0 +1,59 @@
+exec --no-startup-id xrandr --output DP-0 --mode 5120x1440
+exec --no-startup-id xinput --set-prop 'Logitech USB Receiver' 'libinput Accel Profile Enabled' 0, 1, 0
+
+bindsym $mod+Shift+F12 exec "xrandr --output DP-0 --mode 5120x1440"
+
+# switch to workspace
+workspace $ws1 output DP-0
+workspace $ws2 output DP-0
+workspace $ws3 output DP-0
+workspace $ws4 output DP-0
+workspace $ws5 output DP-0
+workspace $ws6 output DP-0
+workspace $ws7 output DP-0
+workspace $ws8 output DP-0
+workspace $ws9 output DP-0
+
+# Workspace names
+set $ws1 1
+set $ws2 2
+set $ws3 3
+set $ws4 4
+set $ws5 5
+set $ws6 6
+set $ws7 7
+set $ws8 8
+set $ws9 9
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+
+# Move focused container to workspace
+bindsym $mod+Ctrl+1 move container to workspace $ws1
+bindsym $mod+Ctrl+2 move container to workspace $ws2
+bindsym $mod+Ctrl+3 move container to workspace $ws3
+bindsym $mod+Ctrl+4 move container to workspace $ws4
+bindsym $mod+Ctrl+5 move container to workspace $ws5
+bindsym $mod+Ctrl+6 move container to workspace $ws6
+bindsym $mod+Ctrl+7 move container to workspace $ws7
+bindsym $mod+Ctrl+8 move container to workspace $ws8
+bindsym $mod+Ctrl+9 move container to workspace $ws9
+
+# Move to workspace with focused container
+bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9
diff --git a/hjalmar-droneship/i3status/config b/i3status/hjalmar-droneship/config
similarity index 100%
rename from hjalmar-droneship/i3status/config
rename to i3status/hjalmar-droneship/config
diff --git a/hjalmar-mothership/i3status/config b/i3status/hjalmar-mothership/config
similarity index 100%
rename from hjalmar-mothership/i3status/config
rename to i3status/hjalmar-mothership/config
diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
deleted file mode 100644
index e618d00..0000000
--- a/nvim/coc-settings.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "coc.prefereces.enableMessageDialog": true,
- "coc.preferences.useQuickfixForLocations": true,
- "coc.preferences.formatOnType": true,
- "coc.preferences.formatOnSaveFiletypes": ["python", "markdown"],
- "coc.preferences.formatOnTypeFiletypes": ["python", "markdown"],
- "signature.target": "echo",
- "suggest.autoTrigger": "always",
- "python.analysis.diagnosticMode": "workspace",
- "python.formatting.provider": "black",
- "python.linting.enabled": true,
- "python.linting.flake8Enabled": true,
- "python.linting.mypyEnabled": true,
- "python.linting.pylintEnabled": false,
- "python.analysis.useLibraryCodeForTypes": true,
- "git.enableGutters": true,
- "yaml.format.enable": true,
- "yaml.format.singleQuote": true
-}
diff --git a/nvim/ftplugins/lua.vim b/nvim/ftplugins/lua.vim
deleted file mode 100644
index 9603a7d..0000000
--- a/nvim/ftplugins/lua.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal tabstop=2
-setlocal softtabstop=2
-setlocal shiftwidth=2
-setlocal formatoptions=croql
diff --git a/nvim/ftplugins/markdown.vim b/nvim/ftplugins/markdown.vim
deleted file mode 100644
index 9603a7d..0000000
--- a/nvim/ftplugins/markdown.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal tabstop=2
-setlocal softtabstop=2
-setlocal shiftwidth=2
-setlocal formatoptions=croql
diff --git a/nvim/ftplugins/python.vim b/nvim/ftplugins/python.vim
deleted file mode 100644
index a0f8bcd..0000000
--- a/nvim/ftplugins/python.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal tabstop=4
-setlocal softtabstop=4
-setlocal shiftwidth=4
-setlocal formatoptions=ql
diff --git a/nvim/init.vim b/nvim/init.vim
deleted file mode 100644
index 151283a..0000000
--- a/nvim/init.vim
+++ /dev/null
@@ -1,445 +0,0 @@
-set shell=/usr/bin/bash
-let $SHELL="/usr/bin/bash"
-" -----------------------------------------------------------------------------
-" PLUGINS
-" -----------------------------------------------------------------------------
-if ! filereadable(expand('~/.config/nvim/autoload/plug.vim'))
- echo "Downloading junegunn/vim-plug to manage plugins..."
- silent !mkdir -p ~/.config/nvim/autoload/
- silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ~/.config/nvim/autoload/plug.vim
-endif
-let g:coc_global_extensions=[
- \ 'coc-pyright',
- \ 'coc-git',
- \ 'coc-tsserver',
- \ 'coc-yaml',
- \ 'coc-explorer',
- \ ]
-
-call plug#begin('~/.config/nvim/plugged')
-" tools
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'}
-Plug 'junegunn/fzf.vim'
-Plug 'antoinemadec/coc-fzf', {'branch': 'master'}
-Plug 'tpope/vim-abolish' " better search replace
-" git
-Plug 'tpope/vim-fugitive'
-" markdown
-Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() } }
-Plug 'plasticboy/vim-markdown' " markdown helper.
-Plug 'godlygeek/tabular'
-" helpers
-Plug 'tpope/vim-repeat'
-Plug 'tpope/vim-commentary' " commenting tool
-Plug 'tpope/vim-surround' " parentheses helper
-Plug 'tpope/vim-unimpaired'
-Plug 'tpope/vim-sensible'
-Plug 'tpope/vim-eunuch'
-Plug 'mbbill/undotree' " Persistent undo
-Plug 'farmergreg/vim-lastplace' " When reopen a buffer, puts the cursor where it was last time
-Plug 'haya14busa/vim-asterisk' " better asterisk motions
-Plug 'dkarter/bullets.vim'
-" python
-Plug 'tmhedberg/SimpylFold'
-Plug 'Vimjas/vim-python-pep8-indent'
-Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
-" syntax
-Plug 'cespare/vim-toml'
-" tmux
-Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim
-" aesthetics
-Plug 'chrisbra/Colorizer' " show color codes
-Plug 'junegunn/rainbow_parentheses.vim' " colorize parentheses
-" themes
-Plug 'chriskempson/base16-vim'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-Plug 'junegunn/seoul256.vim'
-Plug 'skbolton/embark'
-call plug#end()
-
-" -----------------------------------------------------------------------------
-" SETTINGS
-" -----------------------------------------------------------------------------
-" colors
-if !&termguicolors
- set termguicolors
-endif
-if &term =~ '256color'
- set t_ut=
-endif
-if !exists('g:colors_name')
- let g:seoul256_background=235
- silent! colorscheme seoul256
- " silent! colorscheme seoul256-light
- " silent! colorscheme base16-material-lighter
- " silent! colorscheme base16-monokai
- " silent! colorscheme base16-tomorrow-night
- " seoul256 theme config: dark 233-239, light 252-256
-endif
-set colorcolumn=88
-highlight ColorColumn ctermbg=0
-highlight LineNr guibg=NONE ctermbg=NONE
-highlight clear SignColumn
-
-" statusline
-set cmdheight=2
-let g:airline_powerline_fonts=1
-"let g:airline_theme='molokai'
-"let g:airline_theme='qwq'
-"let g:airline_theme='badwolf'
-"let g:airline_theme='silver'
-"let g:airline_theme='raven'
-" let g:airline_theme='laederon'
-let g:airline_theme='ayu_dark'
-let g:airline#extensions#tabline#enabled=1
-let g:airline#extensions#tabline#show_splits=0
-let g:airline#extensions#tabline#show_tabs=0
-let g:airline#extensions#tabline#show_buffers=1
-let g:airline#extensions#tabline#switch_buffers_and_tabs=0
-let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
-let g:airline#extensions#tabline#buffer_idx_mode = 1
-nmap 1 AirlineSelectTab1
-nmap 2 AirlineSelectTab2
-nmap 3 AirlineSelectTab3
-nmap 4 AirlineSelectTab4
-nmap 5 AirlineSelectTab5
-nmap 6 AirlineSelectTab6
-nmap 7 AirlineSelectTab7
-nmap 8 AirlineSelectTab8
-nmap 9 AirlineSelectTab9
-nmap 0 AirlineSelectTab0
-nmap - AirlineSelectPrevTab
-nmap + AirlineSelectNextTab
-
-" temporary files and undo
-set directory=/tmp//,.
-set backupdir=/tmp//,.
-set undodir=~/.cache/vim/undo/
-set noswapfile
-set nowritebackup
-set undofile " Persistent undo
-set undolevels=500 " Maximum number of changes that can be undone
-set undoreload=5000 " Maximum number lines to save for undo on a buffer reload
-
-" search
-" set ignorecase " Case insensitive search
-" set smartcase " ... but case sensitive when uc present
-
-" cursor
-set scrolljump=1 " Line to scroll when cursor leaves screen
-
-" buffers
-set splitright " Puts new vsplit windows to the right of the current
-set splitbelow " Puts new split windows to the bottom of the current
-set hidden " Allow buffer switching without saving
-set switchbuf=useopen
-
-" buffer
-set nowrap " Do not wrap long lines
-set cursorline " Highlight current line
-set number " Line numbers on
-
-" parentheses
-set showmatch " Show matching brackets/parentthesis
-
-" files and encodings
-set fileencodings=utf-8,ucs-bom,gb18030,gbk,gb2312,cp936
-set fileformats=unix,dos,mac
-
-" indentation
-set nosmartindent
-
-" folds
-set foldmethod=indent
-set nofoldenable
-let g:SimpylFold_docstring_preview = 1
-let g:SimpylFold_fold_docstring = 1
-" zm/M zr/R increase/increase foldlevel (max)
-" zo/O zc/C open / close fold (max)
-" za zA switch fold (small/full)
-" zi toggle folds
-" zi zj move to next / prev fold
-
-" tabs
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set expandtab
-
-" other
-set lazyredraw
-set updatetime=300
-set timeoutlen=500
-set conceallevel=2
-let g:BASH_Ctrl_j='off' " avoid 'C-j' being overridden to newline
-let g:BASH_Ctrl_l='off' " avoid 'C-l' being overridden to newline
-set shortmess=atOI " No help Uganda information, and overwrite read messages to avoid PRESS ENTER prompts
-set listchars=tab:→\ ,trail:·,extends:↷,precedes:↶,nbsp:+
-" eol:↵
-set fillchars=vert:│,stl:\ ,stlnc:\
-set clipboard+=unnamedplus
-set list
-
-
-" -----------------------------------------------------------------------------
-" KEYBINDS
-" -----------------------------------------------------------------------------
-
-" *****************************
-" MAPPING
-let mapleader="\"
-set pastetoggle=
-nmap r :so ~/.config/nvim/init.vim
-nmap e :tabe ~/dotfiles/nvim/init.vim
-nmap l :tabe ~/notes/libs.md
-nmap u :tabe ~/notes/urls.md
-nmap c :tabe ~/notes/cheatsheet.md
-nmap t :tabe ~/notes/todos.md
-nmap n :Explore ~/notes
-nmap d :Explore ~/dotfiles
-nmap w :cd %:p:h
-" vim-surround: visual 'SA' to wrap in A. Surround 'csAB' to change from A to B, 'dsA' to remove A. Word 'ysiwA' to wrap with A
-
-" *****************************
-" REMAPPING
-set langmap=å(,¨),Å{,^},Ø\\;,ø:,æ^,+$
-nnoremap æ "
-vnoremap æ "
-nnoremap Æ @
-vnoremap Æ @
-nnoremap ÆÆ @@
-vnoremap ÆÆ @@
-vnoremap v
-nmap :noh
-
-" *****************************
-" UNMAPPING
-nnoremap q:
-nnoremap Q
-
-" *****************************
-" TERMINAL
-tmap
-tmap
-nmap :terminal
-
-" *****************************
-" SEARCH
-set wildignorecase
-set wildignore+=*swp,*.class,*.pyc,*.png,*.jpg,*.gif,*.zip
-set wildignore+=*/tmp/*,*.o,*.obj,*.so " Unix
-set wildignore+=*\\tmp\\*,*.exe " Windows
-function! EnterSubdir()
- call feedkeys("\", 't')
- return ''
-endfunction
-cnoremap
-cnoremap
-cnoremap
-cnoremap EnterSubdir()
-map * (asterisk-z*)
-map g* (asterisk-gz*)
-map g# (asterisk-z#)
-map gz# (asterisk-gz#)
-let g:asterisk#keeppos=1
-
-" *****************************
-" CURSOR
-" stay visual when indenting
-vnoremap >gv
-vnoremap >gv
-vnoremap < (coc-diagnostic-prev)
-nmap (coc-diagnostic-next)
-" GoTo code navigation
-nmap (coc-git-prevchunk)
-nmap (coc-git-nextchunk)
-nmap gd (coc-definition)
-nmap gr (coc-references)
-" nmap gy (coc-type-definition)
-" nmap gi (coc-implementation)
-" nmap gD (coc-declaration)
-
-" *****************************
-" WINDOWS / BUFFERS
-let g:tmux_navigator_no_mappings=1
-nmap :TmuxNavigateLeft:call CleanEmptyBuffers()
-nmap :TmuxNavigateDown:call CleanEmptyBuffers()
-nmap :TmuxNavigateUp:call CleanEmptyBuffers()
-nmap :TmuxNavigateRight:call CleanEmptyBuffers()
-" make splits and tabs
-nnoremap :vnew
-nnoremap :new
-nnoremap :tabe %
-nnoremap :tabnew
-" buffers and tabs
-nmap :bprev:call CleanEmptyBuffers()
-nmap :bnext:call CleanEmptyBuffers()
-nmap :tabprev
-nmap :tabnext
-" resize windows with hjkl
-nnoremap <
-nnoremap -
-nnoremap +
-nnoremap >
-" quickfix window
-nmap :cp
-nmap :cn
-" remove buffer
-nmap :bprev:bd#
-nmap :bprev:bd!#
-
-" *****************************
-" GIT
-nmap (coc-git-chunkinfo)
-nmap :CocCommand git.chunkStage
-vmap :CocCommand git.chunkStage
-nmap :CocCommand git.chunkUndo
-vmap :CocCommand git.chunkUndo
-
-" *****************************
-" EXPLORERS
-" coc-explorer
-map :CocCommand explorer
-" vim-fugitive
-" g? for fugitive help. :Gdiff, :Gblame, :Gstats '=' expand, '-' add/reset changes, :Gcommit % to commit current file with messag
-map :vertical Git:vertical resize 60
-map :UndotreeToggle:UndotreeFocus
-
-" *****************************
-" POPUPS
-" Grep function
-function! RipgrepFzf(query, fullscreen)
- let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case -- %s || true'
- let initial_command = printf(command_fmt, shellescape(a:query))
- let reload_command = printf(command_fmt, '{q}')
- let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]}
- call fzf#vim#grep(initial_command, 1, fzf#vim#with_preview(spec), a:fullscreen)
-endfunction
-command! -nargs=* -bang RG call RipgrepFzf(, 0)
-"command! -bang -nargs=* Ag call fzf#vim#ag(, {'options': '--delimiter : --nth 4..'}, 0)
-let g:fzf_preview_command='bat --color=always --plain {-1}' " Installed bat
-let g:fzf_preview_grep_cmd='rg --smart-case --line-number --no-heading --color=never'
-let g:fzf_buffers_jump = 1
-" shortcuts
-nmap :Colors
-nmap :CocDiagnostics
-nmap (coc-refactor)
-nmap (coc-rename)
-nmap :copen
-nmap :vimgrep TODO **/*:copen
-nmap :checkt
-nmap :Commits
-nmap :BCommits
-nmap :CocFzfList
-nmap :Buffers
-nmap :RG
-nmap :GFiles?
-nmap :History
-nmap :Files
-nmap :GFiles
-nmap :Filetypes
-nmap :Marks
-
-" *****************************
-" COC CONFIGS
-" coc menus
-let g:coc_node_path='/usr/bin/node'
-function! s:check_back_space() abort
- let col=col('.') - 1
- return !col || getline('.')[col - 1] =~# '\s'
-endfunction
-imap
- \ pumvisible() ? "\" :
- \ check_back_space() ? "\" :
- \ coc#refresh()
-imap pumvisible() ? "\" : "\"
-imap coc#refresh()
-
-" Use K to show documentation in preview window.
-nnoremap K :call show_documentation()
-
-function! s:show_documentation()
- if (index(['vim','help'], &filetype) >= 0)
- execute 'h '.expand('')
- elseif (coc#rpc#ready())
- call CocActionAsync('doHover')
- else
- execute '!' . &keywordprg . " " . expand('')
- endif
-endfunction
-
-" coc hint scrolling
-nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\"
-nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\"
-inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\"
-inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\"
-
-" *****************************
-" MARKDOWN
-" vim-markdown
-let g:vim_markdown_new_list_item_indent=0
-let g:vim_markdown_auto_insert_bullets=1
-let g:vim_markdown_conceal=1
-let g:vim_markdown_conceal_code_blocks=1
-let g:vim_markdown_math=1
-let g:vim_markdown_folding_disabled=0
-" markdown preview
-let g:mkdp_auto_start=0 " auto start on moving into
-let g:mkdp_auto_close=0 " auto close on moving away
-let g:mkdp_open_to_the_world=0 " available to others
-let g:mkdp_open_ip='' " use custom IP to open preview page
-let g:mkdp_preview_options={
- \ 'disable_sync_scroll': 0,
- \ 'sync_scroll_type': 'middle',
- \ 'hide_yaml_meta': 1
- \ }
-" disable_sync_scroll: if disable sync scroll, default 0
-" sync_scroll_type: 'middle', 'top' or 'relative'
-" hide_yaml_meta: if hide yaml metadata, default is 1
-
-" *****************************
-" BULLETS
-let g:bullets_outline_levels = ['ROM', 'ABC', 'num', 'abc', 'rom', 'std-', 'std*']
-let g:bullets_enabled_file_types = ['markdown', 'text', 'gitcommit']
-
-" *****************************
-" autocmd
-function! CleanEmptyBuffers()
- let buffers = filter(range(1, bufnr('$')), 'buflisted(v:val) && empty(bufname(v:val)) && bufwinnr(v:val)<0 && !getbufvar(v:val, "&mod")')
- if !empty(buffers)
- exe 'bw ' . join(buffers, ' ')
- endif
-endfunction
-augroup myAu " A unique name for the group. DO NOT use the same name twice!
- autocmd!
- autocmd FileType markdown,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2
- autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Disables automatic commenting on newline
- autocmd BufEnter * if &filetype == "" | setlocal ft=none | endif " default new file is none
- " autocmd FileType * RainbowParentheses
- autocmd BufWritePre * %s/\s\+$//e " Automatically deletes all trailing whitespace on save.
- autocmd BufReadPost quickfix nmap " quickfix
- autocmd CompleteDone * if pumvisible() == 0 | pclose | endif " bugfix
- autocmd BufNewFile,BufRead *.cfg set syntax=cfg
-augroup end
-
-" CTRL-A CTRL-Q to select all and build quickfix list
-
-function! s:build_quickfix_list(lines)
- call setqflist(map(copy(a:lines), '{ "filename": v:val }'))
- copen
- cc
-endfunction
-
-let g:fzf_action = {
-\ 'ctrl-q': function('s:build_quickfix_list'),
-\ 'ctrl-t': 'tab split',
-\ 'ctrl-s': 'split',
-\ 'ctrl-v': 'vsplit' }
-
-let $FZF_DEFAULT_OPTS = '--bind alt-q:select-all+accept'
diff --git a/onedrive/config b/onedrive/config
deleted file mode 100644
index 65d8e55..0000000
--- a/onedrive/config
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration for OneDrive Linux Client
-# This file contains the list of supported configuration fields
-# with their default values.
-# All values need to be enclosed in quotes
-# When changing a config option below, remove the '#' from the start of the line
-# For explanations of all config options below see docs/USAGE.md or the man page.
-#
-sync_dir="~/OneDrive"
-skip_dir="Bilder/Camera Roll|Backup|Datasets|Pictures|Videos/Online only"
-skip_file=".~*|~*|*.tmp"
-# monitor_interval = "45"
-# skip_dir = "Videos"
-# log_dir = "/var/log/onedrive/"
-# drive_id = ""
-# upload_only = "false"
-# check_nomount = "false"
-# check_nosync = "false"
-# download_only = "false"
-# disable_notifications = "false"
-# disable_upload_validation = "false"
-# enable_logging = "false"
-# force_http_11 = "false"
-# force_http_2 = "false"
-# local_first = "false"
-# no_remote_delete = "false"
-skip_symlinks = "true"
-# debug_https = "false"
-# skip_dotfiles = "true"
-# dry_run = "false"
-# min_notify_changes = "5"
-# monitor_log_frequency = "5"
-# monitor_fullscan_frequency = "10"
-# sync_root_files = "false"
-# classify_as_big_delete = "1000"
-# user_agent = ""
-# remove_source_files = "false"
-# skip_dir_strict_match = "false"
-# application_id = ""
diff --git a/ranger/rc.conf b/ranger/rc.conf
index d2cec5f..346cbd2 100644
--- a/ranger/rc.conf
+++ b/ranger/rc.conf
@@ -87,7 +87,7 @@ set preview_images true
# * urxvt-full:
# The same as urxvt but utilizing not only the preview pane but the
# whole terminal window.
-set preview_images_method w3m
+set preview_images_method ueberzug
# Use a unicode "..." character to mark cut-off filenames?
set unicode_ellipsis false
@@ -122,7 +122,7 @@ set draw_borders true
set dirname_in_tabs false
# Enable the mouse support?
-set mouse_enabled false
+set mouse_enabled true
# Display the file size in the main column or status bar?
set display_size_in_main_column true
@@ -264,7 +264,7 @@ map S shell $SHELL
map : console
map ø console
map ! console shell%space
-map @ console -p6 shell %%s
+map @ console -p6 shell %s
map # console shell -p%space
map s console shell%space
map r chain draw_possible_programs; console open_with%space
@@ -310,7 +310,7 @@ map move to=-1
map move down=1 pages=True
map move up=1 pages=True
map move right=1
-map shell -s trash-put %s
+map