diff --git a/darwin.nix b/darwin.nix new file mode 100644 index 0000000..48d85f3 --- /dev/null +++ b/darwin.nix @@ -0,0 +1,11 @@ +{ config, pkgs, lib, inputs, ... }: + +{ + imports = [ ./launchd.nix ./apps.nix ]; + + targets.darwin = { + defaults = { + "com.googlecode.iterm2" = import ./iterm2.nix; + }; + }; +} diff --git a/emacs.nix b/emacs.nix index fd5ae46..10ab081 100644 --- a/emacs.nix +++ b/emacs.nix @@ -195,6 +195,8 @@ in { ''; }; + yafolding.enable = true; + format-all = { enable = true; command = [ "format-all-buffer" ]; @@ -434,7 +436,7 @@ in { (setq nix-nixfmt-bin "${pkgs.nixfmt}/bin/nixfmt") (setq nix-executable "/nix/var/nix/profiles/default/bin/nix") ''; - bindLocal.nix-mode-map = { "C-c C-y" = "nix-format-buffer"; }; + bindLocal.nix-mode-map = { "C-c C-y" = "nix-mode-format"; }; }; ob-calc = { diff --git a/home.nix b/home.nix index 9b20a3d..2e74e54 100644 --- a/home.nix +++ b/home.nix @@ -19,7 +19,9 @@ in { ''; home.file.".gnupg/gpg-agent.conf".text = mkIf stdenv.isDarwin '' - pinentry-program "${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac" + pinentry-program "${pkgs.pinentry-touchid}/bin/pinentry-touchid" + default-cache-ttl 30 + max-cache-ttl 600 ''; home.file.".config/zsh/am.sh" = mkIf stdenv.isDarwin { @@ -49,7 +51,7 @@ in { }; imports = - [ ./emacs.nix ./launchd.nix ./packages.nix ./programs.nix ./apps.nix ]; + [ ./emacs.nix ./packages.nix ./programs.nix ./darwin.nix ]; nixpkgs.config = { allowUnfree = true; diff --git a/iterm2.nix b/iterm2.nix new file mode 100644 index 0000000..35bc671 --- /dev/null +++ b/iterm2.nix @@ -0,0 +1,1055 @@ +{ + "AlternateMouseScroll" = true; + "Custom Color Presets" = { + "Dracula+" = { + "Ansi 0 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.172549; + "Color Space" = "sRGB"; + "Green Component" = 0.133333; + "Red Component" = 0.129412; + }; + "Ansi 1 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.333333; + "Color Space" = "sRGB"; + "Green Component" = 0.333333; + "Red Component" = 1; + }; + "Ansi 10 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.580392; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.411765; + }; + "Ansi 11 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.419608; + "Color Space" = "sRGB"; + "Green Component" = 0.796078; + "Red Component" = 1; + }; + "Ansi 12 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 0.67451; + "Red Component" = 0.839216; + }; + "Ansi 13 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.87451; + "Color Space" = "sRGB"; + "Green Component" = 0.572549; + "Red Component" = 1; + }; + "Ansi 14 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.643137; + }; + "Ansi 15 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Ansi 2 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.482353; + "Color Space" = "sRGB"; + "Green Component" = 0.980392; + "Red Component" = 0.313726; + }; + "Ansi 3 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.419608; + "Color Space" = "sRGB"; + "Green Component" = 0.796078; + "Red Component" = 1; + }; + "Ansi 4 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 0.666667; + "Red Component" = 0.509804; + }; + "Ansi 5 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.917647; + "Color Space" = "sRGB"; + "Green Component" = 0.572549; + "Red Component" = 0.780392; + }; + "Ansi 6 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.992157; + "Color Space" = "sRGB"; + "Green Component" = 0.913725; + "Red Component" = 0.545098; + }; + "Ansi 7 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Ansi 8 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.329412; + "Color Space" = "sRGB"; + "Green Component" = 0.329412; + "Red Component" = 0.329412; + }; + "Ansi 9 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.431373; + "Color Space" = "sRGB"; + "Green Component" = 0.431373; + "Red Component" = 1; + }; + "Background Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.129412; + "Color Space" = "sRGB"; + "Green Component" = 0.129412; + "Red Component" = 0.129412; + }; + "Badge Color" = { + "Alpha Component" = 0.5; + "Blue Component" = 0.321569; + "Color Space" = "sRGB"; + "Green Component" = 0.258824; + "Red Component" = 0.231373; + }; + "Bold Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.999996; + }; + "Cursor Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.956863; + "Color Space" = "sRGB"; + "Green Component" = 0.937255; + "Red Component" = 0.92549; + }; + "Cursor Guide Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.211765; + "Color Space" = "sRGB"; + "Green Component" = 0.219608; + "Red Component" = 0.235294; + }; + "Cursor Text Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.156863; + "Color Space" = "sRGB"; + "Green Component" = 0.156863; + "Red Component" = 0.156863; + }; + "Foreground Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Link Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.996078; + }; + "Selected Text Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.329412; + "Color Space" = "sRGB"; + "Green Component" = 0.329412; + "Red Component" = 0.329412; + }; + "Selection Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Tab Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.321569; + "Color Space" = "sRGB"; + "Green Component" = 0.258824; + "Red Component" = 0.231373; + }; + }; + }; + "Default Bookmark Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; + "HapticFeedbackForEsc" = false; + "HotkeyMigratedFromSingleToMulti" = true; + "IRMemory" = 4; + "LeftCommand" = 7; + "LeftOption" = 2; + "New Bookmarks" = [ + { + "ASCII Anti Aliased" = true; + "Ambiguous Double Width" = false; + "Ansi 0 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.1725490242242813; + "Color Space" = "sRGB"; + "Green Component" = 0.1333333402872086; + "Red Component" = 0.1294117718935013; + }; + "Ansi 1 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.3333333432674408; + "Color Space" = "sRGB"; + "Green Component" = 0.3333333432674408; + "Red Component" = 1; + }; + "Ansi 10 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.5803921818733215; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.4117647111415863; + }; + "Ansi 11 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.4196078479290009; + "Color Space" = "sRGB"; + "Green Component" = 0.7960784435272217; + "Red Component" = 1; + }; + "Ansi 12 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 0.6745098233222961; + "Red Component" = 0.8392156958580017; + }; + "Ansi 13 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.8745098114013672; + "Color Space" = "sRGB"; + "Green Component" = 0.572549045085907; + "Red Component" = 1; + }; + "Ansi 14 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.6431372761726379; + }; + "Ansi 15 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.9490196108818054; + "Color Space" = "sRGB"; + "Green Component" = 0.9725490212440491; + "Red Component" = 0.9725490212440491; + }; + "Ansi 2 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.4823529422283173; + "Color Space" = "sRGB"; + "Green Component" = 0.9803921580314636; + "Red Component" = 0.3137255012989044; + }; + "Ansi 3 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.4196078479290009; + "Color Space" = "sRGB"; + "Green Component" = 0.7960784435272217; + "Red Component" = 1; + }; + "Ansi 4 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 0.6666666865348816; + "Red Component" = 0.5098039507865906; + }; + "Ansi 5 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.9176470637321472; + "Color Space" = "sRGB"; + "Green Component" = 0.572549045085907; + "Red Component" = 0.7803921699523926; + }; + "Ansi 6 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.9921568632125854; + "Color Space" = "sRGB"; + "Green Component" = 0.9137254953384399; + "Red Component" = 0.545098066329956; + }; + "Ansi 7 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.9490196108818054; + "Color Space" = "sRGB"; + "Green Component" = 0.9725490212440491; + "Red Component" = 0.9725490212440491; + }; + "Ansi 8 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.3294117748737335; + "Color Space" = "sRGB"; + "Green Component" = 0.3294117748737335; + "Red Component" = 0.3294117748737335; + }; + "Ansi 9 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.4313725531101227; + "Color Space" = "sRGB"; + "Green Component" = 0.4313725531101227; + "Red Component" = 1; + }; + "BM Growl" = true; + "Background Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.1294117718935013; + "Color Space" = "sRGB"; + "Green Component" = 0.1294117718935013; + "Red Component" = 0.1294117718935013; + }; + "Background Image Location" = ""; + "Badge Color" = { + "Alpha Component" = 0.5; + "Blue Component" = 0.321568638086319; + "Color Space" = "sRGB"; + "Green Component" = 0.2588235437870026; + "Red Component" = 0.2313725501298904; + }; + "Blinking Cursor" = false; + "Blur" = false; + "Bold Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.9999960064888; + }; + "Character Encoding" = 4; + "Close Sessions On End" = true; + "Columns" = 120; + "Command" = ""; + "Cursor Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.95686274766922; + "Color Space" = "sRGB"; + "Green Component" = 0.9372549057006836; + "Red Component" = 0.9254902005195618; + }; + "Cursor Guide Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.2117646932601929; + "Color Space" = "sRGB"; + "Green Component" = 0.2196078300476074; + "Red Component" = 0.2352941930294037; + }; + "Cursor Text Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.1568627059459686; + "Color Space" = "sRGB"; + "Green Component" = 0.1568627059459686; + "Red Component" = 0.156862735748291; + }; + "Custom Command" = "No"; + "Custom Directory" = "No"; + "Default Bookmark" = "No"; + "Description" = "Default"; + "Disable Window Resizing" = true; + "Flashing Bell" = false; + "Foreground Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.9490196108818054; + "Color Space" = "sRGB"; + "Green Component" = 0.9725490212440491; + "Red Component" = 0.9725490212440491; + }; + "Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; + "Horizontal Spacing" = 1; + "Idle Code" = 0; + "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" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.9960784316062927; + }; + "Mouse Reporting" = true; + "Name" = "Default"; + "Non Ascii Font" = "Monaco 12"; + "Non-ASCII Anti Aliased" = true; + "Normal Font" = "MesloLGS-NF-Regular 12"; + "Option Key Sends" = 2; + "Prompt Before Closing 2" = false; + "Right Option Key Sends" = 0; + "Rows" = 30; + "Screen" = -1; + "Scrollback Lines" = 0; + "Selected Text Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.3294117748737335; + "Color Space" = "sRGB"; + "Green Component" = 0.3294117748737335; + "Red Component" = 0.3294117748737335; + }; + "Selection Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.9490196108818054; + "Color Space" = "sRGB"; + "Green Component" = 0.9725490212440491; + "Red Component" = 0.9725490212440491; + }; + "Send Code When Idle" = false; + "Shortcut" = ""; + "Silence Bell" = false; + "Sync Title" = false; + "Tab Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.3215686082839966; + "Color Space" = "sRGB"; + "Green Component" = 0.258823573589325; + "Red Component" = 0.2313725650310516; + }; + "Tags" = null; + + "Terminal Type" = "xterm-256color"; + "Transparency" = 0; + "Unlimited Scrollback" = true; + "Use Bold Font" = true; + "Use Bright Bold" = true; + "Use Italic Font" = true; + "Use Non-ASCII Font" = false; + "Vertical Spacing" = 1; + "Visual Bell" = true; + "Window Type" = 0; + "Working Directory" = "/Users/willem"; + } + { + "ASCII Anti Aliased" = true; + "Ambiguous Double Width" = false; + "Ansi 0 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.172549; + "Color Space" = "sRGB"; + "Green Component" = 0.133333; + "Red Component" = 0.129412; + }; + "Ansi 1 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.333333; + "Color Space" = "sRGB"; + "Green Component" = 0.333333; + "Red Component" = 1; + }; + "Ansi 10 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.580392; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.411765; + }; + "Ansi 11 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.419608; + "Color Space" = "sRGB"; + "Green Component" = 0.796078; + "Red Component" = 1; + }; + "Ansi 12 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 0.67451; + "Red Component" = 0.839216; + }; + "Ansi 13 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.87451; + "Color Space" = "sRGB"; + "Green Component" = 0.572549; + "Red Component" = 1; + }; + "Ansi 14 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.643137; + }; + "Ansi 15 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Ansi 2 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.482353; + "Color Space" = "sRGB"; + "Green Component" = 0.980392; + "Red Component" = 0.313726; + }; + "Ansi 3 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.419608; + "Color Space" = "sRGB"; + "Green Component" = 0.796078; + "Red Component" = 1; + }; + "Ansi 4 Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 0.666667; + "Red Component" = 0.509804; + }; + "Ansi 5 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.917647; + "Color Space" = "sRGB"; + "Green Component" = 0.572549; + "Red Component" = 0.780392; + }; + "Ansi 6 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.992157; + "Color Space" = "sRGB"; + "Green Component" = 0.913725; + "Red Component" = 0.545098; + }; + "Ansi 7 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Ansi 8 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.329412; + "Color Space" = "sRGB"; + "Green Component" = 0.329412; + "Red Component" = 0.329412; + }; + "Ansi 9 Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.431373; + "Color Space" = "sRGB"; + "Green Component" = 0.431373; + "Red Component" = 1; + }; + "BM Growl" = true; + "Background Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.129412; + "Color Space" = "sRGB"; + "Green Component" = 0.129412; + "Red Component" = 0.129412; + }; + "Background Image Location" = ""; + "Badge Color" = { + "Alpha Component" = 0.5; + "Blue Component" = 0.321569; + "Color Space" = "sRGB"; + "Green Component" = 0.258824; + "Red Component" = 0.231373; + }; + "Blend" = 0.5; + "Blinking Cursor" = false; + "Blur" = true; + "Blur Radius" = 2; + "Bold Color" = { + "Alpha Component" = 1; + "Blue Component" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.999996; + }; + "Character Encoding" = 4; + "Close Sessions On End" = true; + "Columns" = 120; + "Command" = ""; + "Cursor Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.956863; + "Color Space" = "sRGB"; + "Green Component" = 0.937255; + "Red Component" = 0.92549; + }; + "Cursor Guide Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.211765; + "Color Space" = "sRGB"; + "Green Component" = 0.219608; + "Red Component" = 0.235294; + }; + "Cursor Text Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.156863; + "Color Space" = "sRGB"; + "Green Component" = 0.156863; + "Red Component" = 0.156863; + }; + "Custom Command" = "No"; + "Custom Directory" = "No"; + "Default Bookmark" = "No"; + "Description" = "Default"; + "Disable Window Resizing" = true; + "Flashing Bell" = false; + "Foreground Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Guid" = "00A17AC2-1885-4AE2-B941-A47A5D8C36B4"; + "Has Hotkey" = true; + "Horizontal Spacing" = 1; + "HotKey Activated By Modifier" = false; + "HotKey Alternate Shortcuts" = { + "HotKey Characters" = " "; + "HotKey Characters Ignoring Modifiers" = " "; + "HotKey Key Code" = 49; + "HotKey Modifier Activation" = 3; + "HotKey Modifier Flags" = 1048576; + "HotKey Window Animates" = false; + "HotKey Window AutoHides" = true; + "HotKey Window Dock Click Action" = 0; + "HotKey Window Floats" = true; + "HotKey Window Reopens On Activation" = false; + "Idle Code" = 0; + "Initial Use Transparency" = true; + "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"; + }; + "0x74-0x100000-0x0" = { + "Action" = 27; + "Label" = ""; + "Text" = "00A17AC2-1885-4AE2-B941-A47A5D8C36B4"; + "Version" = 1; + }; + "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" = 1; + "Color Space" = "sRGB"; + "Green Component" = 1; + "Red Component" = 0.996078; + }; + "Mouse Reporting" = true; + "Name" = "Hotkey Window"; + "Non Ascii Font" = "Monaco 12"; + "Non-ASCII Anti Aliased" = true; + "Normal Font" = "MesloLGS-NF-Regular 12"; + "Option Key Sends" = 2; + "Prompt Before Closing 2" = false; + "Right Option Key Sends" = 0; + "Rows" = 25; + "Screen" = -1; + "Scrollback Lines" = 0; + "Selected Text Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.329412; + "Color Space" = "sRGB"; + "Green Component" = 0.329412; + "Red Component" = 0.329412; + }; + "Selection Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.94902; + "Color Space" = "sRGB"; + "Green Component" = 0.972549; + "Red Component" = 0.972549; + }; + "Send Code When Idle" = false; + "Shortcut" = ""; + "Silence Bell" = false; + "Space" = -1; + "Sync Title" = false; + "Tab Color" = { + "Alpha Component" = 1; + "Blue Component" = 0.321569; + "Color Space" = "sRGB"; + "Green Component" = 0.258824; + "Red Component" = 0.231373; + }; + "Tags" = null; + + "Terminal Type" = "xterm-256color"; + "Transparency" = 0.1500997340425532; + "Unlimited Scrollback" = true; + "Use Bold Font" = true; + "Use Bright Bold" = true; + "Use Italic Font" = true; + "Use Non-ASCII Font" = false; + "Vertical Spacing" = 1; + "Visual Bell" = true; + "Window Type" = 2; + "Working Directory" = "/Users/willem"; + }; + } + ]; + "PMPrintingExpandedStateForPrint2" = false; + "PasteTabToStringTabStopSize" = 4; + "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"; }; + }; + "Print In Black And White" = true; + "ShowFullScreenTabBar" = false; + "SoundForEsc" = false; + "TabStyleWithAutomaticOption" = 4; + "ToolbeltTools" = [ + "Profiles" + "Jobs" + + ]; + "VisualIndicatorForEsc" = false; + "findMode_iTerm" = 0; + "kCPKSelectionViewPreferredModeKey" = 0; + "kCPKSelectionViewShowHSBTextFieldsKey" = false; +} diff --git a/programs.nix b/programs.nix index b4f94c0..5aada58 100644 --- a/programs.nix +++ b/programs.nix @@ -52,47 +52,47 @@ settings = { format = "$os[](fg:#979797 bg:#444444)$directory$git_branch$git_status[](fg:#444444)$fill[](fg:#444444)$cmd_duration$time$line_break$character"; - fill = { - symbol = "·"; - style = "fg:#505050"; - }; - cmd_duration = { - disabled = false; - min_time = 1500; - style = "fg:#979797 bg:#444444"; - format = "[ $duration  ]($style)"; - }; - os = { - disabled = false; - style = "fg:#eaeaea bg:#444444"; - format = "[ $symbol ]($style)"; - symbols.Macos = ""; - }; - directory = { - disabled = false; - style = "fg:#149dff bg:#444444"; - format = "[  $path ]($style)"; - truncation_length = 3; - truncation_symbol = ""; - }; - git_branch = { - disabled = false; - symbol = ""; - style = "fg:#53d306 bg:#444444"; - format = "[[](fg:#979797 bg:#444444)  $symbol $branch ]($style)"; - }; - git_status = { - disabled = false; - style = "bg:#444444"; - format = - "[[$staged](fg:#cca107 bg:#444444)[$modified](fg:#cca107 bg:#444444)[$untracked](fg:#149dff bg:#444444)[$conflicted](fg:#ed0505 bg:#444444)]($style)"; - }; - time = { - disabled = false; - style = "fg:#4d7573 bg:#444444"; - format = "[ $time  ]($style)"; - time_format = "%T"; - }; + fill = { + symbol = "·"; + style = "fg:#505050"; + }; + cmd_duration = { + disabled = false; + min_time = 1500; + style = "fg:#979797 bg:#444444"; + format = "[ $duration  ]($style)"; + }; + os = { + disabled = false; + style = "fg:#eaeaea bg:#444444"; + format = "[ $symbol ]($style)"; + symbols.Macos = ""; + }; + directory = { + disabled = false; + style = "fg:#149dff bg:#444444"; + format = "[  $path ]($style)"; + truncation_length = 3; + truncation_symbol = ""; + }; + git_branch = { + disabled = false; + symbol = ""; + style = "fg:#53d306 bg:#444444"; + format = "[[](fg:#979797 bg:#444444)  $symbol $branch ]($style)"; + }; + git_status = { + disabled = false; + style = "bg:#444444"; + format = + "[[$staged](fg:#cca107 bg:#444444)[$modified](fg:#cca107 bg:#444444)[$untracked](fg:#149dff bg:#444444)[$conflicted](fg:#ed0505 bg:#444444)]($style)"; + }; + time = { + disabled = false; + style = "fg:#4d7573 bg:#444444"; + format = "[ $time  ]($style)"; + time_format = "%T"; + }; }; }; @@ -109,13 +109,33 @@ autocd = true; defaultKeymap = "emacs"; envExtra = '' - export PATH=${pkgs.pinentry_mac.out}/Applications/pinentry-mac.app/Contents/MacOS:$PATH - export GPG_TTY=$(tty) - eval $(gpg-agent --daemon -q 2>/dev/null) +#!/usr/bin/env zsh +export GPG_TTY=$(tty) +eval $(gpg-agent --daemon -q 2>/dev/null) - function gsearch() { - open -a Safari "https://google.com/search?q=$(echo $@ | sed -e 's/ /%20/g')" - } +function gsearch() { + open -a Safari "https://google.com/search?q=$(echo $@ | sed -e 's/ /%20/g')" +} + +function plistxml2nix() { + tail -n +4 | + sed -e "s//{/g" \ + -e "s/<\/dict>/\}\;/g" \ + -e "s//\"/g" \ + -e "s/<\/key>/\"=/g" \ + -e "s///g" \ + -e "s/<\/real>/;/g" \ + -e "s///g" \ + -e "s/<\/integer>/;/g" \ + -e "s//\"/g" \ + -e "s/<\/string>/\"\;/g" \ + -e "s//\[/g" \ + -e "s/<\/array>/\];/g" \ + -e "s//true;/g" \ + -e "s//false;/g" \ + -e "$ d" | + sed \-e "$ s/;//" +} ''; dotDir = ".config/zsh"; history = {