big refactor

7 files changed, 42 insertions, 19 deletions

diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
index a522872..f5f8d34 100644
--- a/nix/modules/home/default.nix
+++ b/nix/modules/home/default.nix
@@ -36,6 +36,8 @@
 	    lang-openscad.enable = lib.mkEnableOption "Enables openscad language support";
 	    lang-js.enable = lib.mkEnableOption "Enables javascript language support";
 	    lang-nix.enable = lib.mkEnableOption "Enables nix language support";
+	    lang-idris.enable = lib.mkEnableOption "Enables idris language support";
+	    lang-agda.enable = lib.mkEnableOption "Enables agda language support";
 	    lang-coq.enable = lib.mkEnableOption "Enables coq language support";
       lang-lean.enable = lib.mkEnableOption "Enables lean language support";
 	    lang-haskell.enable = lib.mkEnableOption "Enables haskell language support";
@@ -81,6 +83,7 @@
 						          gnumake
 						          bear
 						          clang-tools
+                      autotools-language-server
 					          ]) else [])
                     ++
                     (if config.monorepo.profiles.workstation.enable then (with pkgs; [
@@ -135,6 +138,15 @@
                       lean4
                     ]) else [])
 					          ++
+					          (if config.monorepo.profiles.lang-agda.enable then (with pkgs; [
+                      agda
+					          ]) else [])
+					          ++
+					          (if config.monorepo.profiles.lang-idris.enable then (with pkgs; [
+                      idris
+                      idris2Packages.idris2Lsp
+					          ]) else [])
+					          ++
 					          (if config.monorepo.profiles.lang-nix.enable then (with pkgs; [
 						          nil
 						          nixd
@@ -197,6 +209,8 @@
 	    lang-coq.enable = lib.mkDefault config.monorepo.profiles.enable;
 	    lang-lean.enable = lib.mkDefault config.monorepo.profiles.enable;
 	    lang-haskell.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-idris.enable = lib.mkDefault config.monorepo.profiles.enable;
+	    lang-agda.enable = lib.mkDefault config.monorepo.profiles.enable;
 
 	    crypto.enable = lib.mkDefault config.monorepo.profiles.enable;
 	    art.enable = lib.mkDefault config.monorepo.profiles.enable;
diff --git a/nix/modules/home/emacs.nix b/nix/modules/home/emacs.nix
index e44db8d..c5bd383 100644
--- a/nix/modules/home/emacs.nix
+++ b/nix/modules/home/emacs.nix
@@ -5,10 +5,14 @@
       enable = lib.mkDefault config.monorepo.profiles.graphics.enable;
       package = pkgs.emacs-pgtk;
       extraConfig = ''
-      (setq debug-on-error t)
-      (org-babel-load-file
-        (expand-file-name "~/monorepo/config/emacs.org"))'';
+(setq debug-on-error t)
+(setq system-email "${config.monorepo.profiles.email.email}")
+(setq system-username "${config.monorepo.vars.internetName}")
+(setq system-fullname "${config.monorepo.vars.fullName}")
+(org-babel-load-file
+  (expand-file-name "~/${config.monorepo.vars.repoName}/config/emacs.org"))'';
       extraPackages = epkgs: [
+        epkgs.agda2-mode
         epkgs.all-the-icons
         epkgs.auctex
         epkgs.catppuccin-theme
@@ -17,6 +21,7 @@
         epkgs.company-solidity
         epkgs.counsel
         epkgs.dashboard
+        epkgs.doom-themes
         epkgs.doom-modeline
         epkgs.elfeed
         epkgs.elfeed-org
@@ -39,6 +44,7 @@
         epkgs.gruvbox-theme
         epkgs.haskell-mode
         epkgs.htmlize
+        epkgs.idris-mode
         epkgs.irony-eldoc
         epkgs.ivy
         epkgs.ivy-pass
@@ -48,6 +54,7 @@
         epkgs.lsp-mode
         epkgs.lsp-haskell
         epkgs.lyrics-fetcher
+        epkgs.mastodon
         epkgs.magit
         epkgs.magit-delta
         epkgs.mu4e
diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix
index 819f1fa..dbe0b39 100644
--- a/nix/modules/home/hyprland.nix
+++ b/nix/modules/home/hyprland.nix
@@ -64,6 +64,7 @@
         "$mod, B, exec, bitcoin-qt"
         "$mod, M, exec, monero-wallet-gui"
         "$mod, V, exec, vesktop"
+        "$mod, C, exec, fluffychat"
         "$mod, D, exec, wofi --show run"
         "$mod, P, exec, bash ${scripts}/powermenu.sh"
         "$mod, Q, killactive"
diff --git a/nix/modules/home/mbsync.nix b/nix/modules/home/mbsync.nix
index 67d971a..b7c7424 100644
--- a/nix/modules/home/mbsync.nix
+++ b/nix/modules/home/mbsync.nix
@@ -3,7 +3,7 @@
   programs.mbsync = {
     enable = lib.mkDefault config.monorepo.profiles.email.enable;
     extraConfig = ''
-      IMAPAccount ret2pop
+      IMAPAccount ${config.monorepo.vars.internetName}
       Host ${config.monorepo.profiles.email.imapsServer}
       User ${config.monorepo.profiles.email.email}
       PassCmd "cat ${config.sops.secrets.mail.path}"
@@ -12,17 +12,17 @@
       AuthMechs *
       CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-      IMAPStore ret2pop-remote
-      Account ret2pop
+      IMAPStore ${config.monorepo.vars.internetName}-remote
+      Account ${config.monorepo.vars.internetName}
 
-      MaildirStore ret2pop-local
-      Path ~/email/ret2pop/
-      Inbox ~/email/ret2pop/INBOX
+      MaildirStore ${config.monorepo.vars.internetName}-local
+      Path ~/email/${config.monorepo.vars.internetName}/
+      Inbox ~/email/${config.monorepo.vars.internetName}/INBOX
       SubFolders Verbatim
 
-      Channel ret2pop 
-      Far :ret2pop-remote:
-      Near :ret2pop-local:
+      Channel ${config.monorepo.vars.internetName} 
+      Far :${config.monorepo.vars.internetName}-remote:
+      Near :${config.monorepo.vars.internetName}-local:
       Patterns *
       Create Near
       Sync All
diff --git a/nix/modules/home/pantalaimon.nix b/nix/modules/home/pantalaimon.nix
index 4645687..b523865 100644
--- a/nix/modules/home/pantalaimon.nix
+++ b/nix/modules/home/pantalaimon.nix
@@ -8,7 +8,7 @@
         SSL = true;
       };
       local-matrix = {
-        Homeserver = "https://social.nullring.xyz";
+        Homeserver = "https://matrix.${config.monorepo.vars.orgHost}";
         ListenAddress = "127.0.0.1";
         ListenPort = "8008";
       };
diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix
index 24b61da..c02d9a0 100644
--- a/nix/modules/home/user.nix
+++ b/nix/modules/home/user.nix
@@ -2,8 +2,8 @@
 {
   home = {
     activation.startup-files = lib.hm.dag.entryAfter [ "installPackages" ] ''
-    if [ ! -d "/home/${config.monorepo.vars.userName}/email/ret2pop/" ]; then
-      mkdir -p /home/${config.monorepo.vars.userName}/email/ret2pop/
+    if [ ! -d "/home/${config.monorepo.vars.userName}/email/${config.monorepo.vars.internetName}/" ]; then
+      mkdir -p /home/${config.monorepo.vars.userName}/email/${config.monorepo.vars.internetName}/
     fi
     if [ ! -d "/home/${config.monorepo.vars.userName}/music" ]; then
       mkdir -p /home/${config.monorepo.vars.userName}/music
@@ -41,7 +41,7 @@
 
       # Apps
       # octaveFull
-      vesktop grim swww vim telegram-desktop qwen-code
+      vesktop grim swww vim telegram-desktop qwen-code fluffychat
 
       # Sound/media
       pavucontrol alsa-utils imagemagick ffmpeg helvum
@@ -53,7 +53,7 @@
       torsocks tor-browser
 
       # fonts
-      nerd-fonts.iosevka noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6
+      nerd-fonts.iosevka noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 victor-mono
       (aspellWithDicts
         (dicts: with dicts; [ en en-computers en-science ]))
 
diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix
index cb4f1b0..574e6ac 100644
--- a/nix/modules/home/zsh.nix
+++ b/nix/modules/home/zsh.nix
@@ -21,6 +21,7 @@
     };
 
     shellAliases = {
+      get-channel-id = "yt-dlp --print \"%(channel_id)s\" --playlist-end 1 \"$1\"";
       se = "sops edit";
       f = "vim $(fzf)";
       e = "cd $(find . -type d -print | fzf)";
@@ -30,9 +31,9 @@
       py = "python3";
       rb = "sudo nixos-rebuild switch --flake $HOME/monorepo/nix#${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/";
+      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/${config.monorepo.vars.internetName}-website/";
       usite
-      = "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}:/var/www/ret2pop-website/";
+      = "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}:/var/www/${config.monorepo.vars.internetName}-website/";
       sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l";
       i3 = "exec ${pkgs.i3-gaps}/bin/i3";
     };