From 449c104dc88178f0c1cbe4365e693a0109a63c45 Mon Sep 17 00:00:00 2001 From: James Walker Date: Thu, 27 Oct 2022 22:34:08 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20add=20overlay=20+=20wor?= =?UTF-8?q?kon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 80 ++++++++++++++++++++++++++++++++++------- flake.nix | 14 ++++++++ modules/dev/default.nix | 3 ++ 3 files changed, 84 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index e2a684c..21c3d73 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1666614183, - "narHash": "sha256-R5+bCtUquwSfQmRBbCYc6FT6xtCaAebh0KE187e8458=", + "lastModified": 1666776005, + "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0f90e1c34caedd0bf765ebe47b92dd1ceffafcc8", + "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c", "type": "github" }, "original": { @@ -89,6 +89,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -104,17 +120,32 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_2", "utils": "utils_2" }, "locked": { - "lastModified": 1666558342, - "narHash": "sha256-qiH0Zgig28yaSyebehrrYiX1y53Y/xFcQW+EFMRSVI0=", + "lastModified": 1666903647, + "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=", "owner": "nix-community", "repo": "home-manager", - "rev": "186d9399f9eb64fb06ea4385732c1cf1624ae2b6", + "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745", "type": "github" }, "original": { @@ -125,11 +156,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1665987993, - "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=", + "lastModified": 1666873549, + "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0e6593630071440eb89cd97a52921497482b22c6", + "rev": "419dcc0ec767803182ed01a326f134230578bf60", "type": "github" }, "original": { @@ -189,11 +220,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "lastModified": 1666837999, + "narHash": "sha256-hI7+s1UVDsJNqNn9UGV6xTBGqMC4dqOyVpeDf+su7JU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "rev": "1c6eb4876f71e8903ae9f73e6adf45fdbebc0292", "type": "github" }, "original": { @@ -213,7 +244,8 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "workon": "workon" } }, "sops-nix": { @@ -266,6 +298,28 @@ "repo": "flake-utils", "type": "github" } + }, + "workon": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1666916099, + "narHash": "sha256-Ii9HKuI+zXYNQnBMXFE9x3NstKANLNTRQPrbMFxFgKU=", + "owner": "walkah", + "repo": "workon", + "rev": "542e4924a2052fe18f9cda1631824e85d60d8b2c", + "type": "github" + }, + "original": { + "owner": "walkah", + "repo": "workon", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cd9d804..d45aa27 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,11 @@ url = "github:walkah/dotfiles"; flake = false; }; + + workon = { + url = "github:walkah/workon"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -40,9 +45,16 @@ , home-manager , sops-nix , dotfiles + , workon , ... }@inputs: let + overlays = [ + (self: super: { + workon = workon.packages.${self.system}.default; + }) + ]; + mkSystem = hostName: system: modules: nixpkgs.lib.nixosSystem { system = system; @@ -50,6 +62,7 @@ home-manager.nixosModules.home-manager ({ config, ... }: { networking.hostName = hostName; + nixpkgs.overlays = overlays; }) ] ++ modules; specialArgs = inputs; @@ -61,6 +74,7 @@ home-manager.darwinModules.home-manager ({ config, ... }: { networking.hostName = hostName; + nixpkgs.overlays = overlays; }) ] ++ modules; specialArgs = inputs; diff --git a/modules/dev/default.nix b/modules/dev/default.nix index 7654e62..2cf5334 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -20,5 +20,8 @@ # Rust rustup rust-analyzer + + # My stuff + workon ]; }