Compare commits

..

No commits in common. "3552314e69eca65737c86c20d185202799811aea" and "fd03c87c18c646a8b7f3ece8ddef890973abed02" have entirely different histories.

5 changed files with 4 additions and 27 deletions

2
.gitattributes vendored
View File

@ -1 +1 @@
home-manager/secrets/* filter=git-crypt diff=git-crypt
home-manager/secrets/weather-api-key filter=git-crypt diff=git-crypt

View File

@ -1,10 +1,7 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
git-crypt
libsecret
];
home.packages = with pkgs; [ git-crypt ];
programs.git = {
enable = true;
@ -25,7 +22,6 @@
extraConfig = {
push.autoSetupRemote = true;
safe.directory = "/etc/nixos";
credential.helper = "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret";
};
};
}

View File

@ -1,13 +1,7 @@
{
pkgs,
inputs,
lib,
...
}:
{ pkgs, inputs, ... }:
let
common = import ../../../common.nix;
theme = import ../../../theme.nix;
loader = import ../../secretsLoader.nix lib;
in
{
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
@ -80,8 +74,7 @@ in
};
weather = {
unit = "metric";
location = "Bergen, Norway";
key = loader.loadSecret ../../secrets/weather-api-key;
location = "Bergen, Norway"; # TODO not working
};
};

View File

@ -1,6 +0,0 @@
lib:
{
loadSecret =
filePath: lib.strings.trim (lib.strings.removeSuffix "\n" (builtins.readFile filePath));
}

View File

@ -22,9 +22,3 @@ update:
nix flake update
just switch
lock:
git-crypt lock
unlock:
git-crypt unlock ~/.config/git/crypt-key