x1

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>

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

@@ -1,9 +1,4 @@
-{ lib
+{ config
-, pkgs
-, config
-, nixpkgs
-, osConfig ? { }
-, format ? "unknown"
 , ...
 }:
 {
@@ -33,5 +28,44 @@
   };
 
   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,7 +15,6 @@ in
       flatpak.enable = true;
       xserver = {
         layout = "de+us";
-        xkbVariant = "nodeadkeys";
         enable = true;
         displayManager.gdm.enable = true;
         desktopManager.gnome.enable = true;
@@ -89,7 +88,7 @@ in
       gnomeExtensions.vitals
       gnupg
       go
-      jetbrains-toolbox
+jetbrains-toolbox
       jq
       kbfs
       keybase

systems/x86_64-linux/x1/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 with lib;
 with lib.plusultra;
 
@@ -9,9 +9,8 @@ with lib.plusultra;
       ./hardware-configuration.nix
     ];
 
-    plusultra.gui.enable = true;
+  plusultra.gui.enable = true;
 
-  programs.dconf.enable = true;
 
   boot = {
     tmp.cleanOnBoot = true;
@@ -24,7 +23,7 @@ with lib.plusultra;
   };
 
   # Configure console keymap
-  console.keyMap = "de-latin1-nodeadkeys";
+  console.keyMap = "us";
   i18n.extraLocaleSettings = {
     LC_MESSAGES = "en_US.UTF-8";
     LC_TIME = "de_DE.UTF-8";
@@ -32,7 +31,9 @@ with lib.plusultra;
 
   environment = {
     systemPackages = with pkgs; [
-      age
+     age
+appimage-run
+      cifs-utils
       clevis
       delta
       efibootmgr
@@ -68,6 +69,7 @@ with lib.plusultra;
   };
 
   programs = {
+    dconf.enable = true;
     bash = {
       ## shellInit = ''
       interactiveShellInit = ''
@@ -122,19 +124,19 @@ with lib.plusultra;
     "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
   ];
 
-#  users.users.harald = {
+  #  users.users.harald = {
-#    shell = pkgs.fish;
+  #    shell = pkgs.fish;
-#    isNormalUser = true;
+  #    isNormalUser = true;
-#    description = "harald";
+  #    description = "harald";
-#    extraGroups = [ "networkmanager" "wheel" "sgx" "libvirtd" "tss" "rspamd" ];
+  #    extraGroups = [ "networkmanager" "wheel" "sgx" "libvirtd" "tss" "rspamd" ];
-#    openssh.authorizedKeys.keys = [
+  #    openssh.authorizedKeys.keys = [
-#      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
+  #      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
-#      "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz"
+  #      "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz"
-#      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAYbUTKpy4QR3s944/hjJ1UK05asFEs/SmWeUbtS0cdA660sT4xHnRfals73FicOoz+uIucJCwn/SCM804j+wtM="
+  #      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAYbUTKpy4QR3s944/hjJ1UK05asFEs/SmWeUbtS0cdA660sT4xHnRfals73FicOoz+uIucJCwn/SCM804j+wtM="
-#      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box"
+  #      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box"
-#    ];
+  #    ];
-#  };
+  #  };
-#
+  #
 
   virtualisation = {
     podman = {
@@ -147,4 +149,25 @@ with lib.plusultra;
       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,34 +5,24 @@
 
 {
   imports =
-    [
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-      (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  boot.initrd.luks.devices.data = {
-    device = "/dev/nvme0n1p5";
-    preLVM = true;
-  };
-  boot.initrd.luks.devices.swap = {
-    device = "/dev/nvme0n1p5";
-    preLVM = true;
-  };
-
-
   fileSystems."/" =
-    {
+    { device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955";
-      device = "/dev/disk/by-uuid/ebb90474-ddcb-484b-9663-d71863827af4";
+      fsType = "btrfs";
-      fsType = "ext4";
+      options = [ "subvol=@" ];
     };
 
+  boot.initrd.luks.devices."luks-0e2792db-1b80-49a7-b2eb-54e4b5fc3502".device = "/dev/disk/by-uuid/0e2792db-1b80-49a7-b2eb-54e4b5fc3502";
+
   fileSystems."/boot" =
-    {
+    { device = "/dev/disk/by-uuid/13C4-A825";
-      device = "/dev/disk/by-uuid/941C-7B02";
       fsType = "vfat";
     };
 
@@ -43,7 +33,9 @@
   # 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.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp82s0u1u3u4.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;
 }