sync

home-manager/global/beets.nix

@@ -1,7 +1,19 @@
 { config, pkgs, lib, ... }:
+with lib;
 
-{
-      xdg.configFile."beets/config.old".source = config.lib.file.mkOutOfStoreSymlink config.sops.secrets.test.path;
+let cfg = config.custom.beets;
+in {
+  options.custom.beets = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable Beets";
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+      # xdg.configFile."beets/config.old".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
 
       programs.beets = {
       enable = true;
@@ -149,5 +161,6 @@
       };
 
     };
+};
 }
 

home-manager/global/default.nix

@@ -1,8 +1,36 @@
 { inputs, lib, pkgs, config, outputs, ... }:
 {
+
   imports = [
+    ./beets.nix
   ] ++ (builtins.attrValues outputs.homeManagerModules);
 
+###dotfiles path variable
+ options._dotfiles = lib.mkOption {
+    type = lib.types.str;
+    default = "${inputs.self}/home-manager/dotfiles";
+    description = "Path to the dotfiles in this repository";
+  };
+
+###secrets path variable
+ options._secrets = lib.mkOption {
+    type = lib.types.str;
+    default = "/run/user/1000/secrets/";
+    description = "Path to the Secrets runtime";
+  };
+
+
+###secretstore path variable
+ options._secretstore = lib.mkOption {
+    type = lib.types.str;
+    default = "${inputs.self}/secrets/";
+    description = "Path to the Secrets storage";
+  };
+
+config = {
+
+
+
   nixpkgs = {
     overlays = builtins.attrValues outputs.overlays;
     config = {
@@ -19,8 +47,12 @@
     };
   };
 
+ 
+
+
   programs = {
     home-manager.enable = true;
     git.enable = true;
   };
+};  
 }

home-manager/users/sstent/default.nix

@@ -4,8 +4,6 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
     ../../global
-    ../../beets.nix
-
   ];
       home.username = "sstent";
       home.homeDirectory = "/home/sstent";
@@ -14,17 +12,18 @@
   sops = {
     age.sshKeyPaths = [ "/home/sstent/.ssh/id_ed25519" ];
     defaultSopsFile = ./secrets.yaml;
-    secrets.test = {
-      # sopsFile = ./secrets.yml.enc; # optionally define per-secret files
+    # secrets.test = {
+    #   # sopsFile = ./secrets.yml.enc; # optionally define per-secret files
 
-      # %r gets replaced with a runtime directory, use %% to specify a '%'
-      # sign. Runtime dir is $XDG_RUNTIME_DIR on linux and $(getconf
-      # DARWIN_USER_TEMP_DIR) on darwin.
-        # path = "${config.xdg.configHome}/.ssh/test";
-    };
+    #   # %r gets replaced with a runtime directory, use %% to specify a '%'
+    #   # sign. Runtime dir is $XDG_RUNTIME_DIR on linux and $(getconf
+    #   # DARWIN_USER_TEMP_DIR) on darwin.
+    #   # path = "%r/test.txt"; 
+    # };
   };
 
-      # xdg.configFile."beets/config.old".source = config.sops.secrets.test.path;
+      # home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
+
 
 
       # Let Home Manager install and manage itself.
@@ -34,7 +33,7 @@
         # azure-cli
         ansible
         # sshpass
-        (import ./packages/python-packages.nix { pkgs = pkgs; })
+        (import ./python-packages.nix { pkgs = pkgs; })
         pyinfra
         sshpass
         nmap
@@ -55,11 +54,15 @@
         # deploy-rs
       ];
       
-      services.ssh-proxy.enable = true;
+      custom = {
+ssh-proxy.enable = true;
+beets.enable = true;
+
+      };
       services.keybase.enable = true;
       services.kbfs.enable = true;
 
