homes/x86_64-linux/harald@x1/default.nix

@@ -1,4 +1,9 @@
-{ config
+{ lib
+, pkgs
+, config
+, nixpkgs
+, osConfig ? { }
+, format ? "unknown"
 , ...
 }:
 {
@@ -28,44 +33,5 @@
   };
 
   fonts.fontconfig.enable = true;
-
-  dconf.settings = {
-    # ...
-    "org/gnome/shell" = {
-      disable-user-extensions = false;
-
-      # `gnome-extensions list` for a list
-      enabled-extensions = [
-        "Vitals@CoreCoding.com"
-        "appindicatorsupport@rgcjonas.gmail.com"
-        "dash-to-panel@jderose9.github.com"
-        "hibernate-status@dromi"
-      ];
-
-      favorite-apps = [
-        "org.gnome.Console.desktop"
-        "JetBrains Toolbox.desktop"
-        "org.mozilla.firefox.desktop"
-        "firefox.desktop"
-        "thunderbird.desktop"
-        "org.mozilla.Thunderbird.desktop"
-        "slack.desktop"
-        "keybase.desktop"
-        "spotify.desktop"
-        "org.gnome.Nautilus.desktop"
-      ];
-    };
-    "org/virt-manager/virt-manager/connections" = {
-      autoconnect = [ "qemu:///system" ];
-      uris = [ "qemu:///system" ];
-    };
-  };
-
-  xdg.enable = true;
-  xdg.mime.enable = true;
-  targets.genericLinux.enable = true;
-
-
-
 }
 

modules/nixos/gui/default.nix

@@ -15,6 +15,7 @@ in
       flatpak.enable = true;
       xserver = {
         layout = "de+us";
+        xkbVariant = "nodeadkeys";
         enable = true;
         displayManager.gdm.enable = true;
         desktopManager.gnome.enable = true;

systems/x86_64-linux/x1/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 with lib;
 with lib.plusultra;
 
@@ -11,6 +11,7 @@ with lib.plusultra;
 
     plusultra.gui.enable = true;
 
+  programs.dconf.enable = true;
 
   boot = {
     tmp.cleanOnBoot = true;
@@ -23,7 +24,7 @@ with lib.plusultra;
   };
 
   # Configure console keymap
-  console.keyMap = "us";
+  console.keyMap = "de-latin1-nodeadkeys";
   i18n.extraLocaleSettings = {
     LC_MESSAGES = "en_US.UTF-8";
     LC_TIME = "de_DE.UTF-8";
@@ -32,8 +33,6 @@ with lib.plusultra;
   environment = {
     systemPackages = with pkgs; [
       age
-appimage-run
-      cifs-utils
       clevis
       delta
       efibootmgr
@@ -69,7 +68,6 @@ appimage-run
   };
 
   programs = {
-    dconf.enable = true;
     bash = {
       ## shellInit = ''
       interactiveShellInit = ''
@@ -149,25 +147,4 @@ appimage-run
       defaultNetwork.settings = { dns_enabled = true; };
     };
   };
-
-  programs.nix-ld.enable = true;
-
-  # Sets up all the libraries to load
-  programs.nix-ld.libraries = with pkgs; [
-    appimage-run
-    stdenv.cc.cc
-    libclang.lib
-    zlib
-    fuse3
-    fuse
-    icu
-    nss
-    curl
-    expat
-    freetype
-    glib
-    openssl
-    # ...
-  ];
-
 }

systems/x86_64-linux/x1/hardware-configuration.nix

@@ -5,24 +5,34 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  boot.initrd.luks.devices.data = {
-    { device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955";
+    device = "/dev/nvme0n1p5";
-      fsType = "btrfs";
+    preLVM = true;
-      options = [ "subvol=@" ];
+  };
+  boot.initrd.luks.devices.swap = {
+    device = "/dev/nvme0n1p5";
+    preLVM = true;
   };
 
-  boot.initrd.luks.devices."luks-0e2792db-1b80-49a7-b2eb-54e4b5fc3502".device = "/dev/disk/by-uuid/0e2792db-1b80-49a7-b2eb-54e4b5fc3502";
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/ebb90474-ddcb-484b-9663-d71863827af4";
+      fsType = "ext4";
+    };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/13C4-A825";
+    {
+      device = "/dev/disk/by-uuid/941C-7B02";
       fsType = "vfat";
     };
 
@@ -33,9 +43,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp82s0u1u3u4.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }