new flake lock

diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix
index 04bd9a308a2904b8e03b7d575389345ad1167ca9..20a57490e36a7c86c2c85147d7d4e8c9e5f1ad11 100644 (file)
--- a/nix/modules/home/user.nix
+++ b/nix/modules/home/user.nix
@@ -11,6 +11,9 @@
     if [ ! -d /home/${config.monorepo.vars.userName}/org ]; then
       mkdir -p /home/${config.monorepo.vars.userName}/org
     fi
+    if [ ! -d /home/${config.monorepo.vars.userName}/src ]; then
+      mkdir -p /home/${config.monorepo.vars.userName}/src
+    fi
     touch /home/${config.monorepo.vars.userName}/org/agenda.org
     touch /home/${config.monorepo.vars.userName}/org/notes.org
     '';

diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix
index 7e2821e5df838fe057e78a7ac18c4212ed2cb6e1..a5641fd693c490e78b1a417f84b750ff69d9931b 100644 (file)
--- a/nix/modules/home/zsh.nix
+++ b/nix/modules/home/zsh.nix
@@ -27,7 +27,7 @@
       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/";
+      = "cd ~/src/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/src/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";
     };

diff --git a/nix/modules/xserver.nix b/nix/modules/xserver.nix
index c47cf65f5cde2a77997847fb1fe041744dd2c53d..0298f12a2691e94828a11da5c6599b602c22c2b4 100644 (file)
--- a/nix/modules/xserver.nix
+++ b/nix/modules/xserver.nix
@@ -7,18 +7,10 @@
     };
 
     windowManager = {
-<<<<<<< Updated upstream
-      # Backup in case wayland isn't sufficient
-      i3 = {
-       enable = true;
-       package = pkgs.i3-gaps;
-      };
-=======
        i3 = {
          enable = true;
          package = pkgs.i3-gaps;
        };
->>>>>>> Stashed changes
     };
 
     desktopManager = {