diff --git a/flake.nix b/flake.nix index 04de58f..1508ab2 100644 --- a/flake.nix +++ b/flake.nix @@ -165,6 +165,17 @@ sops.defaultSopsFile = ./secrets/default.yaml; #sops.defaultSopsFile = lib.mkIf (builtins.pathExists ./secrets/${hostname}.yaml) ./secrets/${hostname}.yaml; + #sops.secrets = let # TODO: importYAML does not exist + # file = ./secrets/${hostname}.yaml; + # exists = builtins.pathExists file; + # yaml = lib.removeAttrs (lib.importYAML file) ["sops"]; + # secrets = lib.attrNames yaml; + #in + # if !exists then {} else lib.mkMerge (lib.forEach secrets (secret: + # lib.mkIf (config.sops.secrets ? secret) { + # "${secret}".sopsFile = file; + # } + # )); sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; @@ -364,6 +375,18 @@ pbsds-gnome-2305 = mkHome "pbsds" "/home/pbsds" inputs-2305 [ ./users/pbsds/home/gnome.nix ]; }); + # TODO: use this to pull changes to repo + homeFileMap = let + inherit (inputs-edge.nixpkgs) lib; + files = self.homeConfigurations.x86_64-linux.pbsds-gnome.config.home.file; + in lib.pipe files [ + (lib.filterAttrs (k: v: lib.hasPrefix (toString self) (toString v.source))) + (lib.mapAttrs' (k: v: lib.nameValuePair + (lib.removePrefix "/home/pbsds" k) + ("." + lib.removePrefix (toString self) (toString v.source)) + )) + ]; + devShells = forAllSystems ({ pkgs, system, ... }: let mkShell = packages: pkgs.mkShellNoCC { inherit packages; }; envrc-pkgs = [ diff --git a/profiles/xrdp/default.nix b/profiles/services/xrdp.nix similarity index 100% rename from profiles/xrdp/default.nix rename to profiles/services/xrdp.nix diff --git a/users/pbsds/home/profiles/micro.nix b/users/pbsds/home/profiles/micro.nix index 9beb4e9..2605e40 100644 --- a/users/pbsds/home/profiles/micro.nix +++ b/users/pbsds/home/profiles/micro.nix @@ -28,6 +28,7 @@ programs.micro.settings.colorscheme = "railscast"; programs.micro.settings.rmtrailingws = true; programs.micro.settings.tabstospaces = true; + programs.micro.settings.autoclose = false; #xdg.configFile."micro/bindings.json".source = (pkgs.formats.json {}).generate "micro-bindings" { programs.micro.bindings = { "Alt-/" = "lua:comment.comment";