From b4768eef70c22752738ef5eac4c1c3ef513a28b6 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Mon, 4 Mar 2024 20:38:37 +0100
Subject: [PATCH] x1

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
---
 homes/x86_64-linux/harald@x1/default.nix      | 46 ++++++++++++++++---
 modules/nixos/gui/default.nix                 |  2 +-
 systems/x86_64-linux/x1/default.nix           | 28 +++++++++--
 .../x1/hardware-configuration.nix             | 30 +++++-------
 4 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix
index 3e76ec2..4e55645 100644
--- a/homes/x86_64-linux/harald@x1/default.nix
+++ b/homes/x86_64-linux/harald@x1/default.nix
@@ -1,9 +1,4 @@
-{ lib
-, pkgs
-, config
-, nixpkgs
-, osConfig ? { }
-, format ? "unknown"
+{ config
 , ...
 }:
 {
@@ -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;
+
+
+
 }
 
diff --git a/modules/nixos/gui/default.nix b/modules/nixos/gui/default.nix
index bdeb816..8f64e8f 100644
--- a/modules/nixos/gui/default.nix
+++ b/modules/nixos/gui/default.nix
@@ -88,7 +88,7 @@ in
       gnomeExtensions.vitals
       gnupg
       go
-      jetbrains-toolbox
+jetbrains-toolbox
       jq
       kbfs
       keybase
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index 27be921..f0fd792 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 with lib;
 with lib.plusultra;
 
@@ -11,7 +11,6 @@ with lib.plusultra;
 
   plusultra.gui.enable = true;
 
-  programs.dconf.enable = true;
 
   boot = {
     tmp.cleanOnBoot = true;
@@ -32,7 +31,8 @@ with lib.plusultra;
 
   environment = {
     systemPackages = with pkgs; [
-      age
+     age
+appimage-run
       cifs-utils
       clevis
       delta
@@ -69,6 +69,7 @@ with lib.plusultra;
   };
 
   programs = {
+    dconf.enable = true;
     bash = {
       ## shellInit = ''
       interactiveShellInit = ''
@@ -148,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
+    # ...
+  ];
+
 }
diff --git a/systems/x86_64-linux/x1/hardware-configuration.nix b/systems/x86_64-linux/x1/hardware-configuration.nix
index 68f73fa..170895d 100644
--- a/systems/x86_64-linux/x1/hardware-configuration.nix
+++ b/systems/x86_64-linux/x1/hardware-configuration.nix
@@ -5,34 +5,24 @@
 
 {
   imports =
-    [
-      (modulesPath + "/profiles/qemu-guest.nix")
+    [ (modulesPath + "/installer/scan/not-detected.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/ebb90474-ddcb-484b-9663-d71863827af4";
-      fsType = "ext4";
+    { device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955";
+      fsType = "btrfs";
+      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/941C-7B02";
+    { device = "/dev/disk/by-uuid/13C4-A825";
       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;
 }