summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--nixos.org109
1 files changed, 57 insertions, 52 deletions
diff --git a/nixos.org b/nixos.org
index 0b6c6a1..d97fc01 100644
--- a/nixos.org
+++ b/nixos.org
@@ -53,22 +53,26 @@ stuff
        time.timeZone = "Europe/Amsterdam";
      }
    #+end_src
-** Init system
-   nixos is started with systemd-boot, since we don't run any other distros
+** Main user config
+   This sets up a (secret) default password for the main user and also sets some default groups
    #+begin_src nix :noweb-ref nixos-config
      {
-       boot.loader.systemd-boot.enable = true;
-       boot.loader.efi.canTouchEfiVariables = true;
+       users.mutableUsers = false;
+       # Define a user account. Don't forget to set a password with ‘passwd’.
+       users.users.${config.mainUser} = {
+         initialHashedPassword = "$6$XTH/sALyqg$G.bMWemErh4KGCAjUfT16DL96QMn/4NTmxlw6Z26wUVJn.tagQG.Fzmrz7uPkdiWZbBBFWP36.YA4hw9AcL8Q1";
+         isNormalUser = true;
+         extraGroups = [ "video" "wheel" "NetworkManager" ]; # Enable ‘sudo’ for the user.
+         # shell = pkgs.nushell;
+       };
      }
    #+end_src
-** Networking
-   Some default network settings for my laptop
+** Init system
+   nixos is started with systemd-boot, since we don't run any other distros
    #+begin_src nix :noweb-ref nixos-config
      {
-       networking.networkmanager.enable = true; # Enables wireless support via wpa_supplicant.
-       networking.useDHCP = false;
-       networking.interfaces.enp0s31f6.useDHCP = true;
-       networking.interfaces.wlp1s0.useDHCP = true;
+       boot.loader.systemd-boot.enable = true;
+       boot.loader.efi.canTouchEfiVariables = true;
      }
    #+end_src
 ** nixpkgs setup
@@ -168,6 +172,46 @@ stuff
         ];
       }
     #+end_src
+** Visual stuff
+   I don't acutally literally live in the terminal. So we have to implement some xorg and other stuff
+*** Basics
+    Enable printing, sound and a good keyboard, along with x11 itself
+    #+begin_src nix :noweb-ref nixos-config
+      {
+        # Enable CUPS to print documents.
+        services.printing.enable = true;
+
+        # Enable sound.
+        sound.enable = true;
+        hardware.pulseaudio.enable = true;
+
+        # Enable the X11 windowing system.
+        services.xserver.enable = true;
+        services.xserver.layout = "us";
+        services.xserver.xkbVariant = "altgr-intl";
+        services.xserver.xkbOptions = "eurosign:e";
+        # touchpad controls
+        services.xserver.libinput.enable = true;
+      }
+    #+end_src
+*** XFCE
+    I have decided to be lazy and not install a fancy window manager or whatever into the system. Thats headache
+    #+begin_src nix :noweb-ref nixos-config
+      {
+        services.xserver.displayManager.lightdm.enable = true;
+        services.xserver.desktopManager.xfce.enable = true;
+      }
+    #+end_src
+** Networking
+   Some default network settings for my laptop
+   #+begin_src nix :noweb-ref nixos-config
+     {
+       networking.networkmanager.enable = true; # Enables wireless support via wpa_supplicant.
+       networking.useDHCP = false;
+       networking.interfaces.enp0s31f6.useDHCP = true;
+       networking.interfaces.wlp1s0.useDHCP = true;
+     }
+   #+end_src
 ** packages
 *** Core packages
     These are the normal packages that I use for core maintenance
@@ -204,49 +248,10 @@ stuff
         };
       }
     #+end_src
-*** qemu & frens
-    I also sometimes run qemu vms. The qemu's
-** Main user config
-   This sets up a (secret) default password for the main user and also sets some default groups
-   #+begin_src nix :noweb-ref nixos-config
-     {
-       users.mutableUsers = false;
-       # Define a user account. Don't forget to set a password with ‘passwd’.
-       users.users.${config.mainUser} = {
-         initialHashedPassword = "$6$XTH/sALyqg$G.bMWemErh4KGCAjUfT16DL96QMn/4NTmxlw6Z26wUVJn.tagQG.Fzmrz7uPkdiWZbBBFWP36.YA4hw9AcL8Q1";
-         isNormalUser = true;
-         extraGroups = [ "video" "wheel" "NetworkManager" ]; # Enable ‘sudo’ for the user.
-         # shell = pkgs.nushell;
-       };
-     }
-   #+end_src
-** Visual stuff
-   I don't acutally literally live in the terminal. So we have to implement some xorg and other stuff
-*** Basics
-    Enable printing, sound and a good keyboard, along with x11 itself
-    #+begin_src nix :noweb-ref nixos-config
-      {
-        # Enable CUPS to print documents.
-        services.printing.enable = true;
-
-        # Enable sound.
-        sound.enable = true;
-        hardware.pulseaudio.enable = true;
-
-        # Enable the X11 windowing system.
-        services.xserver.enable = true;
-        services.xserver.layout = "us";
-        services.xserver.xkbVariant = "altgr-intl";
-        services.xserver.xkbOptions = "eurosign:e";
-        # touchpad controls
-        services.xserver.libinput.enable = true;
-      }
-    #+end_src
-*** XFCE
-    I have decided to be lazy and not install a fancy window manager or whatever into the system. Thats headache
+*** QEMU & frens
+    I also sometimes run qemu vms. The qemu's manager will be libvirtd, but not sure if I will even use that
     #+begin_src nix :noweb-ref nixos-config
       {
-        services.xserver.displayManager.lightdm.enable = true;
-        services.xserver.desktopManager.xfce.enable = true;
+        virtualisation.libvirtd.enable = true;
       }
     #+end_src