Merge

hosts/desktop/default.nix

@@ -46,17 +46,7 @@
     extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
   };
 
-  services.openssh.enable = true;
-
-  # boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # sunshine
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   system.stateVersion = "24.05";
 

hosts/desktop/hardware-configuration.nix

@@ -8,18 +8,18 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3";
+    { device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/029A-9287";
+    { device = "/dev/disk/by-uuid/9A7D-7464";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };

hosts/desktop/home.nix

@@ -30,10 +30,7 @@
     host = "xv-desktop";
 
     home.packages = with pkgs; [
-      unstable.prismlauncher
-      unstable.modrinth-app
-      unstable.vesktop
-      unstable.blender
+       unstable.prismlauncher
     ];
 
     home.stateVersion = "24.05";

hosts/laptop/default.nix

@@ -22,6 +22,8 @@
     ../../modules/system/hardware/laptop.nix
     ../../modules/system/hardware/locale.nix
     ../../modules/system/hardware/printing.nix
+    ../../modules/system/hardware/fprint.nix
+    ../../modules/system/hardware/virt.nix
   ];
 
   nix.settings = {
@@ -57,6 +59,7 @@
   };
 
   services.libinput.enable = true;
+  services.fwupd.enable = true;
 
   system.stateVersion = "24.05";
 

hosts/laptop/home.nix

@@ -38,17 +38,22 @@
       kdenlive
       unstable.prismlauncher
       unstable.joplin-desktop
-      unstable.moonlight-qt
       unstable.prusa-slicer
       signal-desktop
       unstable.vesktop
-      unstable.rnote
       unstable.blender
-      unstable.openscad-unstable
+      loupe
+      unstable.bottles
+
+      # Systemverilog
+      unstable.gtkwave
+      unstable.verilator
+      gnumake
 
       # Office
       libreoffice
-      unstable.onlyoffice-bin
+      onlyoffice-bin
+      papers
 
       # Image editing
       gimp

hosts/vnix-ctr/default.nix

@@ -1,53 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/podman.nix
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
-  # Bootloader
-  boot.loader.grub = {
-    enable = true;
-    device = "/dev/sda";
-    useOSProber = true;
-  };
-
-  # Networking
-  networking.networkmanager.enable = true;
-
-  networking.firewall = {
-    allowedTCPPorts = [ 80 443 1080 ];
-    allowedUDPPorts = [ 53 ];
-  };
-
-  # Configure user
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
-  };
-
-  system.stateVersion = "24.05";
-
-}

hosts/vnix-ctr/home.nix

@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    # GUI
-    ../../modules/home/gui/theming.nix
-  
-    # CLI
-    ../../modules/home/cli/common
-  ];
-
-  guiTheming.enable = false;  
-
-  home = {
-    username = "xeovalyte";
-    homeDirectory = "/home/xeovalyte";
-  };
-
-  home.stateVersion = "24.05";
-}