diff --git a/config.fish b/config.fish deleted file mode 100644 index 7423b6b..0000000 --- a/config.fish +++ /dev/null @@ -1,64 +0,0 @@ -alias l="ls -la" -alias ta="tmux attach -d" -alias e='emacsclient -a "" -t -nw' -alias emacs='emacs -q' -alias weather='curl http://wttr.in' - -# Vim -if command --search nvim >/dev/null - alias vi=nvim - alias vim=nvim - set -x EDITOR nvim -else - alias vi=vim - set -x EDITOR vim -end - -# Mac only -if command --search open >/dev/null - set -x BROWSER open -end - -# IOCOM stuff -alias er='rm -rf logs; unzip -o' -set -x P4USER dswan -set -x P4PORT "humu.iocom.com:1666" -set -x P4CONFIG p4.cfg -set -x P4EDITOR nvim -set -x P4IGNORE .ignore - -# PATH -test -e $HOME/dotfiles/bin ; and set -x PATH $HOME/dotfiles/bin $PATH -test -e $HOME/flutter/bin ; and set -x PATH $HOME/flutter/bin $PATH -test -e $HOME/.local/bin ; and set -x PATH $HOME/.local/bin $PATH -test -e $HOME/.cargo ; and set -x PATH $HOME/.cargo $PATH -test -e $HOME/.npm-packeges/bin ; and set -x PATH $HOME/.npm-packages/bin $PATH -test -e /usr/local/opt/python/libexec/bin ; and set -x PATH /usr/local/opt/python/libexec/bin $PATH -test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH - -# Keychain -if status --is-interactive - # TODO Take this out when keychain fixes this bug - set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1" - keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source -end - -# iTerm2 -test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish - -# Ledger -set -x LEDGER_FILE ~/Sync/Ledger/ledger.ledger - -# Emacs term stuff -function fish_title - true -end - -if test -n "$EMACS" - set -x TERM eterm-color -end - -set fish_greeting "" - -# Autojump -[ -f /usr/local/share/autojump/autojump.fish ]; and source /usr/local/share/autojump/autojump.fish diff --git a/glances.conf b/glances.conf deleted file mode 100644 index 65199d8..0000000 --- a/glances.conf +++ /dev/null @@ -1,2 +0,0 @@ -[network] -hide=lo,awdl0,p2p0,utun0,bridge0 diff --git a/home-common.nix b/home-common.nix index ced4280..f394944 100644 --- a/home-common.nix +++ b/home-common.nix @@ -21,25 +21,8 @@ keyMode = "vi"; baseIndex = 1; newSession = true; - plugins = with pkgs.tmuxPlugins; [ - sensible resurrect pain-control continuum copycat open urlview - { - plugin = yank; - extraConfig = "set -g @yank_selection_mouse 'primary'"; - } - ]; + plugins = with pkgs.tmuxPlugins; [ sensible resurrect pain-control continuum copycat open urlview yank ]; extraConfig = '' - bind-key -n C-0 select-window -t :0 - bind-key -n C-1 select-window -t :1 - bind-key -n C-2 select-window -t :2 - bind-key -n C-3 select-window -t :3 - bind-key -n C-4 select-window -t :4 - bind-key -n C-5 select-window -t :5 - bind-key -n C-6 select-window -t :6 - bind-key -n C-7 select-window -t :7 - bind-key -n C-8 select-window -t :8 - bind-key -n C-9 select-window -t :9 - set -g set-titles on set -g set-titles-string "#H (#S)" set -g status-right "" @@ -81,16 +64,6 @@ ''; }; - # programs.fish = { - # enable = true; - # shellAliases = { - # l = "ls -la"; - # ta = "tmux attach -d"; - # e = "emacsclient -a \"\" -t -nw"; - # weather = "curl http://wttr.in"; - # er = "rm -rf logs; unzip -o"; - # }; - # }; programs.zsh = { enable = true; enableAutosuggestions = true; diff --git a/home-linux.nix b/home-linux.nix index 3695673..e406b46 100644 --- a/home-linux.nix +++ b/home-linux.nix @@ -194,7 +194,6 @@ "${mod}+r" = "mode resize"; }; }; - # extraConfig = builtins.readFile ~/dotfiles/i3; }; }; diff --git a/i3 b/i3 deleted file mode 100644 index d6f62aa..0000000 --- a/i3 +++ /dev/null @@ -1,145 +0,0 @@ -set $mod Mod4 -gaps inner 10 -gaps outer 0 -smart_borders on - -for_window [class="^.*"] border pixel 0 -new_window pixel 1 - -for_window [class="mpv"] floating enable -for_window [class="mpv"] resize set 1500px 1000px -for_window [class="mpv"] move absolute position center - -for_window [class="feh"] floating enable -for_window [class="feh"] resize set 1500px 1000px -for_window [class="feh"] move absolute position center - -font pango:Iosevka Nerd Font Regular 8 - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# kill focused window -bindsym $mod+Shift+q kill - -# bindsym $mod+Return exec i3-sensible-terminal -bindsym $mod+Return exec alacritty -bindsym $mod+e exec dmenu_run -bindsym $mod+space exec "rofi -show combi" -bindsym $mod+Shift+e exec "emacsclient -c" -bindsym $mod+Shift+b exec "firefox" -bindsym XF86AudioRaiseVolume exec "amixer -q sset Master,0 1+ unmute" -bindsym XF86AudioLowerVolume exec "amixer -q sset Master,0 1- unmute" -bindsym XF86AudioMute exec "amixer -q sset Master,0 toggle" -# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -bindsym $mod+Tab focus right -bindsym $mod+Shift+Tab focus left - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+h move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+l move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+apostrophe split h - -# split in vertical orientation -bindsym $mod+minus split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+comma layout tabbed -bindsym $mod+period layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+Ctrl+space focus mode_toggle - -# focus the parent container -bindsym $mod+p focus parent - -# focus the child container -bindsym $mod+c focus child - -# Define names for default workspaces for which we configure key bindings later on. -# We use variables to avoid repeating the names in multiple places. -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" -set $ws10 "10" - -# 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 -bindsym $mod+0 workspace $ws10 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace $ws1 -bindsym $mod+Shift+2 move container to workspace $ws2 -bindsym $mod+Shift+3 move container to workspace $ws3 -bindsym $mod+Shift+4 move container to workspace $ws4 -bindsym $mod+Shift+5 move container to workspace $ws5 -bindsym $mod+Shift+6 move container to workspace $ws6 -bindsym $mod+Shift+7 move container to workspace $ws7 -bindsym $mod+Shift+8 move container to workspace $ws8 -bindsym $mod+Shift+9 move container to workspace $ws9 -bindsym $mod+Shift+0 move container to workspace $ws10 - -# reload the configuration file -bindsym $mod+Shift+r reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+c restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+period exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" - -mode "resize" { - bindsym h resize shrink width 2 px or 2 ppt - bindsym k resize grow height 2 px or 2 ppt - bindsym j resize shrink height 2 px or 2 ppt - bindsym l resize grow width 2 px or 2 ppt - - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+p mode "default" -} - -bindsym $mod+r mode "resize" diff --git a/ssh/config b/ssh/config deleted file mode 100644 index 70941d8..0000000 --- a/ssh/config +++ /dev/null @@ -1,11 +0,0 @@ -Host visionable - HostName dswan.visionable.com - User ec2-user - -Host dswan - HostName dswan.iocom.com - User root - -Host dustinswan - HostName dustinswan.com - User dustinswan