From 5655c8a056d725790ff88631d9bcc98875ef0333 Mon Sep 17 00:00:00 2001
From: xeovalyte <me+gitea@xeovalyte.dev>
Date: Thu, 12 Sep 2024 18:39:59 +0200
Subject: [PATCH] Bunch of config changes

---
 homelab/caddy/Caddyfile              |  0
 homelab/caddy/caddyfiles/Caddyfile   |  0
 homelab/caddy/docker-compose.yml     | 19 +++++++++++++++++++
 hosts/laptop/default.nix             |  8 +++++++-
 modules/home/cli/common/shell.nix    |  8 ++++++++
 modules/home/gui/common/fonts.nix    |  1 +
 modules/home/gui/hyprland/waybar.nix |  8 ++++----
 modules/system/cli/common.nix        |  5 +++++
 modules/system/cli/docker.nix        |  8 +++++++-
 9 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 homelab/caddy/Caddyfile
 create mode 100644 homelab/caddy/caddyfiles/Caddyfile
 create mode 100644 homelab/caddy/docker-compose.yml

diff --git a/homelab/caddy/Caddyfile b/homelab/caddy/Caddyfile
new file mode 100644
index 0000000..e69de29
diff --git a/homelab/caddy/caddyfiles/Caddyfile b/homelab/caddy/caddyfiles/Caddyfile
new file mode 100644
index 0000000..e69de29
diff --git a/homelab/caddy/docker-compose.yml b/homelab/caddy/docker-compose.yml
new file mode 100644
index 0000000..4ca5248
--- /dev/null
+++ b/homelab/caddy/docker-compose.yml
@@ -0,0 +1,19 @@
+services:
+  caddy:
+    image: caddy:2.8
+    container_name: caddy
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 80:80
+      - 443:443
+      - 443:443/udp
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - ./caddyfiles:/etc/caddy/
+
+volumes:
+  caddy_data:
+  caddy_config:
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index f6eed21..b87da0f 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -38,6 +38,7 @@
     enable = true;
     efiSupport = true;
     device = "nodev";
+    configurationLimit = 32;
   };
 
   networking.hostName = "xv-laptop"; # Define your hostname.
@@ -50,7 +51,12 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  hardware.opentabletdriver.enable = true;
+  # Configure wacom tablet
+  hardware.opentabletdriver = {
+    enable = true;
+  };
+
+  services.libinput.enable = true;
 
   system.stateVersion = "24.05";
 
diff --git a/modules/home/cli/common/shell.nix b/modules/home/cli/common/shell.nix
index 19ca042..01a7aab 100644
--- a/modules/home/cli/common/shell.nix
+++ b/modules/home/cli/common/shell.nix
@@ -11,11 +11,19 @@
   };
 
   programs.bash = {
+    enable = false;
+  };
+
+  programs.zsh = {
     enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
   };
 
   programs.starship = {
     enable = true;
     enableBashIntegration = true;
+    enableZshIntegration = true;
   };
 }
diff --git a/modules/home/gui/common/fonts.nix b/modules/home/gui/common/fonts.nix
index 97233c1..7fffede 100644
--- a/modules/home/gui/common/fonts.nix
+++ b/modules/home/gui/common/fonts.nix
@@ -7,6 +7,7 @@
     noto-fonts
     fira-code
     font-awesome
+    dejavu_fonts
     (nerdfonts.override { fonts = [ "DejaVuSansMono" ]; })
   ];
 }
diff --git a/modules/home/gui/hyprland/waybar.nix b/modules/home/gui/hyprland/waybar.nix
index 9d0a6e4..a9c75b7 100644
--- a/modules/home/gui/hyprland/waybar.nix
+++ b/modules/home/gui/hyprland/waybar.nix
@@ -66,7 +66,7 @@
               "warning" = 30;
               "critical" = 15;
           };
-          "format" = "{icon}  {capacity}%";
+          "format" = "{icon} {capacity}%";
           "format-icons" = [ "" "" "" "" "" ];
         };
         "pulseaudio" = {
@@ -89,8 +89,8 @@
         "network" = {
           "interface" = "wlan0";
           "format" = "{ifname}";
-          "format-wifi" = "  {essid}";
-          "format-ethernet" = "󰊗  {ipaddr}/{cidr}";
+          "format-wifi" = " {essid}";
+          "format-ethernet" = "󰊗 {ipaddr}/{cidr}";
           "format-disconnected" = "";
           "tooltip-format" = "{ifname} via {gwaddr}";
           "tooltip-format-wifi" = "{essid} ({signalStrength}%)";
@@ -103,7 +103,7 @@
     style = ''
       * {
         /* `otf-font-awesome` is required to be installed for icons */
-        font-family: DejaVuSansM Nerd Font;
+        font-family: DejaVuSans, FontAwesome6Free; 
       }
 
       #workspaces,#window,#clock,#battery,#tray,#pulseaudio,#network {
diff --git a/modules/system/cli/common.nix b/modules/system/cli/common.nix
index 710722b..fba7103 100644
--- a/modules/system/cli/common.nix
+++ b/modules/system/cli/common.nix
@@ -8,4 +8,9 @@
     btop
     git
   ];
+
+  environment.pathsToLink = [ "/share/zsh" ];
+
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
 }
diff --git a/modules/system/cli/docker.nix b/modules/system/cli/docker.nix
index b3f01b0..80d4841 100644
--- a/modules/system/cli/docker.nix
+++ b/modules/system/cli/docker.nix
@@ -1,7 +1,13 @@
 { ... }:
 
 {
-  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+    enable = true;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
 
   users.users.xeovalyte.extraGroups = [ "docker" ];
 }