7 files changed, 10 insertions, 185 deletions
diff --git a/host/Rory-portable/configuration.nix b/host/Rory-portable/configuration.nix
index ebfe899..e278e17 100644
--- a/host/Rory-portable/configuration.nix
+++ b/host/Rory-portable/configuration.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   nhekoSrc,
@@ -9,19 +8,8 @@
 
 {
   imports = [
-    # base imports
     ../../modules/base-client.nix
     ../../modules/packages/vim.nix
-    #      ../../modules/environments/home.nix
-    #../../modules/software-templates/profilers.nix
-    #./postgres.nix
-    #./nginx.nix
-
-    # hardware-specific imports
-    #./optional/hardware-specific/amd.nix
-
-    #./printing.nix
-    ./ollama.nix
   ];
 
   boot = {
@@ -80,7 +68,6 @@
 
   services.power-profiles-daemon.enable = true;
   time.timeZone = "Europe/Brussels";
-  i18n.defaultLocale = "en_US.UTF-8";
 
   services = {
     libinput.touchpad.naturalScrolling = true;
@@ -123,21 +110,6 @@
 
   sound.enable = true;
 
-  users.users = {
-    Rory = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-      packages = with pkgs; [
-        #gimp-with-plugins
-
-        #xterm
-        #gnomeExtensions.vitals
-        #gnomeExtensions.runcat
-      ];
-      initialPassword = "password";
-    };
-  };
-
   environment.systemPackages = with pkgs; [
     libreoffice
     qt6.qtwayland
@@ -165,8 +137,8 @@
 
     # - Languages
     #dotnet-sdk_7
-    #dotnet-sdk_8
-    (callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
+    dotnet-sdk_8
+    #(callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
 
     #games
     osu-lazer-bin
@@ -176,8 +148,8 @@
     # extra packages
     dmenu
 
-    cinnamon.nemo
-    gnome.file-roller
+    nemo
+    file-roller
     firefox-bin
     ungoogled-chromium # needed for Rider in order to debug WASM
 
@@ -237,37 +209,14 @@
       (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
       noto-fonts-monochrome-emoji
     ];
-    fontconfig.defaultFonts.monospace = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
-    fontconfig.defaultFonts.sansSerif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
-    fontconfig.defaultFonts.serif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
-    fontconfig.defaultFonts.emoji = with pkgs; [ "freefont" ];
+    fontconfig.defaultFonts.monospace = [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+    fontconfig.defaultFonts.sansSerif = [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+    fontconfig.defaultFonts.serif = [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+    fontconfig.defaultFonts.emoji = [ "freefont" ];
     enableDefaultPackages = lib.mkForce false;
     enableGhostscriptFonts = lib.mkForce false;
   };
-  nix = {
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      auto-optimise-store = true;
-    };
-  };
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [ "electron-25.9.0" ];
-    };
 
-  };
-  security = {
-    polkit.enable = true;
-    sudo.wheelNeedsPassword = false;
-  };
-
-  hardware = {
-    pulseaudio.enable = false;
-  };
   programs.dconf.enable = true;
   environment.etc."resolv.conf".text = ''
     nameserver 8.8.8.8
diff --git a/host/Rory-portable/mariadb.nix b/host/Rory-portable/mariadb.nix
deleted file mode 100644
index 758cb3d..0000000
--- a/host/Rory-portable/mariadb.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  services.mysql = {
-    enable = true;
-    package = pkgs.mariadb;
-  };
-
-}
diff --git a/host/Rory-portable/nginx.nix b/host/Rory-portable/nginx.nix
deleted file mode 100644
index 31ec0ea..0000000
--- a/host/Rory-portable/nginx.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  services = {
-    nginx = {
-      enable = true;
-      #package = pkgs.nginxQuic;
-      recommendedProxySettings = true;
-      #recommendedTlsSettings = true;
-      recommendedZstdSettings = true;
-      recommendedGzipSettings = true;
-      recommendedBrotliSettings = true;
-      recommendedOptimisation = true;
-      #defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
-      appendConfig = ''
-        worker_processes 16;
-      '';
-      eventsConfig = ''
-        #use kqueue;
-        worker_connections 512;
-      '';
-      appendHttpConfig = ''
-        #sendfile on;
-        disable_symlinks off;
-      '';
-      additionalModules = with pkgs.nginxModules; [ moreheaders ];
-      virtualHosts = {
-        "discord.localhost" = import ./nginx/discord.localhost.nix { inherit pkgs; };
-
-      };
-    };
-  };
-  systemd.services.nginx.serviceConfig = {
-    LimitNOFILE = 5000000;
-  };
-
-}
diff --git a/host/Rory-portable/nginx/discord.localhost.nix b/host/Rory-portable/nginx/discord.localhost.nix
deleted file mode 100755
index b40e13c..0000000
--- a/host/Rory-portable/nginx/discord.localhost.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-
-{
-  root = "/www/discord";
-  addSSL = true;
-  enableACME = false;
-
-  # We don't care about certificates around here...
-  sslCertificate = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.cert.pem";
-  sslCertificateKey = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.key.pem";
-
-  extraConfig = ''
-    autoindex on;
-    more_set_headers 'Access-Control-Allow-Origin: *';
-    more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
-    more_set_headers 'Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-    more_set_headers 'Access-Control-Expose-Headers: Content-Length,Content-Range';
-    more_set_headers 'Access-Control-Allow-Credentials: true';
-  '';
-
-  locations = {
-    "/" = {
-      index = "index.html";
-      extraConfig = ''
-        more_set_headers 'Access-Control-Allow-Origin: *';
-        more_set_headers 'Access-Control-Allow-Methods: *';
-        more_set_headers 'Access-Control-Allow-Headers: *';
-        more_set_headers 'Access-Control-Expose-Headers: *';
-        more_set_headers 'Access-Control-Max-Age' 1728000;
-
-        # default to /index.html if file not found
-        try_files $uri $uri/ /index.html;
-      '';
-    };
-  };
-}
diff --git a/host/Rory-portable/ollama.nix b/host/Rory-portable/ollama.nix
deleted file mode 100755
index 0c72b85..0000000
--- a/host/Rory-portable/ollama.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  services.ollama = {
-    enable = true;
-    home = "/data/ollama/home";
-    models = "/data/ollama/home/models";
-    environmentVariables = {
-      OLLAMA_LLM_LIBRARY = "cpu_avx2";
-    };
-    writablePaths = [ "/data/ollama/home" ];
-    #listenAddress = "0.0.0.0:11434";
-    host = "0.0.0.0";
-    port = 11434;
-    sandbox = false;
-  };
-}
diff --git a/host/Rory-portable/postgres.nix b/host/Rory-portable/postgres.nix
index 60fd8d6..7223f6a 100755
--- a/host/Rory-portable/postgres.nix
+++ b/host/Rory-portable/postgres.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ pkgs, ... }:
 
 {
   #systemd.tmpfiles.rules = [  "d /mnt/postgres/data 0750 postgres postgres" ];
diff --git a/host/Rory-portable/printing.nix b/host/Rory-portable/printing.nix
index 2480610..f25580f 100644
--- a/host/Rory-portable/printing.nix
+++ b/host/Rory-portable/printing.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ pkgs, ... }:
 
 {
   imports = [ ];