📦️ add overlay + workon

This commit is contained in:
James Walker 2022-10-27 22:34:08 -04:00
parent f72e15afa7
commit 449c104dc8
Signed by: walkah
GPG Key ID: 3C127179D6086E93
3 changed files with 84 additions and 13 deletions

80
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1666614183, "lastModified": 1666776005,
"narHash": "sha256-R5+bCtUquwSfQmRBbCYc6FT6xtCaAebh0KE187e8458=", "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0f90e1c34caedd0bf765ebe47b92dd1ceffafcc8", "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,6 +89,22 @@
"type": "github" "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": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
@ -104,17 +120,32 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1666558342, "lastModified": 1666903647,
"narHash": "sha256-qiH0Zgig28yaSyebehrrYiX1y53Y/xFcQW+EFMRSVI0=", "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "186d9399f9eb64fb06ea4385732c1cf1624ae2b6", "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +156,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1665987993, "lastModified": 1666873549,
"narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=", "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0e6593630071440eb89cd97a52921497482b22c6", "rev": "419dcc0ec767803182ed01a326f134230578bf60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +220,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1666603677, "lastModified": 1666837999,
"narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", "narHash": "sha256-hI7+s1UVDsJNqNn9UGV6xTBGqMC4dqOyVpeDf+su7JU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", "rev": "1c6eb4876f71e8903ae9f73e6adf45fdbebc0292",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,7 +244,8 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"workon": "workon"
} }
}, },
"sops-nix": { "sops-nix": {
@ -266,6 +298,28 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "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", "root": "root",

View File

@ -28,6 +28,11 @@
url = "github:walkah/dotfiles"; url = "github:walkah/dotfiles";
flake = false; flake = false;
}; };
workon = {
url = "github:walkah/workon";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -40,9 +45,16 @@
, home-manager , home-manager
, sops-nix , sops-nix
, dotfiles , dotfiles
, workon
, ... , ...
}@inputs: }@inputs:
let let
overlays = [
(self: super: {
workon = workon.packages.${self.system}.default;
})
];
mkSystem = hostName: system: modules: mkSystem = hostName: system: modules:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
system = system; system = system;
@ -50,6 +62,7 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
({ config, ... }: { ({ config, ... }: {
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = overlays;
}) })
] ++ modules; ] ++ modules;
specialArgs = inputs; specialArgs = inputs;
@ -61,6 +74,7 @@
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
({ config, ... }: { ({ config, ... }: {
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = overlays;
}) })
] ++ modules; ] ++ modules;
specialArgs = inputs; specialArgs = inputs;

View File

@ -20,5 +20,8 @@
# Rust # Rust
rustup rustup
rust-analyzer rust-analyzer
# My stuff
workon
]; ];
} }