sync

2026-01-25 14:41:44 +00:00 · 2023-02-25 14:11:26 +00:00
parent 4f76414d98
commit f97dffa027
24 changed files with 158 additions and 524 deletions
--- a/home-manager/beets.nix
+++ b/home-manager/beets.nix
@@ -0,0 +1,151 @@
+{ config, pkgs, lib, ... }:
+
+{
+      programs.beets = {
+      enable = true;
+      settings = {
+        album_fields = {
+          artist_grouping = ''
+            albumartist_dev = ["devin townsend", "devin townsend project","punky brüster","strapping young lad"]
+            DevinFolder = "_Devin Townsend Projects"
+            if albumartist.lower() in albumartist_dev:
+                    return DevinFolder
+            albumartist_les = ["primus", "les claypool","les claypool and the holy mackerel","les claypool’s duo de twang","oysterhead","colonel claypool’s bucket of bernie brains","the les claypool frog brigade","the claypool lennon delirium"]
+            LesFolder = "_Les Claypool Projects"
+            if albumartist.lower() in albumartist_les:
+                    return LesFolder
+          '';
+          atype = ''
+            atypes = ['EP', 'Single','Live']
+            for atype in atypes:
+                if atype.lower() == albumtype.lower():
+                    return f' [{atype}]'
+          '';
+          first_artist = "albumartist.split(', ',1)[0:1][0]";
+        };
+        albumtypes = {
+          bracket = "[]";
+          ignore_va = "compilation";
+          types = [
+            { ep = "EP"; }
+            { single = "Single"; }
+            { soundtrack = "OST"; }
+            { live = "Live"; }
+            { compilation = "Anthology"; }
+            { remix = "Remix"; }
+          ];
+        };
+        aunique = {
+          bracket = "[]";
+          disambiguators = "media";
+          keys = "albumartist album";
+        };
+        copyartifacts = { extensions = ".cue .log .jpg .jpeg .png .txt"; };
+        directory = "/mnt/q/CleanMusic/";
+        embedart = { auto = true; };
+        extrafiles = {
+          paths = {
+            artworkdir = "$albumpath/Artwork";
+            "ext:cue" = "$albumpath/$disc_folder/Data/";
+            "ext:jpg" = "$albumpath/$disc_folder/";
+            "ext:log" = "$albumpath/$disc_folder/Data/";
+          };
+          patterns = {
+            all = "*.*";
+            artworkdir = [ "[sS]cans/" "[aA]rtwork/" "[aA]rt/" "[cC]over/" ];
+          };
+        };
+        fetchart = {
+          auto = true;
+          sources = "filesystem coverart itunes amazon albumart fanarttv";
+        };
+        import = {
+          autotag = true;
+          bell = false;
+          copy = true;
+          languages = "en";
+          log = "~/.config/beets/beet.log";
+          move = false;
+          write = true;
+        };
+        item_fields = {
+          isMultidisc = "1 if disctotal > 1 else 0";
+          myBitDepth = "('' if bitdepth != 24 else '[24bit - '+ media + ']')";
+          myDisc = "('' if disctotal <= 1 else str(disc) + ' - ')";
+          mySongartist =
+            "artist + ' - ' if artist != albumartist and artist != '' else ''";
+        };
+        library = "~/musiclibrary.db";
+        match = {
+          max_rec = {
+            album = "strong";
+            album_id = "strong";
+            albumdisambig = "strong";
+            artist = "strong";
+            catalognum = "strong";
+            country = "strong";
+            label = "strong";
+            media = "strong";
+            mediums = "strong";
+            missing_tracks = "medium";
+            source = "strong";
+            track_artist = "strong";
+            track_id = "strong";
+            track_index = "strong";
+            track_length = "strong";
+            track_title = "strong";
+            tracks = "strong";
+            unmatched_tracks = "medium";
+            year = "strong";
+          };
+          strong_rec_thresh = 5.0e-2;
+        };
+        missing = {
+          format_album = "$albumartist: ($year) $album $albumtype $atype";
+          format_item =
+            "$albumartist - $album [$albumtype]$atype: $track/$tracktotal $title";
+        };
+        musicbrainz = {
+          pass = "7ANCLPczDNFn6Sf65vdZ";
+          user = "shapechecker";
+        };
+        original_date = true;
+        paths = {
+          "albumtype:soundtrack" =
+            "Soundtracks/$albumartist - $album%aunique{} ($year)/$myDisc$track - $artist - $title";
+          comp =
+            "Compilations/$albumartist/($year) $album%aunique{}/$myDisc$track - $artist - $title";
+          default =
+            "%if{$artist_grouping,$artist_grouping/}$first_artist/$year - $album $atype%aunique{media}[%upper{$format}$bitdepth]%if{$media,[$media]}/%if{$isMultidisc,$disc - }$track - $mySongartist$title";
+        };
+        per_disc_numbering = true;
+        plugins = [
+          "albumtypes"
+          "duplicates"
+          "fetchart"
+          "rewrite"
+          "missing"
+          "chroma"
+          "embedart"
+          "inline"
+          "discogs"
+          "mbcollection"
+        ];
+        rewrite = {
+          "artist Björk & Tríó Guðmundar Ingólfssonar" = "Björk";
+          "artist Brant Bjork and The Low Desert Punk Band" = "Brant Bjork";
+          "artist King Gizzard & The Lizard Wizard with Mild High Club" =
+            "King Gizzard & The Lizard Wizard";
+          "artist Kyuss _ Queens of the Stone Age" = "Kyuss";
+          "artist Professor Elemental & Tom Caruana" = "Professor Elemental";
+          "artist Resin Dogs Feat Spikey Tee" = "Resin Dogs";
+          "artist Sepultura _ Exodus" = "Sepultura";
+          "artist The Knife in collaboration with Mount Sims and Planningtorock" =
+            "The Knife";
+          "artist Unida _ Dozer" = "Unida";
+        };
+      };
+
+    };
+}
+
--- a/home-manager/global/default.nix
+++ b/home-manager/global/default.nix
@@ -0,0 +1,26 @@
+{ inputs, lib, pkgs, config, outputs, ... }:
+{
+  imports = [
+  ] ++ (builtins.attrValues outputs.homeManagerModules);
+
+  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;
+    };
+  };
+
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+}
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,63 +0,0 @@
-# This is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-
-{ inputs, outputs, lib, config, pkgs, ... }: {
-  # You can import other home-manager modules here
-  imports = [
-    # If you want to use modules your own flake exports (from modules/home-manager):
-    # outputs.homeManagerModules.example
-
-    # Or modules exported from other flakes (such as nix-colors):
-    # inputs.nix-colors.homeManagerModules.default
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./nvim.nix
-  ];
-
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # Add overlays your own flake exports (from overlays and pkgs dir):
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-
-      # You can also add overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
-    ];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = (_: true);
-    };
-  };
-
-  # TODO: Set your username
-  home = {
-    username = "your-username";
-    homeDirectory = "/home/your-username";
-  };
-
-  # Add stuff for your user as you see fit:
-  # programs.neovim.enable = true;
-  # home.packages = with pkgs; [ steam ];
-
-  # Enable home-manager and git
-  programs.home-manager.enable = true;
-  programs.git.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "22.11";
-}
--- a/home-manager/users/sstent/default.nix
+++ b/home-manager/users/sstent/default.nix
@@ -3,13 +3,28 @@

 { inputs, outputs, lib, config, pkgs, ... }: {
  imports = [
-    ./global
+    ../../global
+    ../../beets.nix
  ];
-
      home.username = "sstent";
      home.homeDirectory = "/home/sstent";
      home.stateVersion = "23.05";

+  sops = {
+    age.sshKeyPaths = [ "/home/sstent/.ssh/" ];
+    defaultSopsFile = ./secrets.yaml;
+    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 = "%r/test.txt"; 
+    };
+  };
+
+
+
      # Let Home Manager install and manage itself.
      programs.home-manager.enable = true;
      home.packages = with pkgs; [
@@ -74,23 +89,6 @@ programs = {
        export PATH=$PATH:/bin #Fix for wslpath
      '';
    };
-#   zsh = {
-#   enable = true;
-#   shellAliases = {
-#     ll = "ls -l";
-#     update = "sudo nixos-rebuild switch";
-#   };
-#   # history = {
-#   #   size = 10000;
-#   #   path = "${config.xdg.dataHome}/zsh/history";
-#   # };
-# oh-my-zsh = {
-#     enable = true;
-#     plugins = [ "git" "thefuck" ];
-#     theme = "robbyrussell";
-#   };
-# };
-  
  
  git = {
    enable = true;
@@ -107,47 +105,8 @@ programs = {
 };
 };

-#    systemd.user = {
-
-#   startServices = true;
-
-#   services.ssh-proxy = {
-#     Unit = { Description = "WSL Proxy"; };
-#     Service = {
-#       ExecStart = "${pkgs.writeShellScript "start-proxy" ''
-#         set -x
-#         ${pkgs.coreutils}/bin/rm -f /home/sstent/.ssh/wsl-ssh-agent.sock
-#         ${pkgs.util-linux}/bin/setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/home/sstent/.ssh/wsl-ssh-agent.sock,fork EXEC:"${pkgs.npiperelay}/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork
-#       ''}";
-#     };
-#     #Install = { WantedBy = [ "default.target" ]; };
-#   };
-#  };
 }

-            # homeage = {
-            #     # Absolute path to identity (created not through home-manager)
-            #     identityPaths = [ "~/.ssh/id_ed25519" ];
-
-            #     # "activation" if system doesn't support systemd
-            #     installationType = "systemd";
-
-            #     file."pijulsecretkey" = {
-            #       # Path to encrypted file tracked by the git repository
-            #       source = ./secretkey.json.age;
-            #       symlinks = [ "${config.xdg.configHome}/pijul/secretkey.json" ];
-            #       copies = [ "${config.xdg.configHome}/no-symlink-support/secretkey.json" ];
-            #     };
-            # };
-
-            # imports = [ homeage.homeManagerModules.homeage ];
-
-
-
-
-#  }; ### endf home-manager
-
-
  #######If Gnome
  # config = lib.mkIf config.mymods.gnome.enable {
  #   programs.bash.enable = true;
--- a/home-manager/users/sstent/secrets.yaml
+++ b/home-manager/users/sstent/secrets.yaml
@@ -0,0 +1,66 @@
+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