From 63567f0d06249b4c80d8dbf9a0117e22bcb3388e Mon Sep 17 00:00:00 2001 From: willemml Date: Wed, 8 Feb 2023 15:33:54 -0800 Subject: [PATCH] home reorg --- home/{darwin/default.nix => darwin.nix} | 8 +- home/darwin/finder.nix | 164 ----------------------- home/default.nix | 2 +- home/finder.nix | 170 ++++++++++++++++++++++++ home/{darwin => }/iterm2.nix | 115 ++++++++-------- home/{darwin => }/launchd.nix | 0 home/programs.nix | 14 +- 7 files changed, 240 insertions(+), 233 deletions(-) rename home/{darwin/default.nix => darwin.nix} (93%) delete mode 100644 home/darwin/finder.nix create mode 100644 home/finder.nix rename home/{darwin => }/iterm2.nix (76%) rename home/{darwin => }/launchd.nix (100%) diff --git a/home/darwin/default.nix b/home/darwin.nix similarity index 93% rename from home/darwin/default.nix rename to home/darwin.nix index bdd0a4f..8b1ed67 100644 --- a/home/darwin/default.nix +++ b/home/darwin.nix @@ -16,8 +16,9 @@ let web = "Safari"; zotero = "Zotero"; }; -in { - imports = [ ./launchd.nix ]; +in +{ + imports = [ ./launchd.nix ./iterm2.nix ./finder.nix ]; home.file.".gnupg/gpg-agent.conf".text = mkIf stdenv.isDarwin '' pinentry-program "${pkgs.pinentry-touchid}/bin/pinentry-touchid" @@ -35,7 +36,6 @@ in { }; programs.zsh.shellAliases = mkIf stdenv.isDarwin ({ - am = lib.mkIf pkgs.stdenv.isDarwin "zsh ~/.config/zsh/am.sh"; o = "open"; oa = "open -a"; pinentry = "pinentry-mac"; @@ -46,8 +46,6 @@ in { targets.darwin = { defaults = { - "com.googlecode.iterm2" = import ./iterm2.nix; - "com.apple.finder" = import ./finder.nix; NSGlobalDomain = { AppleLanguages = [ "en-CA" ]; AppleLocale = "en_CA"; diff --git a/home/darwin/finder.nix b/home/darwin/finder.nix deleted file mode 100644 index 8ca6678..0000000 --- a/home/darwin/finder.nix +++ /dev/null @@ -1,164 +0,0 @@ -let - columnSettings = { - name = { - visible = true; - width = 300; - index = 1; - }; - dateModified = { - visible = true; - width = 150; - index = 2; - }; - dateCreated = { - visible = true; - width = 150; - index = 3; - }; - size = { - visible = true; - index = 4; - width = 100; - }; - dateLastOpened = { - visible = true; - width = 150; - index = 5; - }; - kind = { - visible = true; - width = 100; - index = 6; - }; - comments = { - visible = false; - width = 200; - index = 7; - }; - label = { - visible = false; - width = 50; - index = 8; - }; - version = { - visible = false; - width = 50; - index = 9; - }; - }; - - listviewsettings = { - calculateAllSizes = true; - showIconPreview = true; - iconSize = 16; - textSize = 13; - sortColumn = "name"; - useRelativeDates = true; - viewOptionsVersion = 1; - }; - - default-view-settings = { - ExtendedListViewSettingsV2 = { - columns = builtins.sort (a: b: a.index < b.index) (map (name: - (name: value: { - identifier = "${name}"; - visible = value.visible; - width = value.width; - index = value.index; - }) name columnSettings.${name}) (builtins.attrNames columnSettings)); - } // listviewsettings; - ListViewSettings = { columns = columnSettings; } // listviewsettings; - }; - - dvs-with-ws = { - WindowState = { - ContainerShowSidebar = true; - ShowStatusBar = true; - ShowSidebar = true; - ShowToolbar = true; - ShowTabView = true; - }; - } // default-view-settings; -in { - AppleShowAllExtensions = true; - - ComputerViewSettings = dvs-with-ws; - - CreateDesktop = false; - - DesktopViewSettings = { GroupBy = "Kind"; }; - - FinderSpawnTab = false; - - FK_DefaultListViewSettingsV2 = - default-view-settings.ExtendedListViewSettingsV2; - - FK_StandardViewSettings = { - SettingsType = "FK_StandardViewSettings"; - } // default-view-settings; - - FK_iCloudListViewSettingsV2 = - default-view-settings.ExtendedListViewSettingsV2; - - FXArrangeGroupViewBy = "Name"; - - FXDefaultSearchScope = "SCsp"; - - FXEnableExtensionChangeWarning = false; - - FXEnableRemoveFromICloudDriveWarning = false; - - FXICloudDriveDocuments = true; - - FXICloudDriveEnabled = true; - - FXPreferredGroupBy = "Kind"; - - FXPreferredViewStyle = "Nlsv"; - - GoToField = "~/Library/"; - - ICloudViewSettings = dvs-with-ws; - - NetworkViewSettings = dvs-with-ws; - - NSDocumentSaveNewDocumentsToCloud = false; - - NSTableViewDefaultSizeMode = 1; - - PackageViewSettings = dvs-with-ws; - - RecentsArrangeGroupViewBy = "Date Last Opened"; - - SearchViewSettings = dvs-with-ws; - - ShowExternalHardDrivesOnDesktop = false; - - ShowHardDrivesOnDesktop = false; - - ShowPathbar = true; - - ShowRemovableMediaOnDesktop = false; - - ShowSidebar = true; - - showWindowTitlebarIcons = false; - - SidebarWidth = 135; - - SidebarZoneOrder1 = [ "icloud_drive" "favorites" "devices" "tags" ]; - - StandardViewSettings = { - SettingsType = "StandardViewSettings"; - } // default-view-settings; - - TrashViewSettings = dvs-with-ws; - - WarnOnEmptyTrash = false; - - _FXShowPosixPathInTitle = true; - - _FXSortFoldersFirst = true; - - _FXSortFoldersFirstOnDesktop = true; -} diff --git a/home/default.nix b/home/default.nix index 84b9068..685fb9b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -43,5 +43,5 @@ rec { username = "willem"; }; - imports = [ ./emacs.nix ./packages.nix ./programs.nix ./darwin ]; + imports = [ ./emacs.nix ./packages.nix ./programs.nix ./darwin.nix ]; } diff --git a/home/finder.nix b/home/finder.nix new file mode 100644 index 0000000..7a6adb7 --- /dev/null +++ b/home/finder.nix @@ -0,0 +1,170 @@ +let + columnSettings = { + name = { + visible = true; + width = 300; + index = 1; + }; + dateModified = { + visible = true; + width = 150; + index = 2; + }; + dateCreated = { + visible = true; + width = 150; + index = 3; + }; + size = { + visible = true; + index = 4; + width = 100; + }; + dateLastOpened = { + visible = true; + width = 150; + index = 5; + }; + kind = { + visible = true; + width = 100; + index = 6; + }; + comments = { + visible = false; + width = 200; + index = 7; + }; + label = { + visible = false; + width = 50; + index = 8; + }; + version = { + visible = false; + width = 50; + index = 9; + }; + }; + + listviewsettings = { + calculateAllSizes = true; + showIconPreview = true; + iconSize = 16; + textSize = 13; + sortColumn = "name"; + useRelativeDates = true; + viewOptionsVersion = 1; + }; + + default-view-settings = { + ExtendedListViewSettingsV2 = { + columns = builtins.sort (a: b: a.index < b.index) (map + (name: + (name: value: { + identifier = "${name}"; + visible = value.visible; + width = value.width; + index = value.index; + }) name + columnSettings.${name}) + (builtins.attrNames columnSettings)); + } // listviewsettings; + ListViewSettings = { columns = columnSettings; } // listviewsettings; + }; + + dvs-with-ws = { + WindowState = { + ContainerShowSidebar = true; + ShowStatusBar = true; + ShowSidebar = true; + ShowToolbar = true; + ShowTabView = true; + }; + } // default-view-settings; +in +{ + targets.darwin.defaults."com.apple.finder" = { + AppleShowAllExtensions = true; + + ComputerViewSettings = dvs-with-ws; + + CreateDesktop = false; + + DesktopViewSettings = { GroupBy = "Kind"; }; + + FinderSpawnTab = false; + + FK_DefaultListViewSettingsV2 = + default-view-settings.ExtendedListViewSettingsV2; + + FK_StandardViewSettings = { + SettingsType = "FK_StandardViewSettings"; + } // default-view-settings; + + FK_iCloudListViewSettingsV2 = + default-view-settings.ExtendedListViewSettingsV2; + + FXArrangeGroupViewBy = "Name"; + + FXDefaultSearchScope = "SCsp"; + + FXEnableExtensionChangeWarning = false; + + FXEnableRemoveFromICloudDriveWarning = false; + + FXICloudDriveDocuments = true; + + FXICloudDriveEnabled = true; + + FXPreferredGroupBy = "Kind"; + + FXPreferredViewStyle = "Nlsv"; + + GoToField = "~/Library/"; + + ICloudViewSettings = dvs-with-ws; + + NetworkViewSettings = dvs-with-ws; + + NSDocumentSaveNewDocumentsToCloud = false; + + NSTableViewDefaultSizeMode = 1; + + PackageViewSettings = dvs-with-ws; + + RecentsArrangeGroupViewBy = "Date Last Opened"; + + SearchViewSettings = dvs-with-ws; + + ShowExternalHardDrivesOnDesktop = false; + + ShowHardDrivesOnDesktop = false; + + ShowPathbar = true; + + ShowRemovableMediaOnDesktop = false; + + ShowSidebar = true; + + showWindowTitlebarIcons = false; + + SidebarWidth = 135; + + SidebarZoneOrder1 = [ "icloud_drive" "favorites" "devices" "tags" ]; + + StandardViewSettings = { + SettingsType = "StandardViewSettings"; + } // default-view-settings; + + TrashViewSettings = dvs-with-ws; + + WarnOnEmptyTrash = false; + + _FXShowPosixPathInTitle = true; + + _FXSortFoldersFirst = true; + + _FXSortFoldersFirstOnDesktop = true; + }; +} diff --git a/home/darwin/iterm2.nix b/home/iterm2.nix similarity index 76% rename from home/darwin/iterm2.nix rename to home/iterm2.nix index d607d05..1edc1b0 100644 --- a/home/darwin/iterm2.nix +++ b/home/iterm2.nix @@ -226,60 +226,63 @@ let "Visual Bell" = true; "Window Type" = 0; } // dracula_plus; -in { - "AlternateMouseScroll" = true; - "Default Bookmark Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; - "HotkeyMigratedFromSingleToMulti" = true; - "LeftCommand" = 7; - "LeftOption" = 2; - "ShowFullScreenTabBar" = false; - "SoundForEsc" = false; - "SUEnableAutomaticChecks" = false; - "SUHasLaunchedBefore" = true; - "VisualIndicatorForEsc" = false; - "New Bookmarks" = [ - ({ - "Columns" = 120; - "Command" = ""; - "Custom Command" = "No"; - "Custom Directory" = "No"; - "Default Bookmark" = "Yes"; - "Description" = "Default"; - "Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; - "Name" = "Primary"; - "Rows" = 30; - "Screen" = -1; - "Tags" = [ ]; - "Working Directory" = "/Users/willem"; - } // profile_defaults) - ({ - "Columns" = 120; - "Command" = ""; - "Custom Command" = "No"; - "Custom Directory" = "No"; - "Default Bookmark" = "No"; - "Description" = "Default"; - "Disable Window Resizing" = true; - "Guid" = "00A17AC2-1885-4AE2-B941-A47A5D8C36B4"; - "Has Hotkey" = true; - "HotKey Activated By Modifier" = false; - "HotKey Alternate Shortcuts" = { }; - "HotKey Characters Ignoring Modifiers" = " "; - "HotKey Characters" = " "; - "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; - "Name" = "Hotkey Window"; - "Rows" = 25; - "Screen" = -1; - "Space" = -1; - "Tags" = [ ]; - "Working Directory" = "/Users/willem"; - } // profile_defaults) - ]; +in +{ + targets.darwin.defaults."com.googlecode.iterm2" = { + "AlternateMouseScroll" = true; + "Default Bookmark Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; + "HotkeyMigratedFromSingleToMulti" = true; + "LeftCommand" = 7; + "LeftOption" = 2; + "ShowFullScreenTabBar" = false; + "SoundForEsc" = false; + "SUEnableAutomaticChecks" = false; + "SUHasLaunchedBefore" = true; + "VisualIndicatorForEsc" = false; + "New Bookmarks" = [ + ({ + "Columns" = 120; + "Command" = ""; + "Custom Command" = "No"; + "Custom Directory" = "No"; + "Default Bookmark" = "Yes"; + "Description" = "Default"; + "Guid" = "30FFD0AB-B2EB-4635-9469-D089C1D9E106"; + "Name" = "Primary"; + "Rows" = 30; + "Screen" = -1; + "Tags" = [ ]; + "Working Directory" = "/Users/willem"; + } // profile_defaults) + ({ + "Columns" = 120; + "Command" = ""; + "Custom Command" = "No"; + "Custom Directory" = "No"; + "Default Bookmark" = "No"; + "Description" = "Default"; + "Disable Window Resizing" = true; + "Guid" = "00A17AC2-1885-4AE2-B941-A47A5D8C36B4"; + "Has Hotkey" = true; + "HotKey Activated By Modifier" = false; + "HotKey Alternate Shortcuts" = { }; + "HotKey Characters Ignoring Modifiers" = " "; + "HotKey Characters" = " "; + "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; + "Name" = "Hotkey Window"; + "Rows" = 25; + "Screen" = -1; + "Space" = -1; + "Tags" = [ ]; + "Working Directory" = "/Users/willem"; + } // profile_defaults) + ]; + }; } diff --git a/home/darwin/launchd.nix b/home/launchd.nix similarity index 100% rename from home/darwin/launchd.nix rename to home/launchd.nix diff --git a/home/programs.nix b/home/programs.nix index 91e32b8..f04fb9a 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -3,7 +3,7 @@ { programs = { bash.enableCompletion = true; - + browserpass = { enable = true; browsers = [ @@ -96,23 +96,23 @@ zsh = { enable = true; - + autocd = true; defaultKeymap = "emacs"; dotDir = ".config/zsh"; enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + enableSyntaxHighlighting = true; enableVteIntegration = true; - + history = { path = "$HOME/.local/zsh/history"; extended = true; ignoreDups = true; }; - + historySubstringSearch.enable = true; - + loginExtra = '' #!/usr/bin/env zsh export GPG_TTY=$(tty) @@ -140,7 +140,7 @@ sed \-e "$ s/;//" } ''; - + shellAliases = { cd = "z"; drs = "darwin-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";