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

chore: tidy flake and add tclip/golink 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
teamcity
jolheiser 2023-09-05 14:50:57 -05:00
parent 10c850fdca
commit eefe177991
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.nix
View File

@ -3,19 +3,27 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager";
agenix.url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs";
agenix.inputs = { };
agenix = {
url = "github:ryantm/agenix";
inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
darwin.follows = ""; darwin.follows = "";
}; };
};
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/NUR";
jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur"; jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
# Other flakes
golink.url = "github:tailscale/golink";
tclip.url = "github:tailscale-dev/tclip";
}; };
outputs = { outputs = {
@ -25,9 +33,12 @@
agenix, agenix,
jolheiser-nur, jolheiser-nur,
nixpkgs-py36, nixpkgs-py36,
golink,
tclip,
... ...
} @ inputs: let } @ inputs: let
overlays = final: prev: { overlays = [
(final: prev: {
nur = import inputs.nur { nur = import inputs.nur {
nurpkgs = prev; nurpkgs = prev;
pkgs = prev; pkgs = prev;
@ -35,7 +46,9 @@
jolheiser = import jolheiser-nur {pkgs = prev;}; jolheiser = import jolheiser-nur {pkgs = prev;};
}; };
}; };
}; })
golink.overlay
];
commonConfig = {gui ? true}: { commonConfig = {gui ? true}: {
config, config,
pkgs, pkgs,
@ -47,7 +60,7 @@
}; };
in { in {
config = { config = {
nixpkgs.overlays = [overlays]; nixpkgs.overlays = overlays;
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
@ -119,6 +132,7 @@
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
agenix.nixosModules.default agenix.nixosModules.default
golink.nixosModule.default
./machines/dragonwell ./machines/dragonwell
(commonConfig {gui = false;}) (commonConfig {gui = false;})
]; ];