merge from main

5 files changed, 28 insertions, 19 deletions

diff --git a/hosts/mercury/ai.nix b/hosts/mercury/ai.nix
index 42a478a..4bdb8e0 100644
--- a/hosts/mercury/ai.nix
+++ b/hosts/mercury/ai.nix
@@ -1,7 +1,4 @@
 {pkgs, ...}: {
-  services.ollama = {
-    enable = true;
-    loadModels = ["deepseek-r1:1.5b"];
-  };
-  environment.systemPackages = [pkgs.mcphost];
+  services.ollama.enable = true;
+  # environment.systemPackages = [pkgs.mcphost];
 }
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index d5f0832..268c767 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,6 +1,6 @@
-{
+{pkgs, ...}: {
   collinux = {
-    theme = "catppuccin";
+    theme = "kanagawa";
 
     user = {
       name = "collin";
@@ -8,21 +8,28 @@
     };
 
     desktop = {
-      wallpaper = ./wallpaper.jpg;
+      # wallpaper = ./wallpaper.jpg;
+      # wallpaper = ./hintergrund2.png;
+      # wallpaper = ./kanagawa.jpg;
+      wallpaper = ./riverboats.png;
 
-      gtk.enable = true;
+      # gtk.enable = true;
 
       greetd.enable = true;
 
-      sway = {
-        enable = true;
+      wm = {
+        # sway.enable = true;
+        niri.enable = true;
         components.fuzzel.enable = true;
         components.dunst.enable = true;
       };
 
       programs = {
         firefox.enable = true;
-        foot.enable = true;
+        foot = {
+          theme = "kanagawa";
+          enable = true;
+        };
 
         research.enable = true;
       };
@@ -43,9 +50,10 @@
 
     terminal = {
       shells.fish.enable = true;
+      shells.bash.enable = true; # for nix-shells
 
       programs = {
-        tmux.enable = true;
+        # tmux.enable = true;
         lazygit.enable = true;
         starship.enable = true;
 
@@ -63,6 +71,7 @@
         nh.enable = true;
 
         helix = {
+          theme = "kanagawa";
           enable = true;
           hardMode = true;
         };
diff --git a/hosts/mercury/hintergrund2.png b/hosts/mercury/hintergrund2.png
new file mode 100644
index 0000000..6cf9a8f
--- /dev/null
+++ b/hosts/mercury/hintergrund2.png
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 05e84a7..48aa92c 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   inputs,
   ...
 }: {
@@ -10,16 +9,20 @@
     ./ai.nix
 
     inputs.nixos-facter-modules.nixosModules.facter
-    {facter.reportPath = ./facter.json;}
-
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
+  systemd.services.systemd-udev-settle.enable = false;
+  networking.interfaces.wlp2s0.useDHCP = false;
+
+  facter.reportPath = ./facter.json;
+
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
-  networking.firewall.allowedUDPPorts = [445];
-  networking.firewall.allowedTCPPorts = [8000];
-  users.users.collin.packages = [pkgs.cifs-utils];
+  networking.firewall = {
+    allowedUDPPorts = [445];
+    allowedTCPPorts = [8000];
+  };
 
   system.stateVersion = "25.05";
 }
diff --git a/hosts/mercury/riverboats.png b/hosts/mercury/riverboats.png
new file mode 100644
index 0000000..c390ca7
--- /dev/null
+++ b/hosts/mercury/riverboats.png