Compare commits
3 Commits
9abb5ea152
...
6726127aed
Author | SHA1 | Date | |
---|---|---|---|
6726127aed
|
|||
3571635616
|
|||
c2afc4d5ac
|
36
flake.lock
generated
36
flake.lock
generated
@@ -1,5 +1,39 @@
|
||||
{
|
||||
"nodes": {
|
||||
"dotfiles": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743949278,
|
||||
"narHash": "sha256-ntNJXtq3Gw+7ssEgLzoKAiuSS6QXaCwK6k/KSLlqBwo=",
|
||||
"ref": "main",
|
||||
"rev": "6e1d7df5b569f2eb98759e1ca77a06556c5bd1dd",
|
||||
"revCount": 10,
|
||||
"type": "git",
|
||||
"url": "https://git.finally.coffee/transcaffeine/dotfiles.git"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.finally.coffee/transcaffeine/dotfiles.git"
|
||||
}
|
||||
},
|
||||
"dotfiles-local": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743949278,
|
||||
"narHash": "sha256-ntNJXtq3Gw+7ssEgLzoKAiuSS6QXaCwK6k/KSLlqBwo=",
|
||||
"ref": "main",
|
||||
"rev": "6e1d7df5b569f2eb98759e1ca77a06556c5bd1dd",
|
||||
"revCount": 10,
|
||||
"type": "git",
|
||||
"url": "https://git.finally.coffee/transcaffeine/dotfiles"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.finally.coffee/transcaffeine/dotfiles"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -101,6 +135,8 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"dotfiles": "dotfiles",
|
||||
"dotfiles-local": "dotfiles-local",
|
||||
"home-manager": "home-manager",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
|
@@ -11,6 +11,14 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
dotfiles = {
|
||||
url = "git+https://git.finally.coffee/transcaffeine/dotfiles.git?ref=main";
|
||||
flake = false;
|
||||
};
|
||||
dotfiles-local = {
|
||||
url = "git+file:/home/transcaffeine/git/transcaffeine/dotfiles";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: {
|
||||
|
@@ -2,4 +2,5 @@
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
}
|
||||
|
@@ -1,11 +1,7 @@
|
||||
{ lib, config, ... }:
|
||||
{ inputs, lib, config, ... }:
|
||||
|
||||
let
|
||||
repo = (builtins.fetchGit {
|
||||
url = "https://git.finally.coffee/transcaffeine/dotfiles.git";
|
||||
ref = "main";
|
||||
shallow = true;
|
||||
});
|
||||
dotfileRepo = inputs.dotfiles;
|
||||
utils = import ../../../utils { inherit lib; };
|
||||
in {
|
||||
programs.gpg = let
|
||||
@@ -16,7 +12,7 @@ in {
|
||||
}) (
|
||||
builtins.filter (value: value != "") (
|
||||
lib.splitString "\n" (
|
||||
lib.readFile (repo.outPath + "/config/gnupg/gpg.conf")
|
||||
lib.readFile (dotfileRepo + "/config/gnupg/gpg.conf")
|
||||
)
|
||||
)
|
||||
)
|
||||
@@ -36,7 +32,7 @@ in {
|
||||
}) (
|
||||
builtins.filter (v: v != "") (
|
||||
lib.splitString "\n" (
|
||||
lib.readFile (repo.outPath + "/config/gnupg/gpg-agent.conf")
|
||||
lib.readFile (dotfileRepo.outPath + "/config/gnupg/gpg-agent.conf")
|
||||
)
|
||||
)
|
||||
)
|
||||
|
Reference in New Issue
Block a user