1 files changed, 22 insertions, 33 deletions

diff --git a/host/Rory-laptop/configuration.nix b/host/Rory-laptop/configuration.nix

index ecb5713..0fa9bc6 100644
--- a/host/Rory-laptop/configuration.nix
+++ b/host/Rory-laptop/configuration.nix
@@ -14,23 +14,28 @@ args@{
     # (import ../../modules/base-secrets.nix {  path = "/home/rory/.config/sops/config.yaml"; })
     ../../packages/vim.nix
     #      ../../modules/environments/home.nix
+    ../../modules/environments/nethost-Rory-desktop.nix
     #../../modules/software-templates/profilers.nix
-    ../../modules/software-templates/dotnet.client.nix
 
-    ./postgres.nix
-    ./nginx.nix
-
-    #./edu/vmware.nix
-    #./edu/nodejs-dev.nix
+    ../../modules/software-templates/eid-mw.nix
+    ../../modules/software-templates/devenv/dotnet.nix
+    ../../modules/software-templates/devenv/javascript.nix
+    ./services/nix-bincache.nix
 
     # hardware-specific imports
     #./optional/hardware-specific/nvidia.nix
-    ./optional/hardware-specific/intel.nix
+    #./optional/hardware-specific/intel.nix
     ./optional/gui/wayland.nix
+    ./services/nginx.nix
   ];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
+    blacklistedKernelModules = [
+      "nova"
+      "nova_core"
+      "nouveau"
+    ];
     loader = {
       grub = {
         configurationLimit = 10;
@@ -55,7 +60,7 @@ args@{
   networking = {
     hostName = "Rory-laptop";
     networkmanager.enable = true;
-    wireless.enable = false;
+    wireless.enable = true;
     firewall = {
       enable = false;
       # allowedTCPPorts = [ ... ];
@@ -120,25 +125,9 @@ args@{
     feh
     easyeffects
     kitty
-    youtube-music
+    pear-desktop
 
     # - IDEs
-
-    (jetbrains.plugins.addPlugins jetbrains.webstorm [
-      jetbrains.plugins.github-copilot-fixed
-      #"github-copilot"
-    ])
-    (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [
-      jetbrains.plugins.github-copilot-fixed
-      #"github-copilot"
-    ])
-    (jetbrains.plugins.addPlugins jetbrains.clion [
-      jetbrains.plugins.github-copilot-fixed
-      #"github-copilot"
-      "string-manipulation"
-      "nixidea"
-      "visual-studio-keymap"
-    ])
     binutils
 
     dbeaver-bin
@@ -150,10 +139,10 @@ args@{
 
     # - Languages
     #dotnet-sdk_8
-    dotnetCorePackages.sdk_9_0
+    #dotnetCorePackages.sdk_9_0
 
     #games
-    osu-lazer-bin
+    # osu-lazer-bin
 
     # extra packages
     dmenu
@@ -191,10 +180,10 @@ args@{
 
     jitsi-meet-electron
     # nixd # broken 24/03/2025
-    mullvad-vpn
+    # mullvad-vpn
     blueman
     ft2-clone
-    wxmaxima
+    # wxmaxima
   ];
   environment.etc."pkcs11/modules/opensc-pkcs11".text = ''
     module: ${pkgs.opensc}/lib/opensc-pkcs11.so
@@ -258,7 +247,7 @@ args@{
   #
   #services.orca.enable = true;
 
-  virtualisation.waydroid.enable = true;
+  #virtualisation.waydroid.enable = true;
 
   xdg = {
     portal = {
@@ -335,16 +324,16 @@ args@{
   # };
 
   virtualisation.libvirtd = {
-    enable = true;
+    enable = false;
     qemu = {
       swtpm.enable = true;
-      ovmf.enable = true;
+      #ovmf.enable = true;
     };
   };
   programs.virt-manager.enable = true;
 
   monitoring = {
-    monitorAll = true;
+    monitorAll = false;
     localPrometheus = true;
     exposePrometheus = true;
     localGrafana = true;