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

chore: ragenix -> agenix, clean up entry 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
teamcity
jolheiser 2023-07-14 11:55:09 -05:00
parent 39b11d2092
commit 458bce68e6
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
3 changed files with 41 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
flake.lock
View File

@ -2,18 +2,18 @@
"nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"darwin": [],
"home-manager": "home-manager",
"nixpkgs": [
"ragenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1682101079,
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
"lastModified": 1689334118,
"narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
"owner": "ryantm",
"repo": "agenix",
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
"rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
"type": "github"
},
"original": {
@ -22,75 +22,6 @@
"type": "github"
}
},
"crane": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": [
"ragenix",
"flake-utils"
],
"nixpkgs": [
"ragenix",
"nixpkgs"
],
"rust-overlay": [
"ragenix",
"rust-overlay"
]
},
"locked": {
"lastModified": 1681680516,
"narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=",
"owner": "ipetkov",
"repo": "crane",
"rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"ragenix",
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673295039,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -109,25 +40,28 @@
"type": "github"
}
},
"flake-utils_2": {
"home-manager": {
"inputs": {
"systems": "systems_2"
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"lastModified": 1682203081,
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager": {
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
@ -212,63 +146,14 @@
"type": "github"
}
},
"ragenix": {
"inputs": {
"agenix": "agenix",
"crane": "crane",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1682237245,
"narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=",
"owner": "yaxitech",
"repo": "ragenix",
"rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50",
"type": "github"
},
"original": {
"owner": "yaxitech",
"repo": "ragenix",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"home-manager": "home-manager_2",
"jolheiser-nur": "jolheiser-nur",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"ragenix": "ragenix"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"ragenix",
"flake-utils"
],
"nixpkgs": [
"ragenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1682129965,
"narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "2c417c0460b788328220120c698630947547ee83",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
"nur": "nur"
}
},
"systems": {
@ -285,21 +170,6 @@
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

37
flake.nix
View File

@ -5,21 +5,22 @@
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
ragenix.url = "github:yaxitech/ragenix";
ragenix.inputs.nixpkgs.follows = "nixpkgs";
agenix.url = "github:ryantm/agenix";
agenix.inputs = {
nixpkgs.follows = "nixpkgs";
darwin.follows = "";
};
flake-utils.url = "github:numtide/flake-utils";
nur.url = "github:nix-community/nur";
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
};
nixConfig = {warn-dirty = false;};
outputs = {
self,
nixpkgs,
home-manager,
ragenix,
agenix,
jolheiser-nur,
...
} @ inputs: let
@ -32,7 +33,7 @@
};
};
};
commonConfig = {username}: ({
commonConfig = {
config,
pkgs,
...
@ -50,19 +51,20 @@
age.secrets = {
ssh-config = {
file = ./secrets/shared/ssh-config.age;
owner = "jolheiser";
owner = username;
};
ssh-config-work = {
file = ./secrets/shared/ssh-config-work.age;
owner = "jolheiser";
owner = username;
};
spotify-pw = {
file = ./secrets/shared/spotify-pw.age;
owner = "jolheiser";
owner = username;
};
};
};
});
};
username = "jolheiser";
in
{
nixosConfigurations = {
@ -70,12 +72,12 @@
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
ragenix.nixosModules.default
agenix.nixosModules.default
./machines/common
./machines/chai
(commonConfig {username = "jolheiser";})
commonConfig
({pkgs, ...}: {
home-manager.users.jolheiser.programs.git.package = pkgs.gitSVN;
home-manager.users.${username}.programs.git.package = pkgs.gitSVN;
})
];
};
@ -83,10 +85,10 @@
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
ragenix.nixosModules.default
agenix.nixosModules.default
./machines/common
./machines/matcha
(commonConfig {username = "jolheiser";})
commonConfig
];
};
};
@ -95,9 +97,8 @@
pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
just
ragenix.packages.${system}.ragenix
nativeBuildInputs = [
agenix.packages.${system}.agenix
];
};
});

1
machines/common/default.nix
View File

@ -49,6 +49,7 @@
settings = {
experimental-features = ["flakes" "nix-command" "repl-flake"];
auto-optimise-store = true;
warn-dirty = false;
};
};