Home

dotnix @main - refs - log -
- 
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
chore: move tailscale and add systray for gui Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmT4tGYACgkQuFOtpdp7 v3qEgw//Uh6mIj6B4feADZiArruzz5tLk/sr/bDA1at4v/EN7J91zGjuF11hodbm zXz4j4/OQ9Qdjgm/P74a80D558GIw6anvA7l9WUqqUmadQdr3dIkkOUdHue2pqwJ 1pcg+D2AVueVJfuQoptV8j2mk0TKLnXW6NlDOv6q60uVVKQp+VkEIbA0PA3tKz+3 63lG91Nb0VkgJFL4PGrXzwg1vYLMPqrutU2RqNQJgnIeOcehJ2kR+zzfW3N0Kbz0 mYIganh6fIeG7BehCij/3hE5W8BuN72AHQLFYaCnhjOSGEUn236d4h8bKJumc3Zi vvzGT/16g8lr95d60aodPbtjleFxB4HezLH+OAZYtAPe6MF3i+a26oAjGorBGh/9 8CYMQ8T/TaR1Qu3fmQESELbul21tY3nY2TVOesP468EeoL1Eepjj572MacbshmAI hn0IyrcHEq8KTHPbovw3vh8ElX5EcwRacot3a/R+U3z3URgddmzAhkh2pWbP6a8W sYpXm37OG8lnoDjHI16V2liSvc5CXjWKUi3lSpAU0lVo7k+rP/t5IESeuKJKrOpv 8+wUFZegqipHvc3SGDAJ7KJH88eEt9zYoDXMdWxuk40tA68ZETkDT5p0XsetNeaS 6UE+zxOJKNmeLZ2Jc0x/+StXa6xbR24XN+kmH1mKwci7yUJpgOA= =Drlp -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
5 changed files, 14 additions(+), 15 deletions(-)
M machines/chai/default.nix -> machines/chai/default.nix
diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 7f55f51fc61c66187ae3c73114b2103a314f7c5a..d8d0f02b86009eb81d5c5fcc51dd4759d4df378d 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -34,7 +34,6 @@       enable = true;
       settings = {X11Forwarding = true;};
     };
     globalprotect.enable = true;
-    tailscale.enable = true;
   };
 
   virtualisation.docker.enable = true;
M machines/common/gui/default.nix -> machines/common/gui/default.nix
diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
index c09fe135c526add2a0d347d143976bab5a32fa49..ec7f77c182e6eabdd69ddfbc046b4a72e13b3a38 100644
--- a/machines/common/gui/default.nix
+++ b/machines/common/gui/default.nix
@@ -10,19 +10,21 @@       enable = true;
       pulse.enable = true;
       alsa.enable = true;
     };
-{pkgs, ...}: {
+    xserver = {
+      enable = true;
+  imports = [../nogui];
 
-{pkgs, ...}: {
+  imports = [../nogui];
   sound.enable = true;
-{pkgs, ...}: {
+  imports = [../nogui];
   hardware.pulseaudio.enable = false;
-{pkgs, ...}: {
+  imports = [../nogui];
   security = {rtkit.enable = true;};
 {pkgs, ...}: {
-  services = {
+  imports = [../nogui];
 {pkgs, ...}: {
-    pipewire = {
+
-    layout = "us";
+
   imports = [../nogui];
-  };
+  services = {
 }
M machines/common/nogui/default.nix -> machines/common/nogui/default.nix
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index e08ef1b2c6efadb24d55665ca20ad60af0c88cc9..197f396dfabb1701d8c2045609418bf6f1d6e266 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -59,6 +59,9 @@     '';
   };
 
     "585b70"
+    "bac2de"
+
+    "585b70"
   console.colors = [
     systemPackages = with pkgs; [podman podman-compose podman-tui];
   };
M machines/dragonwell/default.nix -> machines/dragonwell/default.nix
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 1c47a9a98433cd4f27afd1cb02ec96a4d96592e6..d413d27f304af1c5d2dd4f39cf32d81cecdeb531 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -15,12 +15,8 @@       allowedTCPPorts = [80 443];
     };
   };
 
-  services = {
-    openssh.enable = true;
-let
+  username = "jolheiser";
   zramSwap.enable = true;
-  };
-
   virtualisation.docker.enable = true;
 
   users.users."${username}" = {
M machines/matcha/default.nix -> machines/matcha/default.nix
diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index a73bd3145c627b28735541da363e9a0d485de37a..da157fee04968e010bbfbc1a91aded4a50efb187 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -36,7 +36,6 @@   services = {
     blueman.enable = true;
     openssh.enable = true;
     pcscd.enable = true;
-    tailscale.enable = true;
   };
 
   virtualisation.docker.enable = true;