swaylock broke

home-manager/programs/default.nix

@@ -8,7 +8,7 @@
 	    ./terminal
         ./rofi
         ./pywal
-        ./swaylock
+        ./hyprlock
         ./calcurse
         ./firefox
     ];

home-manager/programs/hyprlock/default.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }: {
+
+    options.homeconfig.hyprlock.enable = lib.options.mkOption {
+        type = lib.types.bool;
+        default = false;
+    };
+
+    config = lib.mkIf config.homeconfig.hyprlock.enable {
+
+        programs.hyprlock = {
+            enable = true;
+        };
+    };
+}

home-manager/programs/swaylock/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.homeconfig.swaylock.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.swaylock.enable {
-
-        home.packages = with pkgs; [ swaylock-effects ];
-    };
-}

system-config/configuration/homebox/default.nix

@@ -134,7 +134,7 @@
                             homeconfig = {
                                 minimal = false;
                                 hyprland.enable = true;
-                                swaylock.enable = true;
+                                hyprlock.enable = true;
                                 wal.enable = true;
                                 mpd.enable = true;
                                 hyprpanel.enable = true;

system-config/configuration/laptop/default.nix

@@ -80,7 +80,7 @@
                             homeconfig = {
                                 minimal = false;
                                 hyprland.enable = true;
-                                swaylock.enable = true;
+                                hyprlock.enable = true;
                                 wal.enable = true;
                                 mpd.enable = true;
                                 hyprpanel.enable = true;

system-config/configuration/live/default.nix

@@ -1,16 +1,16 @@
-{ config, lib, pkgs, inputs, modulesPath, ... }: {
+{ config, pkgs, inputs, modulesPath, ... }: {
 
     imports = with inputs; [
         
         disko.nixosModules.default
 
-        (import ./disko.nix { device = "/dev/sda"; })
+        (import ./disko.nix { device = "/dev/mmcblk0"; })
 
         (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
         
-        #sops-nix.nixosModules.sops
+        sops-nix.nixosModules.sops
 
-        #home-manager.nixosModules.default
+        home-manager.nixosModules.default
 
     ];
 
@@ -19,63 +19,75 @@
         nixpkgs.hostPlatform = "x86_64-linux";
         
         boot = {
-            #kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
             loader = {
                 systemd-boot.enable = true;
                 efi.canTouchEfiVariables = true;
             };
         };
 
-
+        sysconfig = {
-        /*sysconfig.opts = {
+            remoteBuildClient = true;
-            sddm.enable = true;
+            host = "live";
-            openssh.enable = false;
+            graphical = true;
-            pipewire.enable = true;
-            hyprpanel.enable = true;
-            hyprland.enable = true;
-            git.enable = true;
-            nh.enable = true;
-        };*/
-
-        users.users."nathan" = {
-            isNormalUser = true;
-            initialPassword = "7567";
-            extraGroups = [ "wheel" ];
-        };
-
-        /*home-manager = {
-            backupFileExtension = "backup";
-            extraSpecialArgs = { inherit inputs; };
             users = {
-                "nathan" = lib.mkMerge [
+                nathan = {
-                    inputs.nathan-home-manager
+                    extraGroups = [ "wheel" "networkmanager" ];
-                    {
+                    hashedPasswordFile = config.sops.secrets."nathan/pass".path;
-                        config.homeconfig = {
+                    shell = pkgs.zsh;
-                            hyprland.enable = true;
+                    home-manager = {
-                            swaylock.enable = true;
+                        enable = true;
-                            wal.enable = true;
+                        standalone = false;
-                            mpd.enable = true;
+                        extraModules = [
-                            hyprpanel.enable = true;
+                        {
-                            calcurse.enable = true;
+                            homeconfig = {
-                            rofi.enable = true;
+                                minimal = false;
-                            firefox.enable = true;
+                                hyprland.enable = true;
-                        };
+                                hyprlock.enable = true;
-                    }
+                                wal.enable = true;
-                ];
+                                mpd.enable = true;
+                                hyprpanel.enable = true;
+                                calcurse.enable = true;
+                                rofi.enable = true;
+                                firefox.enable = true;
+                                git.enable = true;
+                                nh.enable = true;
+                            };
+                        } 
+                        ];
+                    };
+                };
             };
-        };*/
 
-        system.stateVersion = "24.11";
+            services = {
+                sddm.enable = true;
+                #openssh.enable = false;
+                pipewire.enable = true;
+                #kdePlasma6.enable = true;
+                netbird.enable = true;
+                #ollama.enable = true;
+            };
 
-        nix = {
+            programs = {
-            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+                #steam.enable = true;
-            settings = {
+                hyprpanel.enable = true;
-                experimental-features = [ "nix-command" "flakes" ];
+                hyprland.enable = true;
+            };
+
+
+            virtualization = {
+
+                wyoming = {
+                    enable = false;
+                };
+
+                homeassistant = {
+                    enable = false;
+                };
             };
         };
 
-        networking.hostName = "live";
+        system.stateVersion = "25.05";
 
-        fonts.packages = with pkgs; [ fira-code-nerdfont ];
+        fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
     };
 }

system-config/configuration/live/disko.nix

@@ -1,45 +1,66 @@
 {
-  device ? throw "Set this to your disk device, e.g. /dev/sda",
+  device1 ? throw "Set this to your disk device, e.g. /dev/sda",
   ...
 }: {
   disko.devices = {
-    disk = {
+      disk = {
-      main = {
+          main = {
-      inherit device;
+              device = device1;
-      type = "disk";
+              type = "disk";
-      content = {
+              content = {
-        type = "gpt";
+                  type = "gpt";
-        partitions = {
+                  partitions = {
-          boot = {
+                      boot = {
-            name = "boot";
+                          name = "boot";
-            size = "1M";
+                          size = "1M";
-            type = "EF02";
+                          type = "EF02";
-            priority = 1;
+                      };
+                      esp = {
+                          name = "ESP";
+                          size = "500M";
+                          type = "EF00";
+                          content = {
+                              type = "filesystem";
+                              format = "vfat";
+                              mountpoint = "/boot";
+                          };
+                      };
+                      root = {
+                          name = "root";
+                          size = "100%";
+                          content = {
+                              type = "lvm_pv";
+                              vg = "root_vg";
+                          };
+                      };
+                  };
+              };
           };
-          esp = {
-            name = "ESP";
-            size = "500M";
-            type = "EF00";
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-              mountOptions = [ "unmask=0077" ];
-            };
-          };
-          root = {
-            name = "root";
-            size = "100%";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-            };
-          };
-        };
       };
-    };
+      lvm_vg = {
-  };
+          root_vg = {
+              type = "lvm_vg";
+              lvs = {
+                  root = {
+                      size = "100%FREE";
+                      content = {
+                          type = "btrfs";
+                          extraArgs = ["-f"];
 
+                          subvolumes = {
+                              "/root" = {
+                                  mountpoint = "/";
+                              };
+
+                              "/nix" = {
+                                  mountOptions = ["subvol=nix" "noatime"];
+                                  mountpoint = "/nix";
+                              };
+                          };
+                      };
+                  };
+              };
+          };
+      };    
   };
 }

system-config/configuration/sandbox-nathan/default.nix

@@ -125,7 +125,7 @@
                             hyprland.enable = false;
                             wal.enable = false;
                             hyprpanel.enable = false;
-                            swaylock.enable = true;
+                            hyprlock.enable = false;
                             mpd.enable = true;
                             calcurse.enable = true;
                             rofi.enable = true;