m

6 files changed, 47 insertions, 24 deletions

diff --git a/flake.nix b/flake.nix
index 07142b4..e0a9af7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,6 +109,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # quickshell = {
+    #   # remove ?ref=v0.1.0 to track the master branch
+    #   url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=v0.1.0";
+
+    #   # THIS IS IMPORTANT
+    #   # Mismatched system dependencies will lead to crashes and other issues.
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
     # determinate systems patched nix. supposedly for enterprise
     # determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
   };
diff --git a/hosts/cloud/sortug/gitea.nix b/hosts/cloud/sortug/gitea.nix
index a25773a..f86ab5d 100644
--- a/hosts/cloud/sortug/gitea.nix
+++ b/hosts/cloud/sortug/gitea.nix
@@ -1,27 +1,40 @@
-{ config, ...}:
-{
-  services.gitea = {
+{...}: {
+  # services.gitea = {
+  #   enable = true;
+  #   user = "git";
+  #   appName = "Sortug Git";
+  #   settings.server = {
+  #     domain = "git.sortug.com";
+  #     ROOT_URL = "https://git.sortug.com/";
+  #     SSH_PORT = 5522;
+  #   };
+  #   lfs.enable = true;
+  # };
+
+  # users.users = {
+  #   git = {
+  #     description = "Gitea Service";
+  #     home = "/var/lib/gitea";
+  #     useDefaultShell = true;
+  #     group = "gitea";
+  #     isSystemUser = true;
+  #   };
+  # };
+
+  services.gitolite = {
     enable = true;
-    user = "git";
-    appName = "Sortug Git"; 
-    settings.server = {
-      domain = "git.sortug.com";
-      ROOT_URL = "https://git.sortug.com/";
-      SSH_PORT = 5522;
-    };
-    lfs.enable = true;
+    adminPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICbdwmBis6Ss6xuDFvIsBE4foQfYECgl0pR60sIzLNtV";
   };
-  
-  users.users = {
-    git = {
-      description = "Gitea Service";
-      home = "/var/lib/gitea";
-      useDefaultShell = true;
-      group = "gitea";
-      isSystemUser = true;
+  services.cgit.y = {
+    # user = "gitolite";
+    enable = true;
+    extraConfig = ''
+      robots=noindex
+    '';
+    scanPath = "/var/lib/gitolite/repositories";
+    nginx = {
+      virtualHost = "git.sortug.com";
+      location = "/";
     };
   };
-
-
-
 }
diff --git a/hosts/cloud/sortug/mail.nix b/hosts/cloud/sortug/mail.nix
index ef10866..68a960a 100644
--- a/hosts/cloud/sortug/mail.nix
+++ b/hosts/cloud/sortug/mail.nix
@@ -6,6 +6,7 @@
   # services.dovecot2.sieve.extensions = ["fileinto"];
   mailserver = {
     enable = true;
+    stateVersion = 1;
     fqdn = "mail.sortug.com";
     domains = ["sortug.com" "yago.onl"];
     # workaround
diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index 922c55b..e59d3f1 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -52,5 +52,6 @@
     siyuan
     inputs.zen-browser.packages.${pkgs.system}.default
     qimgv
+    # inputs.quickshell.packages.${pkgs.system}.default
   ];
 }
diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 8de0450..c33bf23 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -105,6 +105,7 @@
     #    espeak-ng-data
     wineWowPackages.waylandFull
     libcamera # pipewire seems to want this
+    tracy # cool system watcher
   ];
   services.speechd.enable = true;
 
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 8be4a62..ea9e916 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -53,6 +53,7 @@
       direnv
       nix-direnv
       devenv
+      devbox
       # inputs.devenv.packages.${pkgs.system}.default
       # scraping
       python312Packages.yt-dlp
@@ -70,8 +71,6 @@
       codex
       claude-code
       nushell
-
-      # argh
     ]
     ++ lib.optionals pkgs.stdenv.isLinux [
       # linuxKernel.packages.linux_latest_libre.cpupower