Merge branch 'master' of ssh://bosco:/srv/git/.flake

8 files changed, 80 insertions, 35 deletions

diff --git a/flake.lock b/flake.lock
index 6fc9749..6cbd39b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,11 +67,11 @@
     "catppuccin-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1710265230,
-        "narHash": "sha256-ImrgF7xKD4gMBLI6m5CLChJEW82+nLJ2fVsPeZ58VVE=",
+        "lastModified": 1711793543,
+        "narHash": "sha256-8d+cGlyW0vurrww0vPETCr077JHibUQTpnTUOLjeObs=",
         "owner": "catppuccin",
         "repo": "helix",
-        "rev": "4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b",
+        "rev": "0164c4ca888084df4f511da22c6a0a664b5061d2",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
     "catppuccin-hyprland": {
       "flake": false,
       "locked": {
-        "lastModified": 1702668781,
-        "narHash": "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no=",
+        "lastModified": 1712161758,
+        "narHash": "sha256-XTqpmucOeHUgSpXQ0XzbggBFW+ZloRD/3mFhI+Tq4O8=",
         "owner": "catppuccin",
         "repo": "hyprland",
-        "rev": "fc228737d3d0c12e34a7fa155a0fc3192e5e4017",
+        "rev": "b57375545f5da1f7790341905d1049b1873a8bb3",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706981411,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "lastModified": 1710888565,
+        "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710257359,
-        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
+        "lastModified": 1711466786,
+        "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
+        "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1710816831,
-        "narHash": "sha256-8PyLk/gfMo4asjbqsoXw1I3zfnkCPSSX0r6UCJP3ctw=",
+        "lastModified": 1712348608,
+        "narHash": "sha256-iyS1dSTknppuJP+S9dLmOJctRO3aENWIHuMtid3dJ1A=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "05c84304ccb1169b550504830139e07e28500a3b",
+        "rev": "dab149e4a6291dd412b594c0faba2c44f9a74263",
         "type": "github"
       },
       "original": {
@@ -245,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "lastModified": 1711250455,
+        "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
         "type": "github"
       },
       "original": {
@@ -279,11 +279,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1710636348,
-        "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=",
+        "lastModified": 1711846064,
+        "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c",
+        "rev": "90b1a963ff84dc532db92f678296ff2499a60a87",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710722910,
-        "narHash": "sha256-P5p9+WQFuABoBXBKEK1ZYu8mD6q8j/cQwZ9OYb0oh2E=",
+        "lastModified": 1712191720,
+        "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "e63df01c798b99a76dc2ec25481be7dd25cd1610",
+        "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a",
         "type": "github"
       },
       "original": {
@@ -315,11 +315,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
+        "lastModified": 1712168706,
+        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
         "type": "github"
       },
       "original": {
@@ -346,11 +346,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1710631334,
-        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
+        "lastModified": 1712163089,
+        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
         "type": "github"
       },
       "original": {
@@ -363,11 +363,11 @@
     "nushell-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1710829462,
-        "narHash": "sha256-RsyZL5TZjrLutcPxDy2jgC1kq6PN3CSwEczdzTXK5PU=",
+        "lastModified": 1712178643,
+        "narHash": "sha256-aQBCDSN9d4t1A+5ItQtaS6cOUt6sN26NKoi5Yb0062o=",
         "owner": "doolphin",
         "repo": "nu_scripts",
-        "rev": "6bcf652c02465de388ec41706a8e58c940f2dc5b",
+        "rev": "7dff4c44724a6a511178d319a950688a274204a1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d3f90a2..fb58897 100644
--- a/flake.nix
+++ b/flake.nix
@@ -274,6 +274,7 @@
           ./modules/nixos/nix-common.nix
           ./modules/nixos/environment.nix
           ./modules/nixos/tailscale.nix
+          ./modules/nixos/cgit.nix
           ./modules/nixos/system-packages.nix
           ./modules/users/defin.nix
           ./modules/users/root.nix
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 5b4cc7c..8c81ca0 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -56,6 +56,7 @@
         yakuake
         pass
         btop
+        cava
         helvum
         filelight
         easyeffects
diff --git a/machines/doretta/configuration.nix b/machines/doretta/configuration.nix
index e911cf3..b29289e 100644
--- a/machines/doretta/configuration.nix
+++ b/machines/doretta/configuration.nix
@@ -16,6 +16,12 @@
 
   networking.hostName = "doretta"; # Define your hostname.
 
+  security.pam.enableSSHAgentAuth = true;
+
+  virtualisation.libvirtd = {
+    enable = true;
+  };
+
   # Set your time zone.
   time.timeZone = "US/Mountain";
 
@@ -43,7 +49,6 @@
 
   environment.systemPackages = with pkgs; [
     qemu
-    libvirt
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix
index 13e8e6d..b54677f 100644
--- a/modules/home-manager/bat.nix
+++ b/modules/home-manager/bat.nix
@@ -4,6 +4,7 @@
     enable = true;
     config = {
       pager = "less -FR";
+      theme = "Solarized (dark)";
       # theme = "catppuccin-mocha";
     };
     # themes = {
diff --git a/modules/nixos/cgit.nix b/modules/nixos/cgit.nix
new file mode 100644
index 0000000..177158a
--- /dev/null
+++ b/modules/nixos/cgit.nix
@@ -0,0 +1,33 @@
+{ config, ... } : { # This is for hosting on bosco
+  services.cgit = {
+    "git.myrmexia.xyz" = {
+      enable = true;
+      nginx.location = "/git/";
+      # nginx.virtualHost = "git.myrmexia.xyz";
+      settings = {
+        enable-commit-graph = 1;
+        enable-http-clone = 0;
+      };
+      repos = {
+        nixos-flake = {
+          desc = "A public repo for viewing my nixos config.";
+          path = "/srv/git/.flake.git";
+        };
+      };
+    };
+  };
+  # services.nginx.virtualHosts."git.myrmexia.xyz".listen.port = 8081;
+    # listen.port = 8081;
+  # };
+
+  # this solution is extremely hacky as it changes nginx system defaults instead of virtual host default
+  #TODO: fix
+  services.nginx.defaultHTTPListenPort = 8081;
+    # caddy = {
+    #   enable = true;
+    #   email = "devin.finlinson@pm.me";
+    #   virtualhosts."git.myrmexia.xyz".extraConfig = ''
+    #     reverse_proxy http://localhost:${toString config.services.cgit.port} ''
+    # };
+  networking.firewall.allowedTCPPorts = [8081]; 
+}
diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix
index 261dd52..d56785f 100644
--- a/modules/nixos/headscale.nix
+++ b/modules/nixos/headscale.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{config, ...}:
 let 
   domain = "myrmexia.xyz";
   subDomain = "bosco.${domain}";
diff --git a/modules/users/defin.nix b/modules/users/defin.nix
index 139845f..9d38f7b 100644
--- a/modules/users/defin.nix
+++ b/modules/users/defin.nix
@@ -22,10 +22,14 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXrt3+N4+ahtXZCUn11evQsVGsGgAohGwafC29/a4fk defin@Radahn"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICkGcmYIYCe6GHsZZvnXqsedF0wn+AhGSr+RPJtUO/kl defin@khad"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEaMYXO9ghATyUPzyE7aD/XVVmK9UAexueoGEYAqPT4L defin@kebab"
+        # keys for remote build
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLx3RgUgbE7THS7hRZypyudEKffj0ppwQfQuxIpPf8H root@zenbook"
       ];
     };
   };
 
+  nix.settings.trusted-users = [ "@builders" ];
+  security.pam.enableSSHAgentAuth = true;
   # I can't think of a better spot to put this rn.
   services.openssh = {
     ports = [ 22 2200 ]; # needed because isp blocks ssh over 22