-home.file.".mrconfig".source = configs/mrconfig;
+home.file.".mrconfig".source = "${config._dotfiles}/mrconfig";
 # xdg.configFile."beets/config.yaml".source = ./beets_config.yaml;
 programs = {
     dircolors.enable = true;

home-manager/users/sstent/secrets.yaml

@@ -1,66 +0,0 @@
-test: ENC[AES256_GCM,data:MXrxw3LMjCGBi0FL2+dkD0X9Zy5rg+YwUJ5awXtHyU2THPT9FCq91GXE46w3Kw==,iv:TPdKm1OA3wkDpAsluNLkV4+UxcWJccrM4RxEwgZYdeY=,tag:6ZGgi7yj08ahYVDEDSTRdg==,type:str]
-example_key: ENC[AES256_GCM,data:fdvxCEw8a7dIN7DEBQ==,iv:y48ctWttnKAmk17hv8LYghj/ls3Z6Pmf9uYM2Fa4k7U=,tag:GWQk49rU3w4KN+vXfsolTw==,type:str]
-#ENC[AES256_GCM,data:lZfFV3V634IPjn1Hl4XbbQ==,iv:jsU7QrW4hpYDimllcHUsJI8as8eqvUUf9It5YB2qyR0=,tag:lGgki5ETk88DcWDoYCGLlw==,type:comment]
-example_array:
-    - ENC[AES256_GCM,data:Uygqu3jmGb24gUd62fM=,iv:rxu8qWHlniR5QPwMISGTrX3f2fJvnpW0ot6JVdLmwbc=,tag:IFLRHU2nbceQMHL8BH+SGA==,type:str]
-    - ENC[AES256_GCM,data:QrYVdSUufPqh1Z4PdK4=,iv:Aa4g8erpPmYI480nPFHAZqm0To+kReHlYXX3ksBmtFg=,tag:BakZ4i0cfvCgee7uE/CijQ==,type:str]
-example_number: ENC[AES256_GCM,data:dgBeAvtODesgKQ==,iv:r42I6isKq+1sAMUy9aHlSyEaCd6YgRNjxjUOv2PWgCg=,tag:tu9MvwnlI2PYHZAXoP1qBQ==,type:float]
-example_booleans:
-    - ENC[AES256_GCM,data:A+CplA==,iv:+IurcetC1JzfbhTDdVZX4x3cqSQ+Pf14h4yyJNnb/+E=,tag:UKPcp6Ox52AcXheSGbfvKw==,type:bool]
-    - ENC[AES256_GCM,data:1VT8RWc=,iv:QWfC9a2W4XR6fQVWTmyv+blEgVswXQY4vRPLyL+ZCUg=,tag:sfF2WoBuDx2NhTPY/8wTIQ==,type:bool]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1jvqe2j70h97844nkz34z9k4epx3uahx50cx75ss8mty2dnxlrf7qqv9a0g
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3Rm41Q3UyUllMU3dMbk0y
-            Mi9Ndk1jRkNkNjVkUDdvYlVjTUh6R2dOTUFNClNHbzZZY05NVlhWZUNGK28wRG9T
-            dk5kUS90TXJmY0ROQk03VWhVTVpxQ28KLS0tIHV4NVpadW41eU1yRkF1eXVscHlp
-            czVmRmFtVUd6VDFHQkZJL3NTZUZFWFkKEuFAX+Ggwy8rpJBVeV1mLUXGw1gG9xor
-            a0qkRQ3VNiGtbmGD+Pra6tFKxEfs0q04qOa7sBuyNqwkmK2VJmlf2g==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1jvf8rd8krchw3ph0w2let8clvyuzcdhq2ug6sm7tx86refc2z5vq4w6lxr
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3VGwwR1BBTlBPZkloS09N
-            dUFnc0Jaa08wS1N5V3JQd3pMSDk2cUp2WkVZCjIxcDIvRjNjVXJUY2l6dTl3amNL
-            UVFlVUtmcUtTN0hHakNxT04xeXZHMU0KLS0tIG9tQ0JhdThJRnFVZGVWbVJoUGR3
-            ZHRZeGVET09hV3NiWjFJamxOdklCSE0K2ceTz1Y7QS6eqbEpI9Z7nF5wsv/33+fX
-            eUYpAhdJVEe7ClSADJyQ/sZUwOdd2w2+YcpDBlRUD/z562BcxZtNww==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1e0g0rrfdmp5f8f4xgkyp8zgxw2v5t3ldlm2t822xekdz0z6qj49q6aesuw
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYcENQM3RkSU5WVGtVeldW
-            VG42aFphRjJjRXZKN0tXZ3RHV1lrY3JMNWljCm9pUlZ0U2pGNUh1RVA4NktBVFhX
-            TFJsWUhHZ0dXTzNibFgyYnRWaEx1b2sKLS0tIG80QlRoOFliWFcxYWtrZnVkZU15
-            bHhPYkJQVzkxbmJ0dDVoaUVXK1I0akEKG5IaeRGUaxe9SUPl6JMVRrIu5zj4Uztx
-            c1rajIUsqdElRFZQaGIimXRYv63MJQrQnmDl6Q1VmoozDZTLbHW87g==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age187fdx6pc2559tjh03jrcwp6yj8whd70h666g8a0ptyr0z49tfcsssdx6au
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSSHRKa2gzc0I4bENiakZR
-            RVVjVHc5bTI2UXBuZHNneXE3TkdMWHNWZEFBCjVPQm91V0Mzd2RTV3RSMnlkVXE0
-            WFA1VzNEdkJUUi9SMldxaVNyQ0tIVHMKLS0tIGZwbHRIdW43WkZ1VGZXTkhjMVJH
-            YXhVRlpXVC8zVHFVMUprdm1maFZXSDgK8wsMa8MX2cXcmLMLqsm1jg5VWQ9cMJgp
-            24uz6/KiXj2bKaKWilG1A+2bwEzaYr2/Nr/Oy5FOsNOQ4f070dDuyw==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1r86w07gy3nm2ltkqx7wcv94wzneeqmqvcm88nzw4g902kdgwgvdqvjumrj
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqRnlTbjRxTUxDSjQ5T0Rk
-            K0JDeFNMaGJSL3V0RjdlZitKazFpTDFaUEg0Ckp5bVg3allyQmlJb3dReW42VXZ0
-            QzdDcFRRbW8yU21RQ3hYZGc3Mlk5M3MKLS0tIDNPR0o1ZXFEdkpTVjJ4cjZ4VWhl
-            YmJrOWxXZEtnZkVoRVh6WUlWcStrS1kK7pr+7ymzpr8hiKULpeojmzpadSCufiFQ
-            It7c2aVHslB8406U3oJ6k6wgMxIkcqIAaVfPklNir9rGAphSlCkVrg==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-02-25T14:11:19Z"
-    mac: ENC[AES256_GCM,data:ZQ6xfGZCkp/C+QVDQt9q6L6UNBxcVPhOhnUUVFmmMvH9qrt3vekhg3AIg5FmcNhOKEbZ9r+N0F+24EBZT4a0txnHUJQAHK1XC7iuKB44UpR1obrOKON8XN+Zl/tXvQkTjzo52MwiV/S8tOtmjiG+NTOUESbtQSBFIYSx2uAMQGk=,iv:5U3BIuom17XmbbsZ+mehzkRz88YM9KBctPm3WonePfY=,tag:22YMbAO22M5m8bimjsQOng==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.7.3