aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorPreston Pan <ret2pop@gmail.com>2025-02-01 18:44:15 -0800
committerPreston Pan <ret2pop@gmail.com>2025-02-01 18:44:15 -0800
commit9e4f938d03c72bdcd81b020ab5276b969023a7e3 (patch)
tree172da674e125d39a8a862e279b281ccb8cd14f30 /nix
parent6cc309ef83350418f4d7f11672de83d1e8019e85 (diff)
new flake lock
Diffstat (limited to 'nix')
-rw-r--r--nix/modules/home/user.nix3
-rw-r--r--nix/modules/home/zsh.nix2
-rw-r--r--nix/modules/xserver.nix8
3 files changed, 4 insertions, 9 deletions
diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix
index 04bd9a3..20a5749 100644
--- 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 7e2821e..a5641fd 100644
--- 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 c47cf65..0298f12 100644
--- 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 = {