ldsdfghjkl

This commit is contained in:
Peder Bergebakken Sundt 2024-10-11 12:28:49 +02:00
parent 971fb5aa89
commit b9615589b4
3 changed files with 24 additions and 0 deletions

View File

@ -165,6 +165,17 @@
sops.defaultSopsFile = ./secrets/default.yaml; sops.defaultSopsFile = ./secrets/default.yaml;
#sops.defaultSopsFile = lib.mkIf (builtins.pathExists ./secrets/${hostname}.yaml) ./secrets/${hostname}.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.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.keyFile = "/var/lib/sops-nix/key.txt";
sops.age.generateKey = true; sops.age.generateKey = true;
@ -364,6 +375,18 @@
pbsds-gnome-2305 = mkHome "pbsds" "/home/pbsds" inputs-2305 [ ./users/pbsds/home/gnome.nix ]; 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 devShells = forAllSystems ({ pkgs, system, ... }: let
mkShell = packages: pkgs.mkShellNoCC { inherit packages; }; mkShell = packages: pkgs.mkShellNoCC { inherit packages; };
envrc-pkgs = [ envrc-pkgs = [

View File

@ -28,6 +28,7 @@
programs.micro.settings.colorscheme = "railscast"; programs.micro.settings.colorscheme = "railscast";
programs.micro.settings.rmtrailingws = true; programs.micro.settings.rmtrailingws = true;
programs.micro.settings.tabstospaces = true; programs.micro.settings.tabstospaces = true;
programs.micro.settings.autoclose = false;
#xdg.configFile."micro/bindings.json".source = (pkgs.formats.json {}).generate "micro-bindings" { #xdg.configFile."micro/bindings.json".source = (pkgs.formats.json {}).generate "micro-bindings" {
programs.micro.bindings = { programs.micro.bindings = {
"Alt-/" = "lua:comment.comment"; "Alt-/" = "lua:comment.comment";