From fd2fafd4d423370427e3c684f3df8f7befdab9fc Mon Sep 17 00:00:00 2001 From: sgoudham Date: Tue, 30 Jan 2024 22:44:47 +0000 Subject: [PATCH] feat(nix): add `just` & catppuccin `whiskers` --- flake.lock | 165 +++++++++++++++++++++++++++++++++++++---------- flake.nix | 3 + home/default.nix | 2 + 3 files changed, 135 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 61b0109..c08fa5b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,14 +1,34 @@ { "nodes": { + "catppuccin-toolbox": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1701205596, + "narHash": "sha256-YwUYVKzOWDdOoQKHiPjScCbAogSZOTyr41L68E5yzG8=", + "owner": "catppuccin", + "repo": "toolbox", + "rev": "7800226205d685d4c03435867dc054ec48922462", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "toolbox", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "git-view", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1688082682, @@ -27,12 +47,12 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nekowinston-nur", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1676846788, @@ -179,11 +199,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -211,6 +231,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -225,9 +263,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1687709756, @@ -243,9 +281,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -264,9 +302,9 @@ "git-view": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1688345409, @@ -303,7 +341,7 @@ "inputs": { "flake-parts": "flake-parts_3", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1686721748, @@ -348,11 +386,11 @@ ] }, "locked": { - "lastModified": 1697838989, - "narHash": "sha256-hwVlO+st8vWJO6iy3/JbMHrUyY4Ak7xUSmffoWqBPUg=", + "lastModified": 1702203126, + "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae631b0b20f06f7d239d160723d228891ddb2fe0", + "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "type": "github" }, "original": { @@ -390,9 +428,9 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "icat": "icat", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "wezterm-src": "wezterm-src" }, "locked": { @@ -411,7 +449,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -439,7 +477,7 @@ "flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1688601949, @@ -477,16 +515,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688221086, - "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -510,6 +548,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1688221086, + "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1688646010, "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=", @@ -525,7 +579,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1686501370, "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", @@ -541,7 +595,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1688556768, "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=", @@ -557,13 +611,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", "type": "github" }, "original": { @@ -590,16 +644,42 @@ }, "root": { "inputs": { + "catppuccin-toolbox": "catppuccin-toolbox", "git-view": "git-view", "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nur": "nur" } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "catppuccin-toolbox", + "flake-utils" + ], + "nixpkgs": [ + "catppuccin-toolbox", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1697940838, + "narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a3e829c06eadf848f13d109c7648570ce37ebccd", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "git-view", @@ -626,7 +706,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "flake-utils": [ "git-view", @@ -651,7 +731,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "nekowinston-nur", @@ -738,6 +818,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wezterm-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 23a6de5..696e2f7 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ git-view.url = "github:sgoudham/git-view/v1.0.0"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + catppuccin-toolbox.url = "github:catppuccin/toolbox"; }; nixConfig = { @@ -38,12 +39,14 @@ nix-index-database, neovim-nightly-overlay, git-view, + catppuccin-toolbox, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; overlays = final: prev: { git-view = git-view.packages.${system}.default; + whiskers = catppuccin-toolbox.packages.${pkgs.system}.whiskers; nur = import nur { nurpkgs = prev; pkgs = prev; diff --git a/home/default.nix b/home/default.nix index c650b1b..beadb9b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -37,6 +37,8 @@ vivid git-view nur.repos.nekowinston.icat + whiskers + just ]; home.sessionVariables = { TERMINAL = "wezterm-gui";