diff --git a/home-manager/global.nix b/home-manager/global.nix deleted file mode 100644 index da18fc7..0000000 --- a/home-manager/global.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - inputs, - lib, - pkgs, - config, - outputs, - ... -}: { - imports = - [ - # ./beets.nix - # ./keybase.nix - "${inputs.vscode-server}/modules/vscode-server/home.nix" - outputs.homeManagerModules - ]; - # ++ (builtins.attrValues outputs.homeManagerModules); - - - # config = { - # nixpkgs = { - # overlays = builtins.attrValues outputs.overlays; - # config = { - # allowUnfree = true; - # allowUnfreePredicate = _: true; - # }; - # }; - - # nix = { - # package = lib.mkDefault pkgs.nix; - # settings = { - # experimental-features = ["nix-command" "flakes" "repl-flake"]; - # warn-dirty = false; - # }; - # }; - - # ##VSCode - services.vscode-server.enable = true; - services.vscode-server.enableFHS = true; - services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; - - programs = { - home-manager.enable = true; - git.enable = true; - }; - }; -} diff --git a/home-manager/lib/hm_secrets.nix b/home-manager/lib/hm_secrets.nix deleted file mode 100644 index c8b8a66..0000000 --- a/home-manager/lib/hm_secrets.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, ...}: let - inherit - (builtins) - readDir - ; - - inherit - (lib) - filterAttrs - hasPrefix - hasSuffix - mapAttrs' - nameValuePair - ; -in rec { - filter = name: func: attrs: filterAttrs name (mapAttrs' func attrs); - - # 'sops' Encrypted Secrets - hm_secrets = dir: out_dir: - filter (name: type: type != null && !(hasPrefix "_" name)) (name: type: - # if type == "regular" && hasSuffix ".age" name - if type == "regular" - then - nameValuePair name { - sopsFile = dir + "/${name}"; - format = "binary"; - path = out_dir + "/${name}"; - } - else nameValuePair "" null) (readDir dir); -} diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 6230c50..6fdc779 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -11,6 +11,7 @@ # # ../../global.nix # # outputs.homeManagerModules ./beets.nix + ./kaybase.nix ]; home.username = "sstent"; diff --git a/home-manager/users/sstent/keybase.nix b/home-manager/users/sstent/keybase.nix new file mode 100644 index 0000000..302b00e --- /dev/null +++ b/home-manager/users/sstent/keybase.nix @@ -0,0 +1,18 @@ + { + inputs, + lib, + pkgs, + config, + outputs, + ... +}: { + + services.keybase.enable = true; + services.kbfs.enable = true; + systemd.user.services.keybase.Unit.After = ["sops-nix.service"]; + systemd.user.services.kbfs.Unit.After = ["sops-nix.service"]; + +# sops = { +# secrets = hm_secrets "${secretstore}/user_dotfiles/${username}@${hostName}/keybase/" "${config.xdg.configHome}/keybase/"; +# }; +} \ No newline at end of file