From 8905800708ebebe3b41a1e60bd17232dfd00f1d7 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Wed, 30 Nov 2022 14:12:27 -0500 Subject: [PATCH] LuaLine, iTerm2, Material --- bash/default.nix | 3 + home.nix | 44 +- iterm2/config/com.googlecode.iterm2.plist | 762 ++++++++++++++++++++++ iterm2/default.nix | 8 + nvim/config/lua/base.lua | 25 +- nvim/config/lua/init.lua | 5 +- nvim/config/lua/leap-config.lua | 1 + nvim/config/lua/lsp-lines-config.lua | 3 + nvim/config/lua/lualine-config.lua | 5 + nvim/config/lua/material-config.lua | 3 + nvim/default.nix | 5 +- tmux/default.nix | 1 + 12 files changed, 841 insertions(+), 24 deletions(-) create mode 100644 iterm2/config/com.googlecode.iterm2.plist create mode 100644 iterm2/default.nix create mode 100644 nvim/config/lua/leap-config.lua create mode 100644 nvim/config/lua/lualine-config.lua create mode 100644 nvim/config/lua/material-config.lua diff --git a/bash/default.nix b/bash/default.nix index 19b3a93..5121cfd 100644 --- a/bash/default.nix +++ b/bash/default.nix @@ -3,6 +3,9 @@ { programs.bash = { enable = true; + shellAliases = { + grep = "grep --color"; + }; profileExtra ='' set -o vi [ ! -z $TMUX ] || tmux a || tmux diff --git a/home.nix b/home.nix index 6ea0c0a..261e42b 100644 --- a/home.nix +++ b/home.nix @@ -1,10 +1,14 @@ -{ config, pkgs, ... }: - +{ config, lib, pkgs, ... }: +let + inherit (pkgs.lib) mkIf optionals; + inherit (pkgs.stdenv) isLinux isDarwin; +in { imports = [ ./bash ./git + ./iterm2 ./nvim ./powerline ./readline @@ -28,10 +32,42 @@ nerdfonts python311 tldr - ]; + ] ++ optionals isDarwin [ + iterm2 + ] ++ optionals isLinux []; - # Other Programs + # Misc Programs programs.jq.enable = true; programs.pandoc.enable = true; + # Misc Configuration + home.file.".sqliterc".text = '' + .headers on + .mode column + ''; + + # Darwin Spotlight Indexing Hack + home.activation = mkIf isDarwin { + copyApplications = let + apps = pkgs.buildEnv { + name = "home-manager-applications"; + paths = config.home.packages; + pathsToLink = "/Applications"; + }; + in lib.hm.dag.entryAfter [ "writeBoundary" ] '' + baseDir="$HOME/Applications/Home Manager Apps" + if [ -d "$baseDir" ]; then + rm -rf "$baseDir" + fi + mkdir -p "$baseDir" + for appFile in ${apps}/Applications/*; do + target="$baseDir/$(basename "$appFile")" + $DRY_RUN_CMD cp ''${VERBOSE_ARG:+-v} -fHRL "$appFile" "$baseDir" + $DRY_RUN_CMD chmod ''${VERBOSE_ARG:+-v} -R +w "$target" + done + ''; + }; + + # Darwin Spotlight Indexing Hack + disabledModules = [ "targets/darwin/linkapps.nix" ]; } diff --git a/iterm2/config/com.googlecode.iterm2.plist b/iterm2/config/com.googlecode.iterm2.plist new file mode 100644 index 0000000..16ce62d --- /dev/null +++ b/iterm2/config/com.googlecode.iterm2.plist @@ -0,0 +1,762 @@ + + + + + Command + + Default Bookmark Guid + B0BDC001-9EA3-42F9-A961-DAF60D5A44C3 + HapticFeedbackForEsc + + HideMenuBarInFullscreen + + HotkeyMigratedFromSingleToMulti + + New Bookmarks + + + ASCII Anti Aliased + + ASCII Ligatures + + Ambiguous Double Width + + Ansi 0 Color + + Blue Component + 0.25882352941176473 + Color Space + sRGB + Green Component + 0.21176470588235294 + Red Component + 0.027450980392156862 + + Ansi 1 Color + + Blue Component + 0.18431372549019609 + Color Space + sRGB + Green Component + 0.19607843137254902 + Red Component + 0.86274509803921573 + + Ansi 10 Color + + Blue Component + 0.45882352941176469 + Color Space + sRGB + Green Component + 0.43137254901960786 + Red Component + 0.34509803921568627 + + Ansi 11 Color + + Blue Component + 0.51372549019607838 + Color Space + sRGB + Green Component + 0.4823529411764706 + Red Component + 0.396078431372549 + + Ansi 12 Color + + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.58039215686274515 + Red Component + 0.51372549019607838 + + Ansi 13 Color + + Blue Component + 0.7686274509803922 + Color Space + sRGB + Green Component + 0.44313725490196076 + Red Component + 0.42352941176470588 + + Ansi 14 Color + + Blue Component + 0.63137254901960782 + Color Space + sRGB + Green Component + 0.63137254901960782 + Red Component + 0.57647058823529407 + + Ansi 15 Color + + Blue Component + 0.8901960784313725 + Color Space + sRGB + Green Component + 0.96470588235294119 + Red Component + 0.99215686274509807 + + Ansi 2 Color + + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.59999999999999998 + Red Component + 0.52156862745098043 + + Ansi 3 Color + + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.53725490196078429 + Red Component + 0.70980392156862748 + + Ansi 4 Color + + Blue Component + 0.82352941176470584 + Color Space + sRGB + Green Component + 0.54509803921568623 + Red Component + 0.14901960784313725 + + Ansi 5 Color + + Blue Component + 0.50980392156862742 + Color Space + sRGB + Green Component + 0.21176470588235294 + Red Component + 0.82745098039215681 + + Ansi 6 Color + + Blue Component + 0.59607843137254901 + Color Space + sRGB + Green Component + 0.63137254901960782 + Red Component + 0.16470588235294117 + + Ansi 7 Color + + Blue Component + 0.83529411764705885 + Color Space + sRGB + Green Component + 0.90980392156862744 + Red Component + 0.93333333333333335 + + Ansi 8 Color + + Blue Component + 0.21176470588235294 + Color Space + sRGB + Green Component + 0.16862745098039217 + Red Component + 0.0 + + Ansi 9 Color + + Blue Component + 0.086274509803921567 + Color Space + sRGB + Green Component + 0.29411764705882354 + Red Component + 0.79607843137254897 + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.23137254901960785 + Color Space + sRGB + Green Component + 0.21176470588235294 + Red Component + 0.14509803921568629 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.14910027384757996 + Red Component + 1 + + Blink Allowed + + Blinking Cursor + + Blur + + Bold Color + + Blue Component + 0.63137254901960782 + Color Space + sRGB + Green Component + 0.63137254901960782 + Red Component + 0.57647058823529407 + + Brighten Bold Text + + Character Encoding + 4 + Close Sessions On End + + Columns + 80 + Command + /Users/evanreichard/.nix-profile/bin/bash + Cursor Color + + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.58039215686274515 + Red Component + 0.51372549019607838 + + Cursor Guide Color + + Alpha Component + 0.25 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.92681378126144409 + Red Component + 0.70214027166366577 + + Cursor Text Color + + Blue Component + 0.25882352941176473 + Color Space + sRGB + Green Component + 0.21176470588235294 + Red Component + 0.027450980392156862 + + Custom Command + Custom Shell + Custom Directory + No + Default Bookmark + No + Description + Default + Disable Window Resizing + + Draw Powerline Glyphs + + Flashing Bell + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.77647058823529413 + Color Space + sRGB + Green Component + 0.74509803921568629 + Red Component + 0.69019607843137254 + + Guid + B0BDC001-9EA3-42F9-A961-DAF60D5A44C3 + Horizontal Spacing + 1 + Idle Code + 0 + Initial Text + + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf700-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x41 + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf701-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x42 + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x44 + + 0xf703-0x220000 + + Action + 10 + Text + [1;2C + + 0xf703-0x240000 + + Action + 10 + Text + [1;5C + + 0xf703-0x260000 + + Action + 10 + Text + [1;6C + + 0xf703-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x43 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + + Link Color + + Alpha Component + 1 + Blue Component + 0.73422712087631226 + Color Space + sRGB + Green Component + 0.35915297269821167 + Red Component + 0.0 + + Mouse Reporting + + Name + Default + Non Ascii Font + MesloLGMNerdFontCompleteM-Regular 12 + Non-ASCII Anti Aliased + + Normal Font + MesloLGMNerdFontCompleteM-Regular 12 + Option Key Sends + 0 + Prompt Before Closing 2 + + Right Option Key Sends + 0 + Rows + 25 + Screen + -1 + Scrollback Lines + 1000 + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.77254901960784317 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.68627450980392157 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.39215686274509803 + Color Space + sRGB + Green Component + 0.35686274509803922 + Red Component + 0.22745098039215686 + + Send Code When Idle + + Shortcut + + Silence Bell + + Sync Title + + Tags + + Terminal Type + xterm-256color + Transparency + 0 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + /Users/evanreichard + + + PointerActions + + Button,1,1,, + + Action + kContextMenuPointerAction + + Button,2,1,, + + Action + kPasteFromClipboardPointerAction + + Gesture,ThreeFingerSwipeDown,, + + Action + kPrevWindowPointerAction + + Gesture,ThreeFingerSwipeLeft,, + + Action + kPrevTabPointerAction + + Gesture,ThreeFingerSwipeRight,, + + Action + kNextTabPointerAction + + Gesture,ThreeFingerSwipeUp,, + + Action + kNextWindowPointerAction + + + SoundForEsc + + TabStyleWithAutomaticOption + 5 + TabViewType + 2 + VisualIndicatorForEsc + + findMode_iTerm + 0 + kCPKSelectionViewPreferredModeKey + 0 + kCPKSelectionViewShowHSBTextFieldsKey + + + diff --git a/iterm2/default.nix b/iterm2/default.nix new file mode 100644 index 0000000..b14f18e --- /dev/null +++ b/iterm2/default.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ + xdg.configFile."iterm2/com.googlecode.iterm2.plist" = { + source = ./config/com.googlecode.iterm2.plist; + }; +} + diff --git a/nvim/config/lua/base.lua b/nvim/config/lua/base.lua index 4079f46..fe934dd 100644 --- a/nvim/config/lua/base.lua +++ b/nvim/config/lua/base.lua @@ -1,3 +1,7 @@ +-- Set Leader +vim.keymap.set("n", "", "", { silent = true }) +vim.g.mapleader = " " + -- Disable NetRW vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 @@ -22,24 +26,11 @@ vim.opt.foldmethod = "indent" vim.opt.foldnestmax = 10 vim.opt.foldlevel = 2 --- Lightline config -vim.g['lightline'] = { - colorscheme = 'embark', - separator = { - left = "\u{e0b0}", - right = "\u{e0b2}" - }, - subseparator = { - left = "\u{e0b1}", - right = "\u{e0b3}" - } -} - -- Set Color Scheme -vim.cmd('colorscheme embark') -vim.diagnostic.config({ - virtual_text = false, -}) +-- vim.cmd('colorscheme embark') +-- vim.cmd('colorscheme OceanicNext') +-- vim.cmd('colorscheme material') +-- vim.g.material_style = "oceanic" -- Mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions diff --git a/nvim/config/lua/init.lua b/nvim/config/lua/init.lua index 2409f71..3dda68c 100644 --- a/nvim/config/lua/init.lua +++ b/nvim/config/lua/init.lua @@ -1,10 +1,13 @@ +require('base') require('aerial-config') require('autopairs-config') -require('base') require('cmp-config') require('comment-config') +require('leap-config') require('lsp-config') require('lsp-lines-config') +require('lualine-config') +require('material-config') require('noice-config') require('numb-config') require('nvim-tree-config') diff --git a/nvim/config/lua/leap-config.lua b/nvim/config/lua/leap-config.lua new file mode 100644 index 0000000..c0aeeef --- /dev/null +++ b/nvim/config/lua/leap-config.lua @@ -0,0 +1 @@ +require('leap').add_default_mappings() diff --git a/nvim/config/lua/lsp-lines-config.lua b/nvim/config/lua/lsp-lines-config.lua index 372aaf5..ffc3e2f 100644 --- a/nvim/config/lua/lsp-lines-config.lua +++ b/nvim/config/lua/lsp-lines-config.lua @@ -1 +1,4 @@ require("lsp_lines").setup() +vim.diagnostic.config({ + virtual_text = false, +}) diff --git a/nvim/config/lua/lualine-config.lua b/nvim/config/lua/lualine-config.lua new file mode 100644 index 0000000..d44a100 --- /dev/null +++ b/nvim/config/lua/lualine-config.lua @@ -0,0 +1,5 @@ +require('lualine').setup({ + options = { + theme = "material", + } +}) diff --git a/nvim/config/lua/material-config.lua b/nvim/config/lua/material-config.lua new file mode 100644 index 0000000..546be57 --- /dev/null +++ b/nvim/config/lua/material-config.lua @@ -0,0 +1,3 @@ +require('material').setup() +vim.cmd('colorscheme material') +vim.g.material_style = "oceanic" diff --git a/nvim/default.nix b/nvim/default.nix index d7181fe..1eac3f8 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -28,6 +28,7 @@ aerial-nvim # Code Outline comment-nvim # Code Comments diffview-nvim # Diff View + leap-nvim # Quick Movement numb-nvim # Peek / Jump to Lines nvim-autopairs # Automatically Close Pairs (),[],{} nvim-tree-lua # File Explorer @@ -37,8 +38,8 @@ # ------------------ # --- Theme / UI --- # ------------------ - embark-vim # Theme - lightline-vim # Bottom Line + lualine-nvim # Bottom Line + material-nvim # Theme noice-nvim # UI Tweaks nvim-web-devicons # Dev Icons diff --git a/tmux/default.nix b/tmux/default.nix index 3d7a7c8..3987cb6 100644 --- a/tmux/default.nix +++ b/tmux/default.nix @@ -36,6 +36,7 @@ # Set Colors # set -g default-terminal "screen-256color" # set-option -ga terminal-overrides ",xterm-256color:Tc" + # set -g status-style bg='#395A65',fg='#B0BEC5' ''; }; }