From 478d31081a9cb4a8e67c7c92cec78c1fd24e92cd Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Mon, 23 Jun 2025 21:25:54 -0500
Subject: [PATCH] Fix file permissions, residual submodule stuff

---
 apply.sh         |  0
 build_iso.sh     |  0
 clear_secrets.sh |  0
 flake.lock       | 86 ++++--------------------------------------------
 flake.nix        |  2 --
 pop_secrets.sh   |  0
 push_secrets.sh  |  0
 7 files changed, 7 insertions(+), 81 deletions(-)
 mode change 100644 => 100755 apply.sh
 mode change 100644 => 100755 build_iso.sh
 mode change 100644 => 100755 clear_secrets.sh
 mode change 100644 => 100755 pop_secrets.sh
 mode change 100644 => 100755 push_secrets.sh

diff --git a/apply.sh b/apply.sh
old mode 100644
new mode 100755
diff --git a/build_iso.sh b/build_iso.sh
old mode 100644
new mode 100755
diff --git a/clear_secrets.sh b/clear_secrets.sh
old mode 100644
new mode 100755
diff --git a/flake.lock b/flake.lock
index 24e1177..a25f4f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -75,28 +75,6 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "mlaga97-home-manager",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
@@ -132,23 +110,6 @@
         "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
       }
     },
-    "mlaga97-home-manager": {
-      "inputs": {
-        "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-pYpD+mKj2FS//91FsFc7YfemYBNLrFwXev9v3Q4JUEo=",
-        "path": "/nix/store/xmvprspr9148wdrh4s2gf5bg3r1sqny9-source/modules/mlaga97-home-manager",
-        "type": "path"
-      },
-      "original": {
-        "path": "/nix/store/xmvprspr9148wdrh4s2gf5bg3r1sqny9-source/modules/mlaga97-home-manager",
-        "type": "path"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1711241261,
@@ -188,37 +149,21 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741332913,
-        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
+        "lastModified": 1749494155,
+        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
+        "rev": "88331c17ba434359491e8d5889cce872464052c2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1741379970,
-        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable_2": {
       "locked": {
         "lastModified": 1741246872,
         "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
@@ -235,22 +180,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1749494155,
-        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "88331c17ba434359491e8d5889cce872464052c2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 0,
         "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
@@ -267,10 +196,9 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
-        "mlaga97-home-manager": "mlaga97-home-manager",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable_2",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "waveforms": "waveforms"
       }
     },
@@ -291,7 +219,7 @@
     },
     "waveforms": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1748247366,
diff --git a/flake.nix b/flake.nix
index 28e19d8..f027dc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,8 +37,6 @@
     home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    mlaga97-home-manager.url = "./modules/mlaga97-home-manager/";
-
     # Extras
     waveforms.url = "github:liff/waveforms-flake";
   };
diff --git a/pop_secrets.sh b/pop_secrets.sh
old mode 100644
new mode 100755
diff --git a/push_secrets.sh b/push_secrets.sh
old mode 100644
new mode 100755