From 6f5169947afcee36658d92155314e4d093294b2f Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Tue, 4 Jun 2024 13:08:13 -0500
Subject: [PATCH] fully added laptop to nix-secrets.

---
 configs/home-manager/sops.nix | 22 ----------------------
 flake.lock                    |  6 +++---
 hosts/home-personal.nix       |  3 +--
 justfile                      |  6 +++---
 roles/home-manager/music.nix  |  5 ++---
 5 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 configs/home-manager/sops.nix

diff --git a/configs/home-manager/sops.nix b/configs/home-manager/sops.nix
deleted file mode 100644
index cfc9463..0000000
--- a/configs/home-manager/sops.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: let
-  secretsPath = builtins.toString inputs.nix-secrets;
-in {
-  imports = [
-    inputs.sops-nix.homeManagerModules.sops
-  ];
-
-  sops = {
-    defaultSopsFile = "${secretsPath}/secrets.yaml";
-    age = {
-      sshKeyPaths = ["${config.home.homeDirectory}/keys/age/master.txt"];
-      keyFile = "/var/lib/sops-nix/key.txt";
-      generateKey = true;
-    };
-  };
-}
diff --git a/flake.lock b/flake.lock
index 3567a07..7f30b4d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -240,10 +240,10 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1717515079,
-        "narHash": "sha256-R9oet/t4zJnLKYw5ZPq6WOaKNF+EMejlgr4+Y98FbzY=",
+        "lastModified": 1717523958,
+        "narHash": "sha256-fZzlvFG7fIGA4GIpMai8fdxeUU/bBxMacdDmDWN+Emk=",
         "ref": "refs/heads/main",
-        "rev": "a3bd4bad51a5b753f75dc8ff0c09140331320863",
+        "rev": "23bdde0f479cdd6039555aee0680878249185715",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@git.venberg.xyz:7920/Gabe/nix-secrets.git"
diff --git a/hosts/home-personal.nix b/hosts/home-personal.nix
index 9e27668..41be11d 100644
--- a/hosts/home-personal.nix
+++ b/hosts/home-personal.nix
@@ -37,8 +37,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
         ../configs/home-manager/common.nix
         ../configs/home-manager/syncthing.nix
         ../configs/home-manager/email.nix
-        ../../configs/home-manager/tiny-irc.nix
-        ../configs/home-manager/terminal/voice.nix
+        ../configs/home-manager/tiny-irc.nix
         ../configs/home-manager/secrets.nix
         inputs.sops-nix.homeManagerModules.sops
       ];
diff --git a/justfile b/justfile
index 428b53f..0714ed3 100644
--- a/justfile
+++ b/justfile
@@ -3,17 +3,17 @@ default:
 
 nixos target=`hostname`:
     git add -AN
-    nix flake lock --update-input nix-secrets
+    nix flake update nix-secrets
     sudo nixos-rebuild --flake .#{{target}} switch
 
 home-manager target=(`whoami`+"@"+`hostname`):
     git add -AN
-    nix flake lock --update-input nix-secrets
+    nix flake update nix-secrets
     home-manager --flake .#{{target}} switch
 
 check:
     git add -AN
-    nix flake lock --update-input nix-secrets
+    nix flake update nix-secrets
     nix flake check --keep-going
 
 bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
diff --git a/roles/home-manager/music.nix b/roles/home-manager/music.nix
index 69a4341..9ca9d3d 100644
--- a/roles/home-manager/music.nix
+++ b/roles/home-manager/music.nix
@@ -5,9 +5,8 @@
   ...
 }: {
   imports = [
-    ../../modules/home-manager/beets.nix
-    ../../modules/home-manager/mpd.nix
-    ../../modules/home-manager/beets.nix
+    ../../configs/home-manager/beets.nix
+    ../../configs/home-manager/mpd.nix
   ];
   home.packages = with pkgs; (lib.mkIf config.host.gui.enable [
     mpdevil