Fix some secrets and import jovian for later

This commit is contained in:
Jimbo 2024-09-02 18:29:22 -04:00
parent 5e8ef16d78
commit 0f0f56eaac
3 changed files with 72 additions and 13 deletions

View file

@ -152,11 +152,30 @@
"type": "github"
}
},
"jovian-nixos": {
"inputs": {
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1725153537,
"narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"mail": {
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-24_05": "nixpkgs-24_05"
},
"locked": {
@ -173,11 +192,33 @@
"type": "gitlab"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"jovian-nixos",
"nixpkgs"
]
},
"locked": {
"lastModified": 1690328911,
"narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "matrix-name",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1724982042,
@ -197,7 +238,7 @@
"inputs": {
"blobs": "blobs_2",
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"nixpkgs-24_05": "nixpkgs-24_05_2",
"utils": "utils"
},
@ -277,6 +318,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@ -291,7 +348,7 @@
"type": "indirect"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@ -307,7 +364,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@ -322,7 +379,7 @@
"type": "indirect"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1724242322,
"narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=",
@ -358,10 +415,11 @@
"blender-bin": "blender-bin",
"hardware": "hardware",
"home-manager": "home-manager",
"jovian-nixos": "jovian-nixos",
"mail": "mail",
"nix-minecraft": "nix-minecraft",
"nixos-mailserver": "nixos-mailserver",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur"
}

View file

@ -10,6 +10,7 @@
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS";
# NixOS utils
hardware.url = "github:nixos/nixos-hardware/master";
@ -27,6 +28,8 @@
nur,
nixos-mailserver,
blender-bin,
nix-minecraft,
jovian-nixos,
home-manager,
...
} @inputs: let

View file

@ -1,11 +1,9 @@
{pkgs, ...}: {
{pkgs, outputs, ...}: {
# Enable git and config
programs.git = let
secrets = import ../../nixos/modules/secrets.nix;
in {
programs.git = {
enable = true;
lfs.enable = true;
userName = secrets.jimUsername;
userEmail = secrets.jimEmail;
userName = outputs.secrets.jimUsername;
userEmail = outputs.secrets.jimEmail;
};
}