modularized nix configuration; builds correctly

1 files changed, 27 insertions, 28 deletions

diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix
index d56dd69..7e2821e 100644
--- a/nix/modules/home/zsh.nix
+++ b/nix/modules/home/zsh.nix
@@ -1,41 +1,40 @@
 { lib, config, pkgs, ... }:
 {
-  enable = lib.mkDefault config.monorepo.profiles.home.enable;
-  initExtra = ''
+  programs.zsh = {
+    enable = true;
+    initExtra = ''
     umask 0077
     export EXTRA_CCFLAGS="-I/usr/include"
     source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
     export QT_QPA_PLATFORM="wayland"
     '';
 
-  localVariables = {
-    EDITOR = "emacsclient --create-frame --alternate-editor=vim";
-    INPUT_METHOD = "fcitx";
-    QT_IM_MODULE = "fcitx";
-    GTK_IM_MODULE = "fcitx";
-    XMODIFIERS = "@im=fcitx";
-    XIM_SERVERS = "fcitx";
-    WXSUPPRESS_SIZER_FLAGS_CHECK = "1";
-  };
+    localVariables = {
+      EDITOR = "emacsclient --create-frame --alternate-editor=vim";
+      INPUT_METHOD = "fcitx";
+      QT_IM_MODULE = "fcitx";
+      GTK_IM_MODULE = "fcitx";
+      XMODIFIERS = "@im=fcitx";
+      XIM_SERVERS = "fcitx";
+      WXSUPPRESS_SIZER_FLAGS_CHECK = "1";
+    };
 
-  shellAliases = {
-    c = "clear";
-    g = "git";
-    v = "vim";
-    py = "python3";
-    rb = "sudo nixos-rebuild switch --flake .#continuity";
-    nfu = "cd ~/monorepo/nix && git add . && git commit -m \"new flake lock\" &&  nix flake update";
-    usite
-    = "cd ~/monorepo/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/monorepo/publish-org-roam-ui/out ~/website_html/graph_view && rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.vars.remoteHost}:/usr/share/nginx/ret2pop/";
-    sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l";
-    i3 = "exec ${pkgs.i3-gaps}/bin/i3";
-  };
-  loginExtra = ''
-      if [[ "$(tty)" = "/dev/tty1" && -f "$HOME/.monorepo" ]]; then
+    shellAliases = {
+      c = "clear";
+      g = "git";
+      v = "vim";
+      py = "python3";
+      rb = "sudo nixos-rebuild switch --flake .#continuity";
+      nfu = "cd ~/monorepo/nix && git add . && git commit -m \"new flake lock\" &&  nix flake update";
+      usite
+      = "cd ~/monorepo/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/monorepo/publish-org-roam-ui/out ~/website_html/graph_view && rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/usr/share/nginx/ret2pop/";
+      sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l";
+      i3 = "exec ${pkgs.i3-gaps}/bin/i3";
+    };
+    loginExtra = ''
+      if [[ "$(tty)" = "/dev/tty1" ]]; then
           exec Hyprland
       fi
-      if [[ ! -f "$HOME/.monorepo" ]]; then
-        post-install
-      fi
     '';
+  };
 }