Refactor; add wine, polkit, and failed attempt at swapfile hibernation

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "users/lauren_lagarde/home-manager"]
+[submodule "modules/mlaga97-home-manager"]
-	path = users/lauren_lagarde/home-manager
+	path = modules/mlaga97-home-manager
-	url = https://git.mlaga97.space/mlaga97/home-manager.git
+	url = https://git.mlaga97.space/mlaga97/home-manager

features/gpu/intel.nix

@@ -1,4 +1,6 @@
 { pkgs, ... }: {
+  hardware.graphics.enable32Bit = true;
+
   nixpkgs.config.packageOverrides = pkgs: {
     intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
   };

features/i3wm.nix

@@ -15,4 +15,18 @@
   };
 
   services.displayManager.defaultSession = "none+i3";
+
+  systemd.user.services.polkit-gnome-authentication-agent-1 = {
+    description = "polkit-gnome-authentication-agent-1";
+    wantedBy = [ "graphical-session.target" ];
+    wants = [ "graphical-session.target" ];
+    after = [ "graphical-session.target" ];
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+      Restart = "on-failure";
+      RestartSec = 1;
+      TimeoutStopSec = 10;
+    };
+  };
 }

flake.lock

@@ -76,7 +76,7 @@
     "home-manager_2": {
       "inputs": {
         "nixpkgs": [
-          "ll-home-manager",
+          "mlaga97-home-manager",
           "nixpkgs"
         ]
       },
@@ -130,7 +130,7 @@
         "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
       }
     },
-    "ll-home-manager": {
+    "mlaga97-home-manager": {
       "inputs": {
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_2",
@@ -138,12 +138,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-tEq3iB8LaBpgig/fDrM9uvcMkoyKj8nghUAcqa1vxe8=",
+        "narHash": "sha256-oKpqiYEEMrno6/Cx7kk3FSIeshwyhmm29jppwTEcbMY=",
-        "path": "/nix/store/wxpfil70w1hsbhzk4wh4smwhbwbqlwlh-source/users/lauren_lagarde/home-manager",
+        "path": "/nix/store/4nfp193ifb272bqfln8bwi788vkqs0p5-source/modules/mlaga97-home-manager",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/wxpfil70w1hsbhzk4wh4smwhbwbqlwlh-source/users/lauren_lagarde/home-manager",
+        "path": "/nix/store/4nfp193ifb272bqfln8bwi788vkqs0p5-source/modules/mlaga97-home-manager",
         "type": "path"
       }
     },
@@ -281,7 +281,7 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
-        "ll-home-manager": "ll-home-manager",
+        "mlaga97-home-manager": "mlaga97-home-manager",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable_2",

flake.nix

@@ -36,7 +36,7 @@
     home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    ll-home-manager.url = "./users/lauren_lagarde/home-manager/";
+    mlaga97-home-manager.url = "./modules/mlaga97-home-manager/";
 
     # Extras
     waveforms.url = "github:liff/waveforms-flake";
@@ -131,7 +131,7 @@
           {
             networking.hostName = "ll-nixos-base";
             home-manager.users."lauren_lagarde" = { config, ... }: {
-              imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+              imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
             };
           }
           ./systems/ll-nixos-base.nix
@@ -210,7 +210,7 @@
           {
             networking.hostName = "ll-nixos";
             home-manager.users."lauren_lagarde" = { config, ... }: {
-              imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+              imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
             };
           }
           ./systems/ll-nixos-base.nix
@@ -227,7 +227,7 @@
           {
             networking.hostName = "ll-nixos";
             home-manager.users."lauren_lagarde" = { config, ... }: {
-              imports = inputs.ll-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+              imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
             };
           }
           ./systems/ll-nixos-full.nix

systems/ll-latitude-e5591.nix

@@ -45,6 +45,12 @@
     "i915.enable_guc=2"
   ];
 
+  # TODO: Not quite enough for hibernation while zram is still enabled
+  #swapDevices = [{
+  #  device = "/var/lib/swapfile";
+  #  size = 48 * 1024;
+  #}];
+
   ##############################################################################
   ##############################################################################
   ##############################################################################

users/lauren_lagarde/dotspace.nix

@@ -1,7 +0,0 @@
-{ pkgs, unstable, ... }: {
-  home-manager.users.lauren_lagarde = {
-    imports = [
-      ./home-manager/secrets/dotspace.nix
-    ];
-  };
-}

users/lauren_lagarde/dotspace_gui.nix

@@ -1,7 +0,0 @@
-{ pkgs, unstable, ... }: {
-  home-manager.users.lauren_lagarde = {
-    imports = [
-      ./home-manager/secrets/dotspace_gui.nix
-    ];
-  };
-}

users/lauren_lagarde/home-manager

@@ -1 +0,0 @@
-Subproject commit 2d878c34486115db6573e2da995e1572e36cd8ee

users/lauren_lagarde/home-manager.nix

@@ -1,7 +0,0 @@
-{ pkgs, unstable, ... }: {
-  home-manager.users.lauren_lagarde = {
-    imports = [
-      ./home-manager/lauren_lagarde.nix
-    ];
-  };
-}

users/lauren_lagarde/i3.nix

@@ -1,9 +0,0 @@
-{ home-manager, unstable, ... }: {
-  home-manager.extraSpecialArgs = {
-    inherit unstable;
-  };
-
-  home-manager.users.lauren_lagarde.imports = [
-    ./home-manager/i3.nix
-  ];
-}