new laptop installation & submodule migration

migration to (zpool)
migrating gitlab to new acc.

Author: yokodake

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "dots"]
 	path = dots
-	url = [email protected]:ngyj/dots.git
+	url = [email protected]:yokodake/dots.git

configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 { config, pkgs, ... }:
-
+# configuration.nix
 {
   boot.tmpOnTmpfs = true;
 
@@ -110,11 +110,16 @@
     ffmpeg
     firefox-devedition-bin
     git
+    gnome3.polari
+    haskell.compiler.ghc881
+    haskellPackages.cabal-install
     haskellPackages.hlint
+    haskellPackages.stack
     haskellPackages.xmobar
     htop
     jpegoptim
     kdeApplications.kio-extras
+    kdeFrameworks.breeze-icons
     keepassxc
     krita
     krusader
@@ -127,7 +132,6 @@
     optipng
     p7zip
     pavucontrol
-    gnome3.polari
     psmisc
     racket
     ripgrep
@@ -147,6 +151,7 @@
     xscreensaver
     zathura
     zip
+    clang-tools
   ];
 
   nix.gc.automatic = true;

desktop.nix

@@ -1,5 +1,5 @@
+# desktop.nix
 { config, pkgs, ... }:
-
 {
   imports =
     [ # Include the results of the hardware scan.

hw-desktop.nix

@@ -1,8 +1,8 @@
+# hw-desktop.nix
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, ... }:
-
 {
   imports =
     [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>

hw-laptop.nix

@@ -1,34 +1,41 @@
+# hw-laptop.nix
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, ... }:
-
 {
   imports =
     [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c2d3cf5f-bc4b-4bb7-8849-edcfe9db5ae7";
-      fsType = "xfs";
+    { device = "rpool/root";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home" =
+    { device = "rpool/home";
+      fsType = "zfs";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1719-C806";
+    { device = "/dev/disk/by-uuid/925D-346A";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/7cfdbb12-6017-41a7-aabe-caf52abe5f21"; }
+    [ { device = "/dev/disk/by-uuid/f9af689c-8d7c-4646-a573-58f0ea55e75d"; }
     ];
+
   boot.initrd.luks.devices = [
     {
-      name = "encpv";
-      device = "/dev/disk/by-uuid/f3f172d0-4b0f-4a44-8ede-ed71ecde002a";
+      name = "main";
+      device = "/dev/disk/by-uuid/84b64e62-2879-4f44-85e4-db209dc6e8b1";
       preLVM = true;
     }
   ];

laptop.nix

@@ -1,5 +1,5 @@
+# laptop.nix
 { config, pkgs, ... }:
-
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -21,27 +21,41 @@
   };
   boot.blacklistedKernelModules = [ "radeon" ];
 
-  networking.networkmanager.enable = true;
-  networking.hostName = "kusanagi"; # Define your hostname.
+  networking = {
+    networkmanager.enable = true;
+    hostName = "kusanagi"; # Define your hostname.
+    hostId = "8425e349"; # Required by zfs.
+
+    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+    # Per-interface useDHCP will be mandatory in the future, so this generated config
+    # replicates the default behaviour.
+    useDHCP = false;
+    interfaces = {
+      enp0s31f6.useDHCP = true;
+      vboxnet0.useDHCP = true;
+      wlp1s0.useDHCP = true;
+    };
+  };
 
   # List services that you want to enable:
   services = {
   # Enable the X11 windowing system.
-    xserver = {
-      libinput.enable = true;
-      libinput.middleEmulation = true;
-      libinput.tapping = true;
+    xserver.libinput = {
+      enable = true;
+      middleEmulation = true;
+      tapping = true;
     };
     sshd.enable = true;
   };
   programs.qt5ct.enable = true;
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport32Bit = true;
+  hardware.opengl = {
+    enable = true;
+    driSupport32Bit = true;
+  };
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "19.03"; # Did you read the comment?
-
+  system.stateVersion = "19.09"; # Did you read the comment?
 }