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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>Command</key>
+ <string></string>
+ <key>Default Bookmark Guid</key>
+ <string>B0BDC001-9EA3-42F9-A961-DAF60D5A44C3</string>
+ <key>HapticFeedbackForEsc</key>
+ <false/>
+ <key>HideMenuBarInFullscreen</key>
+ <true/>
+ <key>HotkeyMigratedFromSingleToMulti</key>
+ <true/>
+ <key>New Bookmarks</key>
+ <array>
+ <dict>
+ <key>ASCII Anti Aliased</key>
+ <true/>
+ <key>ASCII Ligatures</key>
+ <false/>
+ <key>Ambiguous Double Width</key>
+ <false/>
+ <key>Ansi 0 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.25882352941176473</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.21176470588235294</real>
+ <key>Red Component</key>
+ <real>0.027450980392156862</real>
+ </dict>
+ <key>Ansi 1 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.18431372549019609</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.19607843137254902</real>
+ <key>Red Component</key>
+ <real>0.86274509803921573</real>
+ </dict>
+ <key>Ansi 10 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.45882352941176469</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.43137254901960786</real>
+ <key>Red Component</key>
+ <real>0.34509803921568627</real>
+ </dict>
+ <key>Ansi 11 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.51372549019607838</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.4823529411764706</real>
+ <key>Red Component</key>
+ <real>0.396078431372549</real>
+ </dict>
+ <key>Ansi 12 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.58823529411764708</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.58039215686274515</real>
+ <key>Red Component</key>
+ <real>0.51372549019607838</real>
+ </dict>
+ <key>Ansi 13 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.7686274509803922</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.44313725490196076</real>
+ <key>Red Component</key>
+ <real>0.42352941176470588</real>
+ </dict>
+ <key>Ansi 14 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.63137254901960782</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.63137254901960782</real>
+ <key>Red Component</key>
+ <real>0.57647058823529407</real>
+ </dict>
+ <key>Ansi 15 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.8901960784313725</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.96470588235294119</real>
+ <key>Red Component</key>
+ <real>0.99215686274509807</real>
+ </dict>
+ <key>Ansi 2 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.0</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.59999999999999998</real>
+ <key>Red Component</key>
+ <real>0.52156862745098043</real>
+ </dict>
+ <key>Ansi 3 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.0</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.53725490196078429</real>
+ <key>Red Component</key>
+ <real>0.70980392156862748</real>
+ </dict>
+ <key>Ansi 4 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.82352941176470584</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.54509803921568623</real>
+ <key>Red Component</key>
+ <real>0.14901960784313725</real>
+ </dict>
+ <key>Ansi 5 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.50980392156862742</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.21176470588235294</real>
+ <key>Red Component</key>
+ <real>0.82745098039215681</real>
+ </dict>
+ <key>Ansi 6 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.59607843137254901</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.63137254901960782</real>
+ <key>Red Component</key>
+ <real>0.16470588235294117</real>
+ </dict>
+ <key>Ansi 7 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.83529411764705885</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.90980392156862744</real>
+ <key>Red Component</key>
+ <real>0.93333333333333335</real>
+ </dict>
+ <key>Ansi 8 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.21176470588235294</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.16862745098039217</real>
+ <key>Red Component</key>
+ <real>0.0</real>
+ </dict>
+ <key>Ansi 9 Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.086274509803921567</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.29411764705882354</real>
+ <key>Red Component</key>
+ <real>0.79607843137254897</real>
+ </dict>
+ <key>BM Growl</key>
+ <true/>
+ <key>Background Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>1</real>
+ <key>Blue Component</key>
+ <real>0.23137254901960785</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.21176470588235294</real>
+ <key>Red Component</key>
+ <real>0.14509803921568629</real>
+ </dict>
+ <key>Background Image Location</key>
+ <string></string>
+ <key>Badge Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>0.5</real>
+ <key>Blue Component</key>
+ <real>0.0</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.14910027384757996</real>
+ <key>Red Component</key>
+ <real>1</real>
+ </dict>
+ <key>Blink Allowed</key>
+ <false/>
+ <key>Blinking Cursor</key>
+ <false/>
+ <key>Blur</key>
+ <false/>
+ <key>Bold Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.63137254901960782</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.63137254901960782</real>
+ <key>Red Component</key>
+ <real>0.57647058823529407</real>
+ </dict>
+ <key>Brighten Bold Text</key>
+ <false/>
+ <key>Character Encoding</key>
+ <integer>4</integer>
+ <key>Close Sessions On End</key>
+ <true/>
+ <key>Columns</key>
+ <integer>80</integer>
+ <key>Command</key>
+ <string>/Users/evanreichard/.nix-profile/bin/bash</string>
+ <key>Cursor Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.58823529411764708</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.58039215686274515</real>
+ <key>Red Component</key>
+ <real>0.51372549019607838</real>
+ </dict>
+ <key>Cursor Guide Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>0.25</real>
+ <key>Blue Component</key>
+ <real>1</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.92681378126144409</real>
+ <key>Red Component</key>
+ <real>0.70214027166366577</real>
+ </dict>
+ <key>Cursor Text Color</key>
+ <dict>
+ <key>Blue Component</key>
+ <real>0.25882352941176473</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.21176470588235294</real>
+ <key>Red Component</key>
+ <real>0.027450980392156862</real>
+ </dict>
+ <key>Custom Command</key>
+ <string>Custom Shell</string>
+ <key>Custom Directory</key>
+ <string>No</string>
+ <key>Default Bookmark</key>
+ <string>No</string>
+ <key>Description</key>
+ <string>Default</string>
+ <key>Disable Window Resizing</key>
+ <true/>
+ <key>Draw Powerline Glyphs</key>
+ <true/>
+ <key>Flashing Bell</key>
+ <false/>
+ <key>Foreground Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>1</real>
+ <key>Blue Component</key>
+ <real>0.77647058823529413</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.74509803921568629</real>
+ <key>Red Component</key>
+ <real>0.69019607843137254</real>
+ </dict>
+ <key>Guid</key>
+ <string>B0BDC001-9EA3-42F9-A961-DAF60D5A44C3</string>
+ <key>Horizontal Spacing</key>
+ <real>1</real>
+ <key>Idle Code</key>
+ <integer>0</integer>
+ <key>Initial Text</key>
+ <string></string>
+ <key>Jobs to Ignore</key>
+ <array>
+ <string>rlogin</string>
+ <string>ssh</string>
+ <string>slogin</string>
+ <string>telnet</string>
+ </array>
+ <key>Keyboard Map</key>
+ <dict>
+ <key>0x2d-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1f</string>
+ </dict>
+ <key>0x32-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x00</string>
+ </dict>
+ <key>0x33-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1b</string>
+ </dict>
+ <key>0x34-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1c</string>
+ </dict>
+ <key>0x35-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1d</string>
+ </dict>
+ <key>0x36-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1e</string>
+ </dict>
+ <key>0x37-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1f</string>
+ </dict>
+ <key>0x38-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x7f</string>
+ </dict>
+ <key>0xf700-0x220000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2A</string>
+ </dict>
+ <key>0xf700-0x240000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;5A</string>
+ </dict>
+ <key>0xf700-0x260000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;6A</string>
+ </dict>
+ <key>0xf700-0x280000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1b 0x1b 0x5b 0x41</string>
+ </dict>
+ <key>0xf701-0x220000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2B</string>
+ </dict>
+ <key>0xf701-0x240000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;5B</string>
+ </dict>
+ <key>0xf701-0x260000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;6B</string>
+ </dict>
+ <key>0xf701-0x280000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1b 0x1b 0x5b 0x42</string>
+ </dict>
+ <key>0xf702-0x220000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2D</string>
+ </dict>
+ <key>0xf702-0x240000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;5D</string>
+ </dict>
+ <key>0xf702-0x260000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;6D</string>
+ </dict>
+ <key>0xf702-0x280000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1b 0x1b 0x5b 0x44</string>
+ </dict>
+ <key>0xf703-0x220000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2C</string>
+ </dict>
+ <key>0xf703-0x240000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;5C</string>
+ </dict>
+ <key>0xf703-0x260000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;6C</string>
+ </dict>
+ <key>0xf703-0x280000</key>
+ <dict>
+ <key>Action</key>
+ <integer>11</integer>
+ <key>Text</key>
+ <string>0x1b 0x1b 0x5b 0x43</string>
+ </dict>
+ <key>0xf704-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2P</string>
+ </dict>
+ <key>0xf705-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2Q</string>
+ </dict>
+ <key>0xf706-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2R</string>
+ </dict>
+ <key>0xf707-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2S</string>
+ </dict>
+ <key>0xf708-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[15;2~</string>
+ </dict>
+ <key>0xf709-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[17;2~</string>
+ </dict>
+ <key>0xf70a-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[18;2~</string>
+ </dict>
+ <key>0xf70b-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[19;2~</string>
+ </dict>
+ <key>0xf70c-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[20;2~</string>
+ </dict>
+ <key>0xf70d-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[21;2~</string>
+ </dict>
+ <key>0xf70e-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[23;2~</string>
+ </dict>
+ <key>0xf70f-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[24;2~</string>
+ </dict>
+ <key>0xf729-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2H</string>
+ </dict>
+ <key>0xf729-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;5H</string>
+ </dict>
+ <key>0xf72b-0x20000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;2F</string>
+ </dict>
+ <key>0xf72b-0x40000</key>
+ <dict>
+ <key>Action</key>
+ <integer>10</integer>
+ <key>Text</key>
+ <string>[1;5F</string>
+ </dict>
+ </dict>
+ <key>Link Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>1</real>
+ <key>Blue Component</key>
+ <real>0.73422712087631226</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.35915297269821167</real>
+ <key>Red Component</key>
+ <real>0.0</real>
+ </dict>
+ <key>Mouse Reporting</key>
+ <false/>
+ <key>Name</key>
+ <string>Default</string>
+ <key>Non Ascii Font</key>
+ <string>MesloLGMNerdFontCompleteM-Regular 12</string>
+ <key>Non-ASCII Anti Aliased</key>
+ <true/>
+ <key>Normal Font</key>
+ <string>MesloLGMNerdFontCompleteM-Regular 12</string>
+ <key>Option Key Sends</key>
+ <integer>0</integer>
+ <key>Prompt Before Closing 2</key>
+ <false/>
+ <key>Right Option Key Sends</key>
+ <integer>0</integer>
+ <key>Rows</key>
+ <integer>25</integer>
+ <key>Screen</key>
+ <integer>-1</integer>
+ <key>Scrollback Lines</key>
+ <integer>1000</integer>
+ <key>Selected Text Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>1</real>
+ <key>Blue Component</key>
+ <real>0.77254901960784317</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.74117647058823533</real>
+ <key>Red Component</key>
+ <real>0.68627450980392157</real>
+ </dict>
+ <key>Selection Color</key>
+ <dict>
+ <key>Alpha Component</key>
+ <real>1</real>
+ <key>Blue Component</key>
+ <real>0.39215686274509803</real>
+ <key>Color Space</key>
+ <string>sRGB</string>
+ <key>Green Component</key>
+ <real>0.35686274509803922</real>
+ <key>Red Component</key>
+ <real>0.22745098039215686</real>
+ </dict>
+ <key>Send Code When Idle</key>
+ <false/>
+ <key>Shortcut</key>
+ <string></string>
+ <key>Silence Bell</key>
+ <false/>
+ <key>Sync Title</key>
+ <false/>
+ <key>Tags</key>
+ <array/>
+ <key>Terminal Type</key>
+ <string>xterm-256color</string>
+ <key>Transparency</key>
+ <integer>0</integer>
+ <key>Unlimited Scrollback</key>
+ <false/>
+ <key>Use Bold Font</key>
+ <true/>
+ <key>Use Bright Bold</key>
+ <true/>
+ <key>Use Italic Font</key>
+ <true/>
+ <key>Use Non-ASCII Font</key>
+ <true/>
+ <key>Use Tab Color</key>
+ <false/>
+ <key>Vertical Spacing</key>
+ <real>1</real>
+ <key>Visual Bell</key>
+ <true/>
+ <key>Window Type</key>
+ <integer>0</integer>
+ <key>Working Directory</key>
+ <string>/Users/evanreichard</string>
+ </dict>
+ </array>
+ <key>PointerActions</key>
+ <dict>
+ <key>Button,1,1,,</key>
+ <dict>
+ <key>Action</key>
+ <string>kContextMenuPointerAction</string>
+ </dict>
+ <key>Button,2,1,,</key>
+ <dict>
+ <key>Action</key>
+ <string>kPasteFromClipboardPointerAction</string>
+ </dict>
+ <key>Gesture,ThreeFingerSwipeDown,,</key>
+ <dict>
+ <key>Action</key>
+ <string>kPrevWindowPointerAction</string>
+ </dict>
+ <key>Gesture,ThreeFingerSwipeLeft,,</key>
+ <dict>
+ <key>Action</key>
+ <string>kPrevTabPointerAction</string>
+ </dict>
+ <key>Gesture,ThreeFingerSwipeRight,,</key>
+ <dict>
+ <key>Action</key>
+ <string>kNextTabPointerAction</string>
+ </dict>
+ <key>Gesture,ThreeFingerSwipeUp,,</key>
+ <dict>
+ <key>Action</key>
+ <string>kNextWindowPointerAction</string>
+ </dict>
+ </dict>
+ <key>SoundForEsc</key>
+ <false/>
+ <key>TabStyleWithAutomaticOption</key>
+ <integer>5</integer>
+ <key>TabViewType</key>
+ <integer>2</integer>
+ <key>VisualIndicatorForEsc</key>
+ <false/>
+ <key>findMode_iTerm</key>
+ <integer>0</integer>
+ <key>kCPKSelectionViewPreferredModeKey</key>
+ <integer>0</integer>
+ <key>kCPKSelectionViewShowHSBTextFieldsKey</key>
+ <false/>
+</dict>
+</plist>
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", "<Space>", "<Nop>", { 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'
'';
};
}