From f317132bdc529b1587997419dbb6ec4c5c7caac2 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Thu, 21 Dec 2023 17:13:00 +1100 Subject: [PATCH] Add sapling configuration and update --- darwin/home-manager.nix | 27 +++++++++++++++++++------- flake.lock | 42 ++++++++++++++++++++--------------------- shared/home-manager.nix | 17 +++++++++++++++++ shared/packages.nix | 6 ++++-- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/darwin/home-manager.nix b/darwin/home-manager.nix index 02d61a5..a042d65 100644 --- a/darwin/home-manager.nix +++ b/darwin/home-manager.nix @@ -14,12 +14,14 @@ in shell = pkgs.zsh; }; - homebrew.enable = true; - homebrew.casks = pkgs.callPackage ./casks.nix { }; - homebrew.brews = [ - "yabai" - "skhd" - ]; + homebrew = { + enable = true; + casks = pkgs.callPackage ./casks.nix { }; + brews = [ + "yabai" + "skhd" + ]; + }; # These app IDs are from using the mas CLI app # mas = mac app store @@ -61,7 +63,18 @@ in home.stateVersion = "21.11"; programs = { skim.enable = true; - } // import ../shared/home-manager.nix { inherit config pkgs lib; }; + + ssh.matchBlocks = { + "*" = { + extraOptions = { + "UseKeychain" = "yes"; + }; + }; + }; + + } // import ../shared/home-manager.nix { + inherit config pkgs lib; + }; }; }; } diff --git a/flake.lock b/flake.lock index d4396ef..d6b45b0 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1702203126, - "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", + "lastModified": 1703026685, + "narHash": "sha256-AkualfMbc40HkDR2AZc6u71pcap50wDQOXFCY1ULDUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", + "rev": "efc177c15f2a8bb063aeb250fe3c7c21e1de265e", "type": "github" }, "original": { @@ -77,11 +77,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1700695605, - "narHash": "sha256-Y9OJ9/BbGcfslER0hVToFobom/0Y5ynpkdEpQdfNF7s=", + "lastModified": 1702986543, + "narHash": "sha256-Ybb5fpDXY3aCTtUyDGHRrmb0kwMiPeSr+oGJzt9Eji0=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "d6fbeee54ba344be59731ff3e93fb105b2567e34", + "rev": "e4798d8075e1a793f065be3e5e1674ec09193d17", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1702255628, - "narHash": "sha256-Q46Mgw3oLVafoo2mRzDdR6IQ9hdCnfk59uaWoiaAnjE=", + "lastModified": 1703053523, + "narHash": "sha256-OKnyoBhc6rgtwNAtPZYizrUBSTb7eeWHhNz4k0oGFUQ=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "204e8eea0c0f3f1a26bf6f3f238595fdd3fc869c", + "rev": "1cab02e1d861baafb36bfc0b19284a08251fbad1", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "homebrew-cask-fonts": { "flake": false, "locked": { - "lastModified": 1702265088, - "narHash": "sha256-pU63NGMzYZ/4m4JWu5HmxZCU9pKJoUK++W46awmGtdc=", + "lastModified": 1702947819, + "narHash": "sha256-kv2mTDARzk4oc+TPFGnmaXemkuH+8TuHT7CaDEFJtug=", "owner": "homebrew", "repo": "homebrew-cask-fonts", - "rev": "a7fb1a6146ccd9a8d164c4c7f529da56d56310e9", + "rev": "6f04e418dc2bbb72fc438b25de315e0d48aff286", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1702252550, - "narHash": "sha256-QMPC/VNrE706F1sWXokP5k5npM7blXMLc8g8R0iqvHA=", + "lastModified": 1703048151, + "narHash": "sha256-+UmfjC3W1MRljd4WKBwKJGcfBa8enMfmz3oqq5Apb+0=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "fe91ea92d9b89f099209ab8252623c337ac13cd7", + "rev": "c33912fa092823d7179a158793531082c846bf09", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -240,11 +240,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { diff --git a/shared/home-manager.nix b/shared/home-manager.nix index e0a2e06..0e33998 100644 --- a/shared/home-manager.nix +++ b/shared/home-manager.nix @@ -19,6 +19,7 @@ in enable = true; settings = { git_protocol = "ssh"; + version = 1; }; }; @@ -41,6 +42,7 @@ in "__pycache__/" ".vscode" ".clangd/" + ".direnv/" "compile_commands.json" "*.sublime-project" "*.sublime-workspace" @@ -152,6 +154,21 @@ in ''; }; + sapling = { + enable = true; + userName = "Jip J. Dekker"; + userEmail = "jip@dekker.one"; + extraConfig = { + ui."ignore.userroot" = "~/.config/git/ignore"; + isl = { + hasShownGettingStarted = false; + render-compact = false; + }; + }; + }; + + ssh.enable = true; + starship = { enable = true; enableNushellIntegration = true; diff --git a/shared/packages.nix b/shared/packages.nix index 65d0553..650a1d4 100644 --- a/shared/packages.nix +++ b/shared/packages.nix @@ -7,9 +7,9 @@ with pkgs; [ mas mdbook pandoc - sapling tectonic texlab + topgrade typst # Encryption and security tools @@ -26,10 +26,12 @@ with pkgs; [ ninja # Python development tools - pipx black poetry + # Rust development tools + rustup + # MiniZinc solvers gecode # or-tools