diff --git a/profiles/neovim.nix b/profiles/neovim.nix index 6bdfde7..7457de1 100644 --- a/profiles/neovim.nix +++ b/profiles/neovim.nix @@ -9,6 +9,7 @@ packages.myPlugins = with pkgs.vimPlugins; { start = [ airline # Lean & mean status/tabline for vim that's light as air + dracula-vim # Dracula theme for vim fugitive # Vim Git wrapper fzf-vim # Full path fuzzy file, buffer, mru, tag, finder for Vim haskell-vim # Syntax Highlighting and Indentation for Haskell @@ -21,7 +22,6 @@ syntastic # Syntax checking hacks vim-addon-nix # Scripts assisting writing .nix files vim-autoformat # Automatically format code - vim-colorschemes # Collection of ViM colour schemes vim-cue # Cue filetype plugin for Vim vim-lastplace vim-nix # Support for writing Nix expressions in vim @@ -40,10 +40,11 @@ set tabstop=4 " Default tabstop set shiftwidth=4 " Default indent spacing set expandtab " Expand [TABS] to spaces + packadd! dracula-vim syntax on " Enable syntax highlighting set t_Co=256 " Use 265 colors in vim - colorscheme one " Set the default colour scheme - set background=light " Set the default background scheme + set background=dark " Set the default background scheme + colorscheme dracula " Set the default colour scheme "let g:one_allow_italics = 1 " I love italic for comments set spell spelllang=en_au " Defaul spell checking language set spellfile=~/.vim-spell.en.utf-8.add " Add the spellfile @@ -57,7 +58,7 @@ set grepprg=rg\ --vimgrep\ --smart-case\ --follow let g:airline_powerline_fonts = 1 " Use powerline fonts - let g:airline_theme='one' " Set the airline theme + let g:airline_theme='dracula' " Set the airline theme "call togglebg#map("") " Toggle background colour between dark|light @@ -82,11 +83,11 @@ " Light during the day, dark during the night let hour = strftime("%H") if 7 <= hour && hour < 17 - set background=light + "set background=dark "hi Normal ctermbg=none " Set a transparent background "let g:airline_solarized_bg='dark' " Set the airline background else - set background=light + "set background=dark "hi Normal ctermbg=none " Set a transparent background "let g:airline_solarized_bg='dark' " Set the airline background endif diff --git a/profiles/tmux.nix b/profiles/tmux.nix index e07a3b5..ee9e320 100644 --- a/profiles/tmux.nix +++ b/profiles/tmux.nix @@ -10,71 +10,23 @@ aggressiveResize = true; clock24 = true; extraConfig = '' - POWERLINE_COMMAND="/run/current-system/sw/bin/powerline" - POWERLINE_CONFIG_COMMAND="/run/current-system/sw/bin/powerline-config" - run-shell "/run/current-system/sw/bin/powerline-daemon -q" - source /run/current-system/sw/share/tmux/powerline.conf + #POWERLINE_COMMAND="/run/current-system/sw/bin/powerline" + #POWERLINE_CONFIG_COMMAND="/run/current-system/sw/bin/powerline-config" + #run-shell "/run/current-system/sw/bin/powerline-daemon -q" + #source /run/current-system/sw/share/tmux/powerline.conf # Plugins set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' + set -g @plugin 'dracula/tmux' + + set -g @dracula-show-battery false + set -g @dracula-show-powerline true + set -g @dracula-refresh-rate 10 # Bind home and end keys: bind-key -n Home send Escape "OH" bind-key -n End send Escape "OF" - - ## COLORSCHEME: gruvbox dark - set-option -g status "on" - - # default statusbar color - set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1 - - # default window title colors - set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1 - - # default window with an activity alert - set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3 - - # active window title colors - set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1 - - # pane border - set-option -g pane-active-border-style fg=colour250 #fg2 - set-option -g pane-border-style fg=colour237 #bg1 - - # message infos - set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1 - - # writing commands inactive - set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1 - - # pane number display - set-option -g display-panes-active-colour colour250 #fg2 - set-option -g display-panes-colour colour237 #bg1 - - # clock - set-window-option -g clock-mode-colour colour109 #blue - - # bell - set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg - - # focus - set-option -g focus-events on - - ## Theme settings mixed with colors (unfortunately, but there is no cleaner way) - set-option -g status-justify "left" - set-option -g status-left-style none - set-option -g status-left-length "80" - set-option -g status-right-style none - set-option -g status-right-length "80" - set-window-option -g window-status-separator "" - - set-option -g status-left "#[fg=colour248, bg=colour241] #S #[fg=colour241, bg=colour237, nobold, noitalics, nounderscore]" - set-option -g status-right "#[fg=colour239, bg=colour237, nobold, nounderscore, noitalics]#[fg=colour246,bg=colour239] %Y-%m-%d  %H:%M #[fg=colour248, bg=colour239, nobold, noitalics, nounderscore]#[fg=colour237, bg=colour248] #h " - - set-window-option -g window-status-current-format "#[fg=colour237, bg=colour214, nobold, noitalics, nounderscore]#[fg=colour239, bg=colour214] #I #[fg=colour239, bg=colour214, bold] #W #[fg=colour214, bg=colour237, nobold, noitalics, nounderscore]" - set-window-option -g window-status-format "#[fg=colour237,bg=colour239,noitalics]#[fg=colour223,bg=colour239] #I #[fg=colour223, bg=colour239] #W #[fg=colour239, bg=colour237, noitalics]" - ''; keyMode = "vi"; newSession = true; @@ -84,10 +36,12 @@ }; environment.systemPackages = with pkgs; [ - python36Packages.powerline # Prompt enhancer - tmuxPlugins.tmux-fzf - tmuxPlugins.resurrect tmuxPlugins.continuum + tmuxPlugins.dracula + tmuxPlugins.resurrect + tmuxPlugins.sensible + tmuxPlugins.tmux-fzf + tmuxPlugins.yank ]; }