From fc917eecd0f667cb9f27f234ce87b9e9d08ef2b6 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Sat, 13 Apr 2019 23:32:14 -0400
Subject: [PATCH] more home manager

---
 home-common.nix |   2 +-
 linux.nix       | 123 ------------------------------------------------
 2 files changed, 1 insertion(+), 124 deletions(-)

diff --git a/home-common.nix b/home-common.nix
index 708ef4d..72c11c9 100644
--- a/home-common.nix
+++ b/home-common.nix
@@ -4,7 +4,7 @@
   home.sessionVariables = {
     EDITOR = "vim";
     BROWSER = "firefox";
-    LEDGER_FILE = ~/Sync/Ledger/ledger.ledger;
+    LEDGER_FILE = "~/Sync/Ledger/ledger.ledger";
 
     P4USER = "dswan";
     P4PORT = "humu.iocom.com:1666";
diff --git a/linux.nix b/linux.nix
index 41e04e2..a180dbb 100644
--- a/linux.nix
+++ b/linux.nix
@@ -4,18 +4,6 @@
   home.packages = with pkgs; [ bat wget clipit ncmpcpp pandoc silver-searcher tree unzip wirelesstools xcape xsel anki pavucontrol ranger blueman gifsicle networkmanager paprefs steam mpv nnn nodejs pinentry vlc gnupg nitrogen alacritty wine tldr yarn spotify signal-desktop mu mosh ispell google-chrome emacs-all-the-icons-fonts gnupg python3 python37Packages.pip veracrypt bashmount exfat exfat-utils neofetch toot rtv newsboat neomutt i3lock-pixeled nmap p4v killall calc cargo cava diceware magic-wormhole msmtp xorg.xmodmap zip youtube-dl cacert dropbox-cli keepassx2 w3m wireshark-qt khard khal vdirsyncer slack riot-web retroarch ipfs gimp blender urlview
   ];
 
-  home.sessionVariables = {
-    EDITOR = "vim";
-    BROWSER = "firefox";
-    LEDGER_FILE = ~/Sync/Ledger/ledger.ledger;
-
-    P4USER = "dswan";
-    P4PORT = "humu.iocom.com:1666";
-    P4CONFIG = "p4.cfg";
-    P4EDITOR = "nvim";
-    P4IGNORE = ".ignore";
-  };
-
   services.mpd = {
     enable = true;
     musicDirectory = "/home/dustinswan/Music";
@@ -113,123 +101,12 @@
   services.blueman-applet.enable = true;
   services.emacs.enable = true;
 
-  programs.home-manager.enable = true;
   programs.htop.enable = true;
   programs.jq.enable = true;
   programs.vscode.enable = true;
-  programs.tmux = {
-    enable = true;
-    shortcut = "a";
-    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'";
-      }
-    ];
-    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 ""
-      set -g status-left ""
-
-      set-option -g mouse on
-      set-option -g status-bg default
-      set-option -g status-fg "#666666"
-      set-option -g status-attr default
-      set-option -g pane-border-fg "#666666"
-      set-option -g pane-active-border-fg "#666666"
-      set-option -g message-bg black
-      set-option -g message-fg white
-      set-option -g display-panes-active-colour white
-      set-option -g display-panes-colour white
-
-      set-window-option -g window-status-fg "#666666"
-      set-window-option -g window-status-bg default
-      set-window-option -g window-status-current-fg white
-      set-window-option -g window-status-current-bg default
-      set-window-option -g window-status-format " #W"
-      set-window-option -g window-status-current-format " #W"
-      set-window-option -g window-status-separator "  "
-      set-window-option -g clock-mode-colour white
-
-      # remove when tmux-plugin-navigator plugin is added
-      is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-          | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-      tmux bind-key -n C-h if-shell "$is_vim" "send-keys C-h"  "select-pane -L"
-      tmux bind-key -n C-j if-shell "$is_vim" "send-keys C-j"  "select-pane -D"
-      tmux bind-key -n C-k if-shell "$is_vim" "send-keys C-k"  "select-pane -U"
-      tmux bind-key -n C-l if-shell "$is_vim" "send-keys C-l"  "select-pane -R"
-      tmux bind-key -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
-      tmux bind-key -T copy-mode-vi C-h select-pane -L
-      tmux bind-key -T copy-mode-vi C-j select-pane -D
-      tmux bind-key -T copy-mode-vi C-k select-pane -U
-      tmux bind-key -T copy-mode-vi C-l select-pane -R
-      tmux bind-key -T copy-mode-vi C-\\ select-pane -l
-    '';
-  };
-  # 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;
-    oh-my-zsh = {
-      enable = true;
-      plugins = [ "git" ];
-      theme = "refined";
-    };
-    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.firefox.enable = true;
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-  };
   programs.feh.enable = true;
-  programs.git = {
-    enable = true;
-    userName = "Dustin Swan";
-    userEmail = "dustin@dustinswan.com";
-  };
   programs.emacs.enable = true;
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    withNodeJs = true;
-    withPython3 = true;
-    configure = {
-      customRC = builtins.readFile ~/dotfiles/vimrc;
-    };
-  };
   programs.keychain = {
     enable = true;
     enableZshIntegration = true;