From 3b03601b9b7aa97d99beb72d0a6e73dbeebc9a8a Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Fri, 11 Oct 2019 13:40:12 -0400 Subject: [PATCH] Some more home-manager changes --- home-common.nix | 138 +++++++++++++++++------------------------------- home-linux.nix | 15 +----- 2 files changed, 48 insertions(+), 105 deletions(-) diff --git a/home-common.nix b/home-common.nix index c5d2d53..5709c6a 100644 --- a/home-common.nix +++ b/home-common.nix @@ -2,13 +2,12 @@ { home.packages = with pkgs; [ - bat wget silver-searcher tree ranger nodejs yarn mosh newsboat msmtp w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier nodePackages.dat + ripgrep fd bat wget silver-searcher tree ranger nodejs yarn mosh newsboat msmtp w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell hexyl nnn entr ]; home.sessionVariables = { EDITOR = "vim"; BROWSER = "firefox"; - LEDGER_FILE = "~/Sync/Ledger/ledger.ledger"; P4USER = "dswan"; P4PORT = "humu.iocom.com:1666"; @@ -20,63 +19,7 @@ programs.home-manager.enable = true; programs.alacritty = { - enable = true; - settings = { - window = { - padding = { - x = 12; - y = 12; - }; - dimentions = { - columns = 0; - lines = 0; - }; - }; - font = { - normal.family = "Iosevka Nerd Font"; - bold.family = "Iosevka Nerd Font"; - italic.family = "Iosevka Nerd Font"; - size = 18.0; - }; - key_bindings = [ - { - key = "N"; - mods = "Control|Shift"; - action = "SpawnNewInstance"; - } - ]; - background_opacity = 0.95; - colors = { - primary = { - background = "0x2E3440"; - foreground = "0xD8DEE9"; - }; - cursor = { - text = "0x2E3440"; - cursor = "0xD8DEE9"; - }; - normal = { - black = "0x3B4252"; - red = "0xBF616A"; - green = "0xA3BE8C"; - yellow = "0xEBCB8B"; - blue = "0x81A1C1"; - magenta = "0xB48EAD"; - cyan = "0x88C0D0"; - white = "0xE5E9F0"; - }; - bright = { - black = "0x4C566A"; - red = "0xBF616A"; - green = "0xA3BE8C"; - yellow = "0xEBCB8B"; - blue = "0x81A1C1"; - magenta = "0xB48EAD"; - cyan = "0x8FBCBB"; - white = "0xECEFF4"; - }; - }; - }; + enable = true; # TODO }; programs.tmux = { @@ -84,9 +27,11 @@ shortcut = "a"; keyMode = "vi"; baseIndex = 1; + clock24 = true; + escapeTime = 0; newSession = true; - plugins = with pkgs.tmuxPlugins; [ sensible resurrect pain-control continuum copycat open fzf-tmux-url maildir-counter yank ]; - # urlview + secureSocket = false; + plugins = with pkgs.tmuxPlugins; [ sensible resurrect pain-control continuum copycat open urlview fzf-tmux-url yank vim-tmux-navigator ]; extraConfig = '' set -g set-titles on set -g set-titles-string "#H (#S)" @@ -111,25 +56,7 @@ 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 - - set -g status-right 'FastMail: #{maildir_counter_1}, IOCOM: #{maildir_counter_2} | %a %Y-%m-%d %H:%M' - - set -g @maildir_counters '~/Mail/FastMail/INBOX/new|~/Mail/IOCOM/INBOX/new' - - # 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 + # set-window-option -g clock-mode-colour white ''; }; @@ -151,9 +78,9 @@ srsync = "rsync --rsync-path='sudo rsync'"; }; # for MacOS - # initExtra = '' - # source ~/.nix-profile/etc/profile.d/nix.sh - # ''; + initExtra = '' + source ~/.nix-profile/etc/profile.d/nix.sh + ''; }; programs.fzf = { @@ -196,18 +123,47 @@ }; }; - programs.neovim = { - enable = true; - viAlias = true; - vimAlias = true; - withNodeJs = true; - withPython3 = true; - configure = { - customRC = builtins.readFile ~/dotfiles/vimrc; + accounts.email = { + accounts = { + FastMail = { + # name = "FastMail"; + address = "dustin@dustinswan.com"; + aliases = "dustinswan@gmail.com"; + primary = true; + realName = "Dustin Swan"; + folders = { + inbox = "INBOX"; + drafts = "INBOX.Drafts"; + sent = "INBOX.Sent"; + trash = "INBOX.Trash"; + }; + offlineimap = { + enable = true; + extraConfig.remote = { + remotehost = "mail.messagingengine.com"; + remoteuser = "dustinswan@fastmail.com"; + }; + }; + }; }; + + maildirBasePath = "\$HOME/Mail"; }; + # programs.offlineimap.enable = true; + + # programs.neovim = { + # enable = true; + # viAlias = true; + # vimAlias = true; + # withNodeJs = true; + # withPython3 = true; + # extraConfig = builtins.readFile ~/dotfiles/vimrc; + # }; + + programs.gpg.enable = true; programs.htop.enable = true; + programs.mpv.enable = true; programs.jq.enable = true; programs.emacs.enable = true; programs.keychain = { diff --git a/home-linux.nix b/home-linux.nix index 247d096..9a36372 100644 --- a/home-linux.nix +++ b/home-linux.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { - home.packages = with pkgs; [ clipit ncmpcpp pandoc unzip wirelesstools xcape xsel anki pavucontrol blueman gifsicle networkmanager paprefs steam pinentry vlc nitrogen wine yarn spotify signal-desktop ispell google-chrome emacs-all-the-icons-fonts python3 python37Packages.pip veracrypt bashmount exfat exfat-utils neomutt i3lock-pixeled p4v killall calc cargo cava diceware magic-wormhole xorg.xmodmap zip cacert dropbox-cli keepassx2 wireshark-qt vdirsyncer slack riot-web retroarch gimp blender khal khard mu + home.packages = with pkgs; [ clipit ncmpcpp pandoc unzip wirelesstools xcape xsel anki pavucontrol blueman gifsicle networkmanager paprefs steam pinentry vlc nitrogen wine yarn spotify signal-desktop google-chrome emacs-all-the-icons-fonts python3 python37Packages.pip veracrypt bashmount exfat exfat-utils neomutt i3lock-pixeled p4v killall calc cargo cava diceware magic-wormhole xorg.xmodmap zip cacert dropbox-cli keepassx2 wireshark-qt vdirsyncer slack riot-web retroarch gimp blender khal khard mu ]; services.mpd = { @@ -101,21 +101,8 @@ services.blueman-applet.enable = true; services.emacs.enable = true; - programs.gpg.enable = true; programs.feh.enable = true; - programs.mpv.enable = true; - # programs.htop.enable = true; - # programs.jq.enable = true; - programs.vscode.enable = true; programs.firefox.enable = true; - # programs.emacs.enable = true; - # programs.keychain = { - # enable = true; - # enableZshIntegration = true; - # inheritType = "any"; - # agents = ["gpg" "ssh"]; - # keys = ["id_rsa" "2B3A6377"]; - # }; programs.rofi = { enable = true; };