mass update

flake.lock

@@ -0,0 +1,101 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1687647567,
+        "narHash": "sha256-Ua90LZYJO7/7KW/KK/AqijhIekd+wxPwbVKXuBYzJeQ=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "6ca1e16eb3016c94b7ac16699e1d4158bd4e39a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-23.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "impermanence": {
+      "locked": {
+        "lastModified": 1684264534,
+        "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "89253fb1518063556edd5e54509c30ac3089d5e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "type": "github"
+      }
+    },
+    "nixos-cn": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1682818384,
+        "narHash": "sha256-l8jh9BQj6nfjPDYGyrZkZwX1GaOqBX+pBHU+7fFZU3w=",
+        "owner": "nixos-cn",
+        "repo": "flakes",
+        "rev": "2d475ec68cca251ef6c6c69a9224db5c264c5e5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos-cn",
+        "repo": "flakes",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1687555006,
+        "narHash": "sha256-GD2Kqb/DXQBRJcHqkM2qFZqbVenyO7Co/80JHRMg2U0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "33223d479ffde3d05ac16c6dff04ae43cc27e577",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.05",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "impermanence": "impermanence",
+        "nixos-cn": "nixos-cn",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -25,13 +25,13 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        inputs.nixos-cn = {
+        nixos-cn = {
             url = "github:nixos-cn/flakes";
             inputs.nixpkgs.follows = "nixpkgs";
         };
     };
 
-    outputs = {self, nixpkgs, home-manager, nixos-cn,...}: {
+    outputs = {self, nixpkgs, home-manager, nixos-cn, impermanence, ...}: {
         nixosConfigurations.gpd = nixpkgs.lib.nixosSystem rec {
             system = "x86_64-linux";
 
@@ -54,7 +54,7 @@
                 home-manager.nixosModules.home-manager {
                     home-manager.useGlobalPkgs = true;
                     home-manager.useUserPackages = true;
-                    home-manager.users = import ./per-user;
+                    home-manager.users = import ./home;
                 }
             ];
         };

global/software-configuration.nix

@@ -2,7 +2,7 @@
     xdg.portal = {
         enable = true;
         wlr.enable = true;
-    }
+    };
     
     # Enable automatic login for the user.
     services = {

home/user/default.nix

@@ -1,8 +1,13 @@
 {pkgs, ...}: {
-    home = import ./home.nix;
+    imports = [
-    programs = import ./programs.nix;
+        ./home.nix
-    services = import ./services.nix;
+        ./programs.nix
-    systemd.user.services = import ./systemd.nix;
+        ./services.nix
+    ];
+
+    systemd.user.services = {
+        # TODO: Podman
+    };
 
     i18n.inputMethod.enabled = "fcitx5";
     i18n.inputMethod.fcitx5.addons = with pkgs; [

home/user/home.nix

@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+    home = {
         stateVersion = "23.05";  # Static
         username = "GPD User";
         homeDirectory = "/home/user";
@@ -15,10 +16,10 @@
             rofi-rbw
         ];
 
-    sessionPath = {
+        sessionPath = [
             ".local/bin"
             "Applications"
-    }
+        ];
 
         shellAliases = {
             cao = "fuck";
@@ -33,7 +34,7 @@
             ".config/hypr/hyprland.conf".source = ./files/hyprland.conf;
 
             # Use flatseal to change permissions.
-        ".local/share/fonts".source = /run/current-system/sw/share/X11/fonts
+            ".local/share/fonts".source = /run/current-system/sw/share/X11/fonts;
 
             # Fix flatpak fonts
             ".local/share/flatpak/overrides/global".text = ''
@@ -41,4 +42,5 @@
                 filesystems=~/.local/share/fonts:ro;~/.icons;
             '';
         };
+    };
 }

home/user/programs.nix

@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+    programs = {
         home-manager.enable = true;
 
         vim = {
@@ -60,4 +61,5 @@
                 pinentry = "gnome3";
             };
         };
+    };
 }

home/user/services.nix

@@ -1,4 +1,5 @@
 {
+    services = {
         dunst = {
             enable = true;
             settings = {
@@ -16,4 +17,5 @@
         };
 
         network-manager-applet.enable = true;
+    };
 }

home/user/systemd.nix

@@ -1,4 +0,0 @@
-# Will used for podman
-{
-    
-}