System : Migrate to Flakes.

.config/bash/module/Nix.sh

@@ -44,7 +44,8 @@ function nix_update() {
 	local target="${1}"
 	[[ "${target}" = "" ]] && target="${HOSTNAME}"
 
-	nixos-rebuild switch -I nixos-config=/root/.config/linux/system/${target}/Configuration.nix
+	cd ${HOME}/.config/linux/system
+	nixos-rebuild switch --flake .#${target}
 }
 
 # Upgrade system. Applies after reboot.
@@ -54,7 +55,8 @@ function nix_upgrade() {
 	local target="${1}"
 	[[ "${target}" = "" ]] && target="${HOSTNAME}"
 
-	nixos-rebuild boot --upgrade-all -I nixos-config=/root/.config/linux/system/${target}/Configuration.nix
+	cd ${HOME}/.config/linux/system
+	nix flake update && nix_update "${target}"
 }
 
 # Free up root space.

.config/linux/system/flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1706238342,
+        "narHash": "sha256-L/ASTMA6xX8jFzDZcGEypNRlA1bj6DhCYechA6w1/Zo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "952b64947e0b1300600dda555db35d09122b9612",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "952b64947e0b1300600dda555db35d09122b9612",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

.config/linux/system/flake.nix

@@ -0,0 +1,31 @@
+{
+	# inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+	inputs.nixpkgs.url = "github:nixos/nixpkgs/952b64947e0b1300600dda555db35d09122b9612";
+	outputs = { self, nixpkgs }@inputs: {
+		nixosConfigurations.dasha = nixpkgs.lib.nixosSystem {
+			modules = [ ./host/dasha/Configuration.nix ];
+			specialArgs.inputs = inputs;
+			system = "x86_64-linux";
+		};
+		nixosConfigurations.desktop = nixpkgs.lib.nixosSystem {
+			modules = [ ./host/desktop/Configuration.nix ];
+			specialArgs.inputs = inputs;
+			system = "x86_64-linux";
+		};
+		nixosConfigurations.home = nixpkgs.lib.nixosSystem {
+			modules = [ ./host/home/Configuration.nix ];
+			specialArgs.inputs = inputs;
+			system = "x86_64-linux";
+		};
+		nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {
+			modules = [ ./host/laptop/Configuration.nix ];
+			specialArgs.inputs = inputs;
+			system = "x86_64-linux";
+		};
+		nixosConfigurations.work = nixpkgs.lib.nixosSystem {
+			modules = [ ./host/work/Configuration.nix ];
+			specialArgs.inputs = inputs;
+			system = "x86_64-linux";
+		};
+	};
+}

.config/linux/system/host/dasha/Configuration.nix

@@ -4,15 +4,15 @@
 	imports = [
 		./HardwareConfiguration.nix
 		./Tablet.nix
-		../Common.nix
+		../../module/Common.nix
-		../PowersaveIntel.nix
+		../../module/PowersaveIntel.nix
-		../AmdGpu.nix
+		../../module/AmdGpu.nix
-		../Print.nix
+		../../module/Print.nix
-		../Gnome.nix
+		../../module/Gnome.nix
-		../Dasha.nix
+		../../module/Dasha.nix
-		../Flatpak.nix
+		../../module/Flatpak.nix
-		../DockerRootless.nix
+		../../module/DockerRootless.nix
-		../Sshd.nix
+		../../module/Sshd.nix
 	];
 
 	# Network.

.config/linux/system/host/desktop/Configuration.nix

@@ -3,15 +3,15 @@
 {
 	imports = [
 		./HardwareConfiguration.nix
-		../Common.nix
+		../../module/Common.nix
-		../PowersaveAmd.nix
+		../../module/PowersaveAmd.nix
-		../AmdGpu.nix
+		../../module/AmdGpu.nix
-		../Print.nix
+		../../module/Print.nix
-		../Gnome.nix
+		../../module/Gnome.nix
-		../Voronind.nix
+		../../module/Voronind.nix
-		../Flatpak.nix
+		../../module/Flatpak.nix
-		../DockerRootless.nix
+		../../module/DockerRootless.nix
-		../Sshd.nix
+		../../module/Sshd.nix
 	];
 
 	# Network.

.config/linux/system/host/home/Configuration.nix

@@ -7,15 +7,15 @@
 		./Nextcloud.nix
 		./PhotosProcess.nix
 		./YandexMusic.nix
-		../Common.nix
+		../../module/Common.nix
-		../Flatpak.nix
+		../../module/Flatpak.nix
-		../Voronind.nix
+		../../module/Voronind.nix
-		../Gnome.nix
+		../../module/Gnome.nix
-		../Ftpd.nix
+		../../module/Ftpd.nix
-		../PowersaveAmd.nix
+		../../module/PowersaveAmd.nix
-		../AmdGpu.nix
+		../../module/AmdGpu.nix
-		../Docker.nix
+		../../module/Docker.nix
-		../Sshd.nix
+		../../module/Sshd.nix
 	];
 
 	# Network.

.config/linux/system/host/laptop/Configuration.nix

@@ -4,16 +4,16 @@
 	imports = [
 		./HardwareConfiguration.nix
 		# ./MsiKeyboard.nix
-		../Common.nix
+		../../module/Common.nix
-		../AmdGpu.nix
+		../../module/AmdGpu.nix
-		../PowersaveAmd.nix
+		../../module/PowersaveAmd.nix
-		../Print.nix
+		../../module/Print.nix
-		../Gnome.nix
+		../../module/Gnome.nix
-		../Voronind.nix
+		../../module/Voronind.nix
-		../Dasha.nix
+		../../module/Dasha.nix
-		../Flatpak.nix
+		../../module/Flatpak.nix
-		../DockerRootless.nix
+		../../module/DockerRootless.nix
-		../Sshd.nix
+		../../module/Sshd.nix
 	];
 
 	# Network.

.config/linux/system/host/work/Configuration.nix

@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+{
+	imports = [
+		./HardwareConfiguration.nix
+		./Fprint.nix
+		../../module/Common.nix
+		../../module/PowersaveIntel.nix
+		../../module/Powerlimit.nix
+		../../module/Print.nix
+		../../module/Gnome.nix
+		../../module/Voronind.nix
+		../../module/Flatpak.nix
+		../../module/DockerRootless.nix
+		../../module/Sshd.nix
+	];
+
+	# Network.
+	networking.hostName = "work";
+
+	# Do not touch ever.
+	system.stateVersion = "23.11";
+}

.config/linux/system/module/Common.nix

@@ -20,6 +20,7 @@
 		lshw
 		gnome.gnome-tweaks
 		gnumake
+		imagemagick
 		lsof
 		ncdu
 		neovim

.config/linux/system/work/Configuration.nix

@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	imports = [
-		./HardwareConfiguration.nix
-		./Fprint.nix
-		../Common.nix
-		../PowersaveIntel.nix
-		../Powerlimit.nix
-		../Print.nix
-		../Gnome.nix
-		../Voronind.nix
-		../Flatpak.nix
-		../DockerRootless.nix
-		../Sshd.nix
-	];
-
-	# Network.
-	networking.hostName = "work";
-
-	# Do not touch ever.
-	system.stateVersion = "23.11";
-}