Update nixos system setup after re install

systems/hikari/nixos/configuration.nix

@@ -7,7 +7,6 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      <nixos-hardware/apple/macbook-air/6>
       ./hardware-configuration.nix
 
       ./cachix.nix
@@ -18,6 +17,11 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
+  # Setup keyfile
+  boot.initrd.secrets = {
+    "/crypto_keyfile.bin" = null;
+  };
+
   networking.hostName = "hikari"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   networking = {
@@ -40,9 +44,15 @@
 
   services.dnsmasq = {
     enable = true;
-    servers = config.networking.nameservers;
+    settings = {
+      server = config.networking.nameservers;
+    };
   };
 
+  # Enable network manager applet
+  programs.nm-applet.enable = true;
+  programs.dconf.enable = true;
+
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
@@ -63,11 +73,10 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  services.xserver.exportConfiguration = true;
 
-  # Enable the XFCE Desktop Environment.
+  # Enable the LXQT Desktop Environment.
   services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.xfce.enable = true;
+  services.xserver.desktopManager.lxqt.enable = true;
 
   # Configure keymap in X11
   services.xserver = {
@@ -110,14 +119,19 @@
     ];
   };
 
+  # Enable automatic login for the user.
+  services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.autoLogin.user = "daniels";
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    git
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    git
+  #  wget
     xorg.xbacklight
   ];
 

systems/hikari/nixos/hardware-configuration.nix

@@ -4,8 +4,9 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [
+	<nixos-hardware/apple/macbook-air/6>
+	(modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
@@ -14,10 +15,12 @@
   boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e03f6328-d9da-487a-bd81-5ab198d1fc48";
+    { device = "/dev/disk/by-uuid/bb322f78-2e67-41dc-9385-8a5fe9abb103";
       fsType = "ext4";
     };
 
+  boot.initrd.luks.devices."luks-4bbd7327-2cd7-4aed-90ea-32030abdc894".device = "/dev/disk/by-uuid/4bbd7327-2cd7-4aed-90ea-32030abdc894";
+
   fileSystems."/boot/efi" =
     { device = "/dev/disk/by-uuid/67E3-17ED";
       fsType = "vfat";

systems/hikari/nixos/readme.rst

@@ -0,0 +1,13 @@
+Update to nixpkgs unstable via:
+
+        nix-channel --add https://nixos.org/channels/nixos-unstable nixos 
+        nix-channel --update
+
+See: https://nixos.wiki/wiki/Nix_channels
+
+Ad hardware channel:
+
+        nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
+        nix-channel --update
+        
+See: https://github.com/NixOS/nixos-hardware