From 44a125091e0832a69027e9d2e8267711c264114a Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Fri, 31 May 2024 17:56:08 +1000 Subject: [PATCH] Stable version of configuration --- darwin/casks.nix | 3 + darwin/home-manager.nix | 2 + flake.lock | 124 +++++++++++++++++++++------------------- flake.nix | 13 ++++- shared/home-manager.nix | 30 +++++----- shared/packages.nix | 4 +- 6 files changed, 98 insertions(+), 78 deletions(-) diff --git a/darwin/casks.nix b/darwin/casks.nix index 2fd08e4..eee0178 100644 --- a/darwin/casks.nix +++ b/darwin/casks.nix @@ -4,6 +4,7 @@ # Development Tools "docker" "minizincide" + "qflipper" "sublime-merge" "vscodium" "warp" @@ -19,9 +20,11 @@ # Utility Tools "calibre" "google-drive" + "skim" # Productivity Tools "alfred" + "raycast" "mactex-no-gui" # Browsers diff --git a/darwin/home-manager.nix b/darwin/home-manager.nix index aef7b90..63138bb 100644 --- a/darwin/home-manager.nix +++ b/darwin/home-manager.nix @@ -22,6 +22,7 @@ in }; casks = pkgs.callPackage ./casks.nix { }; brews = [ + "biber@2.17" "scip" ]; # WARNING: should match flake.nix @@ -30,6 +31,7 @@ in "homebrew/homebrew-cask" "homebrew/homebrew-cask-fonts" "homebrew/homebrew-bundle" + "dgfl-gh/homebrew-taps" ]; }; diff --git a/flake.lock b/flake.lock index 8071cb3..e4b1dc5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1711985568, - "narHash": "sha256-VLeP9HGQwfkiuHDp648PXGCkogr3ktYm0q9Yj+i0lGQ=", + "lastModified": 1716195221, + "narHash": "sha256-u+zjC7efKD3gBD9aKXsUTEhRhBQhYlP+KPFp1QbsgOo=", "owner": "Homebrew", "repo": "brew", - "rev": "bd1155be8f50998429a795c15a69c8fe75250510", + "rev": "e0bc557e7b991cb23583679e1cf1c8a92b793aeb", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.2.16", + "ref": "4.3.1", "repo": "brew", "type": "github" } @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -38,16 +38,32 @@ "type": "github" } }, + "dgfl-tap": { + "flake": false, + "locked": { + "lastModified": 1713015168, + "narHash": "sha256-zQwGwu6PUL7Gv7PeVSQU1Edqji2jSGkZchJ5/03IrlQ=", + "owner": "dgfl-gh", + "repo": "homebrew-taps", + "rev": "e7b966a234cff599e79a5313939cfcfd390537e1", + "type": "github" + }, + "original": { + "owner": "dgfl-gh", + "repo": "homebrew-taps", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -58,18 +74,21 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1716729592, + "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -77,11 +96,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1712711780, - "narHash": "sha256-PY2TQT8gL5xb5THteyB+HZYLjatCuN0lz2QxmNPVIlc=", + "lastModified": 1717112179, + "narHash": "sha256-HWnHEYLNGYfaJgknt5Qdqz6xIwnsif8CJmKMZwvWS3Q=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "f46a1db7ef9f2e017f6b01b7737e2af275270cfc", + "rev": "4bf997035357ba241bc12dc9c3fda62760a16b6d", "type": "github" }, "original": { @@ -93,11 +112,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1713238851, - "narHash": "sha256-H4wHKFDwciOQGaF4Iu5F0U6sG/7n21E+h2qDXHYUJic=", + "lastModified": 1717135569, + "narHash": "sha256-CT1k9h6WQI+DOIIKB+cD/S/xQ/pNZci8xg0g5Ic0Azw=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "da845eb6bcaa24067d9fdd40bdf03a4568fd8132", + "rev": "42205969080e8222e45de14e56104107255f5fc9", "type": "github" }, "original": { @@ -109,11 +128,11 @@ "homebrew-cask-fonts": { "flake": false, "locked": { - "lastModified": 1713234963, - "narHash": "sha256-9x71KFXraMRtoNDgv3pRUwI5xYOzGTrfwWCMuDh0NOM=", + "lastModified": 1715830477, + "narHash": "sha256-AjZYkbKvpRIHUwSimOebOQ/AuwP7Z3eIKFTyJaHyG1g=", "owner": "homebrew", "repo": "homebrew-cask-fonts", - "rev": "b415b1b34f996ced02785721a2fd30e5c5ea21e4", + "rev": "0ed20f35d21ebc3f4f829689b101078718ad5ce1", "type": "github" }, "original": { @@ -125,11 +144,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1713238712, - "narHash": "sha256-NQ5FU8OiMAJN81pxXdhixc6lBBmwkIf3lILMAFQZeBA=", + "lastModified": 1717141288, + "narHash": "sha256-czldPqtyj/QuAS9qU6H5bZ4PhuobhK5heUOUlF5UT70=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "ee414ee20ba946fb5aa6e841e3516fe8c996605d", + "rev": "002feea9ec1020314fc94fbc76b14bfa9767fb4b", "type": "github" }, "original": { @@ -140,14 +159,14 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1688307440, - "narHash": "sha256-7PTjbN+/+b799YN7Tk2SS5Vh8A0L3gBo8hmB7Y0VXug=", + "lastModified": 1716329735, + "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "b06bab83bdf285ea0ae3c8e145a081eb95959047", + "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", "type": "github" }, "original": { @@ -161,14 +180,14 @@ "brew-src": "brew-src", "flake-utils": "flake-utils", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712182779, - "narHash": "sha256-DchWIKi4c7Jl7CJXVzOxVetxy+SqnlAY3QuUNy8z+aE=", + "lastModified": 1716838497, + "narHash": "sha256-tkceXNn87z+uC08gvQCl7olSCS782EWdflgq0FkSKiw=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "445f7989e096fb90902eed4256b04d8b57c8b358", + "rev": "31e9c8105a3ffdc03829c8c195d385500760d309", "type": "github" }, "original": { @@ -178,22 +197,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -206,13 +209,13 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -222,18 +225,18 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1717090151, + "narHash": "sha256-4UWCIWB01xCZE5EsnZz1d7fJjRw5VVORu8jBM0+rrvY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "f05f3698b80b619ebf367190ddf2ccb47c851d7c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-23.11-darwin", "repo": "nixpkgs", "type": "github" } @@ -241,13 +244,14 @@ "root": { "inputs": { "darwin": "darwin", + "dgfl-tap": "dgfl-tap", "home-manager": "home-manager", "homebrew-bundle": "homebrew-bundle", "homebrew-cask": "homebrew-cask", "homebrew-cask-fonts": "homebrew-cask-fonts", "homebrew-core": "homebrew-core", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index e8013d0..fe20c30 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,11 @@ description = "Dekker1's home manager configuation"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin"; + home-manager = { + url = "github:nix-community/home-manager/release-23.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; darwin = { url = "github:LnL7/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -27,6 +30,10 @@ url = "github:homebrew/homebrew-core"; flake = false; }; + dgfl-tap = { + url = "github:dgfl-gh/homebrew-taps"; + flake = false; + }; }; outputs = { self @@ -36,6 +43,7 @@ , homebrew-cask , homebrew-cask-fonts , homebrew-core + , dgfl-tap , nix-homebrew , nixpkgs } @inputs: @@ -77,6 +85,7 @@ "homebrew/homebrew-cask" = homebrew-cask; "homebrew/homebrew-cask-fonts" = homebrew-cask-fonts; "homebrew/homebrew-bundle" = homebrew-bundle; + "dgfl-gh/homebrew-taps" = dgfl-tap; }; mutableTaps = false; autoMigrate = true; diff --git a/shared/home-manager.nix b/shared/home-manager.nix index e7ae677..5ba1b22 100644 --- a/shared/home-manager.nix +++ b/shared/home-manager.nix @@ -158,18 +158,18 @@ 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; - }; - }; - }; + # 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; @@ -248,8 +248,10 @@ in # CMake settings CMAKE_EXPORT_COMPILE_COMMANDS = "1"; # output compile-commands.json for clangd CMAKE_GENERATOR = "Ninja Multi-Config"; # use Ninja generator by default - CMAKE_C_COMPILER_LAUNCHER = "ccache"; - CMAKE_CXX_COMPILER_LAUNCHER = "ccache"; + CMAKE_C_COMPILER_LAUNCHER = "sccache"; + CMAKE_CXX_COMPILER_LAUNCHER = "sccache"; + # Rust settings + RUSTC_WRAPPER = "sccache"; }; initExtra = "zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'"; historySubstringSearch = { diff --git a/shared/packages.nix b/shared/packages.nix index 3538fc1..36a9d7e 100644 --- a/shared/packages.nix +++ b/shared/packages.nix @@ -26,7 +26,7 @@ with pkgs; [ (nerdfonts.override { fonts = [ "Go-Mono" ]; }) # C(++) development tools - ccache + sccache cmake llvm ninja @@ -40,7 +40,7 @@ with pkgs; [ # MiniZinc solvers gecode - or-tools + # or-tools # Nix development tools nixpkgs-fmt