Separate more of impermanence into services, switch to Sway 1.10 official

flake.lock

@@ -33,28 +33,6 @@
         "type": "gitlab"
       }
     },
-    "chaotic": {
-      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "home-manager": "home-manager",
-        "jovian": "jovian",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1730390431,
-        "narHash": "sha256-M+rMhDB69Y35IlhmAMN4ErDige+wKPwhb6HDqpF14Rw=",
-        "owner": "chaotic-cx",
-        "repo": "nyx",
-        "rev": "40388a7427ee32af175c5169ae7587ffd2dec125",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chaotic-cx",
-        "ref": "nyxpkgs-unstable",
-        "repo": "nyx",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -165,20 +143,6 @@
         "type": "github"
       }
     },
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1721999734,
-        "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
-        "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
-        "revCount": 75,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -239,11 +203,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1730368399,
+        "lastModified": 1730537918,
-        "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=",
+        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc",
+        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
         "type": "github"
       },
       "original": {
@@ -254,27 +218,6 @@
       }
     },
     "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730016908,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -310,28 +253,6 @@
         "type": "github"
       }
     },
-    "jovian": {
-      "inputs": {
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730248099,
-        "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=",
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -363,7 +284,7 @@
       "inputs": {
         "blobs": "blobs",
         "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-24_05": "nixpkgs-24_05",
         "utils": "utils"
       },
@@ -386,14 +307,14 @@
       "inputs": {
         "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1730426071,
+        "lastModified": 1730598780,
-        "narHash": "sha256-2BkSiHqyWikpz9HSgTBk5kikaQ5m0Rs60C9KA2kf53o=",
+        "narHash": "sha256-QrmwhJQjRMWBVvASt5amKpm3ORgfetTkS+idL9rcsNc=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "4b371c3d119493051d081ff5b6cff689a97ad1a1",
+        "rev": "d72d83da504fca2f3d4666026d16b30a8a0fad5d",
         "type": "github"
       },
       "original": {
@@ -402,29 +323,6 @@
         "type": "github"
       }
     },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "jovian",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729697500,
-        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
-        "owner": "zhaofengli",
-        "repo": "nix-github-actions",
-        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "ref": "matrix-name",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1722221733,
@@ -471,22 +369,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1730200266,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1717602782,
         "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@@ -501,7 +383,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1715266358,
         "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@@ -517,13 +399,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1730137625,
+        "lastModified": 1730327045,
-        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
+        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
         "type": "github"
       },
       "original": {
@@ -534,11 +416,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1730434297,
+        "lastModified": 1730612615,
-        "narHash": "sha256-7wEy/XwjqAdzsIZJ2AFJaVeshX6yT9vhRsFjvQe0U1E=",
+        "narHash": "sha256-l5mlB45tLEcMGGEucbGs06CvsrXrxGM4NKueWh7Pkuo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5ef5f243936bc6387b55fc8cb08c88e7cf68092a",
+        "rev": "88b6dea6f574d59dd0f3bd48d1da32d37118de34",
         "type": "github"
       },
       "original": {
@@ -577,15 +459,14 @@
     "root": {
       "inputs": {
         "blender-bin": "blender-bin",
-        "chaotic": "chaotic",
         "disko": "disko",
         "hardware": "hardware",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "mailserver": "mailserver",
         "minecraft": "minecraft",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "unstable": "unstable"
       }
@@ -662,11 +543,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1730200266,
+        "lastModified": 1730531603,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,7 +16,6 @@
     };
 
     impermanence.url = "github:nix-community/impermanence";
-    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
     mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
     minecraft.url = "github:Infinidoge/nix-minecraft";
 
@@ -37,7 +36,6 @@
     lanzaboote,
     disko,
     impermanence,
-    chaotic,
     mailserver,
     minecraft,
     home-manager,
@@ -55,7 +53,6 @@
           lanzaboote
 	  disko
           impermanence
-          chaotic
           mailserver
           minecraft
           home-manager

hosts/firefly/default.nix

@@ -1,4 +1,4 @@
-{ chaotic, pkgs, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./boot
@@ -23,13 +23,8 @@
     # Misc
     ../../overlays
     ../../variables
-
-    # Imports
-    chaotic.homeManagerModules.default
   ];
 
-  programs.sway.package = pkgs.sway_git;
-
   networking.hostName = "firefly";
 
   # Force Electron to use Wayland

modules/system/desktop/sway/default.nix

@@ -7,6 +7,7 @@
 
   programs.sway = {
     enable = true;
+    package = pkgs.unstable.sway;
     extraPackages = with pkgs; [ swaylock ];
   };
 

modules/system/devices/bluetooth/default.nix

@@ -12,4 +12,6 @@
   systemd.tmpfiles.rules = [
     "f /var/lib/systemd/linger/jimbo"
   ];
+
+  environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
 }

modules/system/devices/impermanence/root/default.nix

@@ -5,14 +5,9 @@
     directories = [
       "/etc/nixos"
       "/etc/secureboot"
-
       "/var/log"
-      "/var/lib/bluetooth"
-      "/var/lib/mpd"
-      "/var/lib/nixos"
-      "/var/lib/fail2ban"
-      "/var/lib/iwd/"
       "/var/lib/systemd/coredump"
+      "/var/lib/nixos"
     ];
     files = [
       "/etc/machine-id"

modules/system/devices/networking/wireless/default.nix

@@ -5,5 +5,8 @@
     enableB43Firmware = true;
   };
 
-  environment.systemPackages = with pkgs; [ unstable.impala ];
+  environment = {
+    persistence."/persist".directories = [ "/var/lib/iwd/" ];
+    systemPackages = with pkgs; [ unstable.impala ];
+  };
 }

modules/system/services/common/ssh/fail2ban/default.nix

@@ -5,4 +5,6 @@
     maxretry = 5;
     bantime = "5m";
   };
+
+  environment.persistence."/persist".directories = [ "/var/lib/fail2ban" ];
 }

modules/system/services/pc/mpd/default.nix

@@ -17,4 +17,6 @@
   systemd.services.mpd.environment = {
     XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.jimbo.uid}";
   };
+
+  environment.persistence."/persist".directories = [ "/var/lib/mpd" ];
 }