jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: clean up flake 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
teamcity
jolheiser 2024-04-03 21:36:13 -05:00
parent 6a5f3da703
commit 08c39b6601
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
1 changed files with 112 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
flake.nix
View File

@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db"; nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
home-manager = { home-manager = {
@ -17,7 +18,6 @@
home-manager.follows = ""; home-manager.follows = "";
}; };
}; };
flake-utils.url = "github:numtide/flake-utils";
nixos-hardware.url = "github:nixos/nixos-hardware/master"; nixos-hardware.url = "github:nixos/nixos-hardware/master";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -125,8 +125,7 @@
inputs.golink.overlay inputs.golink.overlay
]; ];
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit overlays; inherit overlays system;
system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
}; };
userSecret = path: { userSecret = path: {
@ -191,8 +190,8 @@
}) })
]; ];
username = "jolheiser"; username = "jolheiser";
in system = "x86_64-linux";
{ in {
homeConfigurations = let homeConfigurations = let
commonModules = [ commonModules = [
{ {
@ -229,7 +228,7 @@
}; };
nixosConfigurations = { nixosConfigurations = {
"chai" = nixpkgs.lib.nixosSystem { "chai" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = modules =
workModules workModules
++ [ ++ [
@ -237,7 +236,7 @@
]; ];
}; };
"earlgrey" = nixpkgs.lib.nixosSystem { "earlgrey" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = modules =
workModules workModules
++ [ ++ [
@ -245,7 +244,7 @@
]; ];
}; };
"masala" = nixpkgs.lib.nixosSystem { "masala" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = modules =
workModules workModules
++ [ ++ [
@ -254,7 +253,7 @@
]; ];
}; };
"matcha" = nixpkgs.lib.nixosSystem { "matcha" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
./machines/matcha ./machines/matcha
@ -262,7 +261,7 @@
]; ];
}; };
"genmaicha" = nixpkgs.lib.nixosSystem { "genmaicha" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = [ modules = [
nixos-hardware.nixosModules.framework-13-7040-amd nixos-hardware.nixosModules.framework-13-7040-amd
agenix.nixosModules.default agenix.nixosModules.default
@ -271,7 +270,7 @@
]; ];
}; };
"sencha" = nixpkgs.lib.nixosSystem { "sencha" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; inherit system;
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
./machines/sencha ./machines/sencha
@ -282,8 +281,7 @@
colmena = { colmena = {
meta = { meta = {
nixpkgs = import nixpkgs { nixpkgs = import nixpkgs {
system = "x86_64-linux"; inherit overlays system;
overlays = overlays;
}; };
}; };
dragonwell = { dragonwell = {
@ -299,15 +297,11 @@
extra-substitutors = ["https://jolheiser.cachix.org"]; extra-substitutors = ["https://jolheiser.cachix.org"];
extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="]; extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
}; };
} devShells.${system}.default = pkgs.mkShell {
// inputs.flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
agenix.packages.${system}.agenix agenix.packages.${system}.agenix
pkgs.colmena pkgs.colmena
]; ];
}; };
}); };
} }