big update; fix vps and streamline some stuff

6 files changed, 26 insertions, 27 deletions

diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix
index 5439682..caeb1f7 100644
--- a/nix/modules/configuration.nix
+++ b/nix/modules/configuration.nix
@@ -78,7 +78,7 @@
 
     loader = {
   	  systemd-boot.enable = lib.mkForce (! config.monorepo.profiles.grub.enable);
-  	  efi.canTouchEfiVariables = lib.mkDefault (! config.monorepo.profiles.grub.enable);
+  	  efi.canTouchEfiVariables = lib.mkForce (! config.monorepo.profiles.grub.enable);
     };
 
     kernelModules = [
@@ -273,7 +273,7 @@
 
     auditd.enable = true;
     audit.enable = true;
-    chromiumSuidSandbox.enable = true;
+    chromiumSuidSandbox.enable = (! config.monorepo.profiles.ttyonly.enable);
     sudo.enable = true;
   };
 
diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
index 614373b..52174a9 100644
--- a/nix/modules/home/default.nix
+++ b/nix/modules/home/default.nix
@@ -175,26 +175,26 @@
 
     monorepo.profiles = {
 	    enable = lib.mkDefault true;
-	    music.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    hyprland.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    email.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
+	    music.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    hyprland.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    email.enable = lib.mkDefault config.monorepo.profiles.enable;
 
 	    # Programming
-      graphics.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-c.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-rust.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-python.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-sol.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-sh.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-openscad.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-js.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-nix.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-coq.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    lang-haskell.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
+      graphics.enable = lib.mkDefault  config.monorepo.profiles.enable;
+	    lang-c.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-rust.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-python.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-sol.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-sh.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-openscad.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-js.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-nix.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-coq.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-haskell.enable = lib.mkDefault config.monorepo.profiles.enable;
 
-	    crypto.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    art.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
-	    workstation.enable = lib.mkDefault (true && config.monorepo.profiles.enable);
+	    crypto.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    art.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    workstation.enable = lib.mkDefault config.monorepo.profiles.enable;
     };
   };
 }
diff --git a/nix/modules/home/fcitx.nix b/nix/modules/home/fcitx.nix
index 05dd8f7..bedfdf2 100644
--- a/nix/modules/home/fcitx.nix
+++ b/nix/modules/home/fcitx.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   i18n.inputMethod = {
-    enabled = "fcitx5";
+    type = "fcitx5";
+    enable = lib.mkDefault config.monorepo.profiles.graphics.enable;
     fcitx5.addons = with pkgs; [
       fcitx5-gtk
       fcitx5-chinese-addons
diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix
index 0864baf..1e88b75 100644
--- a/nix/modules/home/user.nix
+++ b/nix/modules/home/user.nix
@@ -104,5 +104,4 @@ nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-
   };
 
   fonts.fontconfig.enable = true;
-  nixpkgs.config.cudaSupport = lib.mkDefault config.monorepo.profiles.cuda.enable;
 }
diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix
index 31c7680..9f848bc 100644
--- a/nix/modules/home/zsh.nix
+++ b/nix/modules/home/zsh.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, systemHostName, ... }:
 {
   programs.zsh = {
     enable = true;
@@ -25,8 +25,7 @@
       g = "git";
       v = "vim";
       py = "python3";
-      rb = "sudo nixos-rebuild switch --flake .#continuity";
-      rba = "sudo nixos-rebuild switch --flake .#affinity";
+      rb = "sudo nixos-rebuild switch --flake .#${systemHostName}";
       nfu = "cd ~/monorepo/nix && git add . && git commit -m \"new flake lock\" &&  nix flake update";
       usync =  "rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/var/www/ret2pop-website/";
       usite
diff --git a/nix/modules/xserver.nix b/nix/modules/xserver.nix
index aab138d..0d5b29c 100644
--- a/nix/modules/xserver.nix
+++ b/nix/modules/xserver.nix
@@ -1,9 +1,9 @@
 { lib, config, pkgs, ... }:
 {
   services.xserver = {
-    enable = lib.mkDefault true;
+    enable = (! config.monorepo.profiles.ttyonly.enable);
     displayManager = {
-      startx.enable = true;
+      startx.enable = (! config.monorepo.profiles.ttyonly.enable);
     };
 
     windowManager = {