From 79d07a5bfd553ba9e863c056f063614068e8286c Mon Sep 17 00:00:00 2001
From: Timo Boomers <me+gitea@xeovalyte.dev>
Date: Sun, 22 Jun 2025 10:09:41 +0200
Subject: [PATCH] Changed some configs

---
 hosts/ti-clt-dsk01/configuration.nix          | 14 +-------
 hosts/ti-clt-lpt01/configuration.nix          | 24 -------------
 .../desktop-environments/niri/default.nix     | 26 +++++++++++---
 .../home/desktop-environments/niri/waybar.nix | 36 ++++++++++++++++---
 modules/home/theming/stylix.nix               |  2 +-
 5 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/hosts/ti-clt-dsk01/configuration.nix b/hosts/ti-clt-dsk01/configuration.nix
index 85199b1..e4e0183 100644
--- a/hosts/ti-clt-dsk01/configuration.nix
+++ b/hosts/ti-clt-dsk01/configuration.nix
@@ -1,4 +1,4 @@
-{ inputs, outputs, pkgs, ... }:
+{ inputs, outputs, pkgs, lib, ... }:
 
 {
 	imports = [
@@ -77,18 +77,6 @@
     ];
   };
 
-  # Setup nfs share
-  services.nfs = {
-    server = {
-      enable = true;
-      exports = ''
-        /export 192.168.100.0/24(rw,fsid=0,no_subtree_check)
-        /export/wrb 192.168.100.0/24(rw,nohide,no_subtree_check)
-      '';
-    };
-  };
-  networking.firewall.allowedTCPPorts = [ 2049 ];
-
   # Temp keyboard override
   environment.systemPackages = with pkgs; [
     via
diff --git a/hosts/ti-clt-lpt01/configuration.nix b/hosts/ti-clt-lpt01/configuration.nix
index 3ca1bc1..74aeb7a 100644
--- a/hosts/ti-clt-lpt01/configuration.nix
+++ b/hosts/ti-clt-lpt01/configuration.nix
@@ -73,30 +73,6 @@
     ];
   };
 
-  # Create samba share
-  services.samba = {
-    enable = true;
-    securityType = "user";
-    openFirewall = true;
-    settings = {
-      "public" = {
-        "path" = "/home/xeovalyte/Public";
-        "browseable" = "yes";
-        "read only" = "no";
-        "guest ok" = "yes";
-        "create mask" = "0644";
-        "directory mask" = "0755";
-        "force user" = "xeovalyte";
-        "force group" = "xeovalyte";
-      };
-    };
-  };
-
-  services.samba-wsdd = {
-    enable = true;
-    openFirewall = true;
-  };
-
   networking.firewall = {
     enable = true;
     allowedTCPPorts = [ 22 80 443 53 ];
diff --git a/modules/home/desktop-environments/niri/default.nix b/modules/home/desktop-environments/niri/default.nix
index 3272117..0231e67 100644
--- a/modules/home/desktop-environments/niri/default.nix
+++ b/modules/home/desktop-environments/niri/default.nix
@@ -59,13 +59,29 @@ in {
     };
 
     programs.niri.settings.workspaces = {
-      "gen" = { open-on-output = "DP-1"; };
-      "web" = { open-on-output = "HDMI-A-1"; };
-      "com" = { open-on-output = "HDMI-A-1"; };
-      "dev" = { open-on-output = "DP-1"; };
-      "mus" = { open-on-output = "HDMI-A-1"; };
+      "00-app" = { name = "app"; open-on-output = "DP-1"; };
+      "01-term" = { name = "term"; open-on-output = "DP-1"; };
+      "10-web" = { name = "web"; open-on-output = "HDMI-A-1"; };
+      "11-mus" = { name = "mus"; open-on-output = "HDMI-A-1"; };
+      "12-com" = { name = "com"; open-on-output = "HDMI-A-1"; };
     };
 
+    # Default startup applications
+    programs.niri.settings.spawn-at-startup = [
+      { command = ["vesktop"]; }
+      { command = ["thunderbird"]; }
+    ];
+    
+    programs.niri.settings.window-rules = [
+      {
+        matches = [
+          { at-startup = true; app-id = "vesktop"; }
+          { at-startup = true; app-id = "thunderbird"; }
+        ];
+        open-on-workspace = "com";
+      }
+    ];
+
     programs.niri.settings.binds = with config.lib.niri.actions; {
       "Mod+Shift+Slash".action = show-hotkey-overlay;
 
diff --git a/modules/home/desktop-environments/niri/waybar.nix b/modules/home/desktop-environments/niri/waybar.nix
index 61078cd..56bed5d 100644
--- a/modules/home/desktop-environments/niri/waybar.nix
+++ b/modules/home/desktop-environments/niri/waybar.nix
@@ -29,21 +29,49 @@ in {
         position = "top";
         modules-left = [
           "niri/workspaces"
-          "niri/window"
         ];
         modules-center = [
           "clock"
         ];
         modules-right = [
           "tray"
-          "network"
           "pulseaudio"
         ];
+
+        "clock" = {
+          "format" = "{:%H:%M - %a, %d %b %Y}";
+        };
+
+        "tray" = {
+          "spacing" = 8;
+        };
       };
     };
 
-    programs.waybar.style = ''
-      
+    programs.waybar.style = /* css */''
+      #workspaces button {
+        padding: 0 5px;
+        background: transparent;
+        color: @base05;
+        border-bottom: 2px solid transparent;
+        border-radius: 0;
+      }
+
+      window#waybar>box {
+        padding: 0 5px;
+      }
+
+      #workspaces button.active {
+        border-bottom: 2px solid @base05;
+      }
+
+      #tray {
+        padding: 0 5px;
+      }
+
+      #network {
+        padding: 0 5px;
+      }
     '';
   };
 }
diff --git a/modules/home/theming/stylix.nix b/modules/home/theming/stylix.nix
index de8b88f..ba285b7 100644
--- a/modules/home/theming/stylix.nix
+++ b/modules/home/theming/stylix.nix
@@ -42,7 +42,7 @@ in {
     stylix.base16Scheme = lib.mkIf (cfg.theme != "theme") "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
 
     stylix.autoEnable = true;
-    stylix.opacity.terminal = 0.95;
+    # stylix.opacity.terminal = 0.9;
 
     stylix.cursor = {
       package = pkgs.phinger-cursors;