add nix-index

neovim/init.lua

@@ -95,6 +95,9 @@ endif
 ]])
 
 vim.cmd([[
+set ignorecase
+set smartcase
+set incsearch
 set number relativenumber
 set tabstop=4 softtabstop=4
 set autoindent

nix-conf/home-manager/home.nix

@@ -43,7 +43,8 @@ in
     stateVersion = myHome.stateVersion or "22.05";
   };
   home.packages = pkgs.lib.unique ([
-    pkgs.ncdu
+    # pkgs.ncdu
+    pkgs.rclone
     pkgs.htop
     pkgs.ripgrep
     pkgs.unzip
@@ -94,4 +95,9 @@ in
   # not exist in home-manager
   # have to do it at system level
   # services.ntp.enable = true; # automatic time
+  programs.nix-index = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
 }

nix-conf/secrets.nix

@@ -0,0 +1,16 @@
+let 
+  # user-specific (~/.ssh/id_ed25519.pub)
+  users = {
+    "hungtr@bao" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK+1+gps6phbZboIb9fH51VNPUCkhSSOAbkI3tq3Ou0Z";
+  };
+  # System-specific settings (/etc/ssh/ssh_hsot_ed25519_key.pub)
+  systems = {
+    "bao" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBuAaAE7TiQmMH300VRj/pYCri1qPmHjd+y9aX2J0Fs";
+  };
+  all = users // systems;
+  # stands for calculus
+  c_ = builtins;
+in {
+  "system/secrets/s3fs.age".publicKeys = c_.attrValues (all);
+  "system/secrets/_nhitrl.age".publicKeys = c_.attrValues (all);
+}

nix-conf/system/flake.lock

@@ -1,12 +1,32 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1665870395,
+        "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "a630400067c6d03c9b3e0455347dc8559db14288",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669140675,
+        "lastModified": 1671359686,
-        "narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=",
+        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c",
+        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
         "type": "github"
       },
       "original": {
@@ -17,6 +37,7 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "nixpkgs": "nixpkgs"
       }
     }

nix-conf/system/flake.nix

@@ -1,15 +1,37 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, ... }:
+  outputs = { self, nixpkgs, agenix, ... }:
-    let lib = nixpkgs.lib; in
+    let 
-    {
+      lib = nixpkgs.lib; 
+      proj_root = ./../..;
+      # TODO: Change respectively to the system or make a nix shell to alias `nix run github:ryantm/agenix -- `
+      base_modules = [
+        agenix.nixosModule
+        {
+          age.secrets.s3fs = {
+            file = ./secrets/s3fs.age;
+            # mode = "600";  # owner + group only
+            # owner = "hungtr";
+            # group = "users";
+          };
+          age.secrets._nhitrl_cred = {
+            file = ./secrets/_nhitrl.age;
+          };
+          environment.systemPackages = [agenix.defaultPackage.x86_64-linux];
+        }
+      ];
+    in {
       # Windows with NixOS WSL
       nixosConfigurations.Felia = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = base_modules ++ [
           ./wsl-configuration.nix
           {
             system.stateVersion = "22.05";
@@ -26,7 +48,7 @@
       };
       nixosConfigurations.lizzi = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = base_modules ++ [
           ./configuration.nix
           {
             system.stateVersion = "22.05";
@@ -85,7 +107,7 @@
       # Generic machine
       nixosConfigurations.pixi = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = base_modules ++ [
           ./configuration.nix
           {
             system.stateVersion = "22.05";
@@ -141,7 +163,7 @@
       };
       nixosConfigurations.nyx = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = base_modules ++ [
           ./configuration.nix
           {
             system.stateVersion = "22.05";
@@ -169,7 +191,7 @@
       };
       nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = base_modules ++ [
           ./configuration.nix
           {
             system.stateVersion = "22.05";
@@ -182,22 +204,89 @@
       nixosConfigurations.bao = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
 	      specialArgs.hostname = "bao";
-        modules = [
+        modules = base_modules ++ [
           ./configuration.nix
           # automount using s3fs
           ({config, pkgs, lib, ...}: {
-            environment.systemPackages = [pkgs.s3fs]; # s3fs-fuse
+            environment.systemPackages = [pkgs.s3fs pkgs.cifs-utils]; # s3fs-fuse
-            # Sadly, this uses systemd, so we can't put it in home-manager yet
+            # Sadly, autofs uses systemd, so we can't put it in home-manager
-            # WIP
+            # HACK: need to store secret somewhere so that root can access this
-            # services.autofs = {
+            # because autofs may run as root for now, we enforce putting the secret in this monorepo
-            #   enable = true;
+            # services.rpcbind.enable = true;
-            #   autoMaster = 
+            services.autofs = let 
-            # };
+              # confToBackendArg {lol="what"; empty=""; name_only=null;} -> "lol=what,empty=,name_only"
+              # TODO: change null -> true/false. This allows overriding & better self-documentation
+              confToBackendArg = conf: (lib.concatStringsSep ","
+                (lib.mapAttrsToList (name: value: "${name}${lib.optionalString (value != null) "=${value}"}") conf));
+
+              # mount_dest: path ("wow")
+              # backend_args: nix attrs representing the arguments to be passed to s3fs 
+              #    ({"-fstype" = "fuse"; "use_cache" = "/tmp";})
+              # bucket: bucket name (hungtr-hot)
+              #     NOTE: s3 custom provider will be provided inside
+              #    backend_args, so just put the bucket name here
+              #
+              #-> "${mount_dest} ${formatted_args} ${s3fs-bin}#${bucket}"
+              autofs-s3fs_entry = {
+                mount_dest,
+                backend_args? {"-fstype" = "fuse";}, 
+                bucket
+              }@inputs: let
+                s3fs-exec = "${pkgs.s3fs}/bin/s3fs";
+              in "${mount_dest} ${confToBackendArg backend_args} :${s3fs-exec}\#${bucket}";
+              personalStorage = [
+                (autofs-s3fs_entry {
+                  mount_dest = "hot";
+                  backend_args = {
+                    "-fstype" = "fuse";
+                    use_cache = "/tmp";
+                    del_cache = null;
+                    allow_other = null;
+                    url = ''"https://f5i0.ph.idrivee2-32.com"'';
+                    # TODO: builtins.readFile requires a Git-controlled file
+                    passwd_file = config.age.secrets.s3fs.path;
+                    # dbglevel = "debug"; # enable this for better debugging info in journalctl
+                  };
+                  bucket = "hungtr-hot";
+                })
+                (let args = {
+                  "-fstype" = "cifs";
+                  credentials = config.age.secrets._nhitrl_cred.path;
+                  user = null;
+                  uid = "1001";
+                  gid = "100";
+                  dir_mode = "0777";
+                  file_mode = "0777";
+                };
+                in "felia_d ${confToBackendArg args} ://felia.coati-celsius.ts.net/d")
+                (let args = {
+                  "-fstype" = "cifs";
+                  credentials = config.age.secrets._nhitrl_cred.path;
+                  user = null;
+                  uid = "1001";
+                  gid = "100";
+                  dir_mode = "0777";
+                  file_mode = "0777";
+                };
+                in "felia_f ${confToBackendArg args} ://felia.coati-celsius.ts.net/f")
+              ];
+              persoConf = pkgs.writeText "auto.personal" (builtins.concatStringsSep "\n" personalStorage);
+            in {
+              enable = true;
+              # Creates /perso directory with every subdirectory declared by ${personalStorage}
+              # as of now (might be stale), /perso/hot is the only mount accessible
+              # that is also managed by s3fs
+              autoMaster = ''
+                /perso file:${persoConf}
+              '';
+              timeout = 600; # default, 600 seconds (10 mins) of inactivity => unmount
+              # debug = true; # writes to more to journalctl
+            };
           })
           # GPU, sound, networking stuffs
           ({ config, pkgs, lib, ... }:
           let
-            gpu_pkgs = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils ];
+            gpu_pkgs = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils pkgs.vulkan-tools ];
             gpu_conf = {
               # openCL
               hardware.opengl = {

nix-conf/system/secrets/_nhitrl.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 ahbzMg QEQ0gfV00KEZFXSUMAnITVG2vAhS0IrnbbEXVsQRjXA
+/iXv++nOsRRmWAu4dFTmxxC7qlCjMuTYuTa6GsYgsX0
+-> ssh-ed25519 glsjZQ Lob1uedpMxsDygT/i6Pnuwi6BzdgZPAeemISakcncVM
+UddBD1YezLMeCUn4UuHGIrK68AwCIwuHAobpkJdi/3U
+-> Tx+>#u-grease ;A%8 W
+m11Fw6roG6feroJ/o5Ro8Dv1C3Piq3bGbdV78TH9Z0URPru+srdINovMvoVqjkuZ
+eHiRwb1fN0ymLRD6/WxT4ZLKbT6J5yNPCrc+
+--- 88hy3b76RX3PAc0Lfms//lhuqsi2tsqmL9gFQqUMBKM
+>%
frPåúéÚó€+÷JY`•îŽð',„ë~<7E><>ÄôʼfÝ‚Ä_
Q2A59N/ÄV·þ
ºÝ[ˆSgË3üß4Y(´cä}N[’Ò•ëJ¡ò6Uµ¯pvf/i§Ò+‘tÒTÞ^–Ø)<1A>

nix-conf/system/secrets/s3fs.age

@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 ahbzMg 6pTVLAgOY/JZVWiCFHLo8xQ4/CL6620IMaBRpqI8Wws
+CtJeQuy5VzKZhJnIH+/cjlKsAcg0RY2bhHTWVm+hUOY
+-> ssh-ed25519 glsjZQ we7RCgsnODTJ8rKYhU+9tu0DmLH+98mcQKQ3I2slikM
+G81lsFLQR9polxme1K/MU2d8Y01PrTqtzJnVq0EMJF0
+-> |-grease B\W,I9z ^Gx;$ Kk7!4,P
+0Jl5Lhx7R8YOs9S+hUtQDDpNIqBhC/MM0N7w1MCtwYtkIIIWKfY9jkJ7+Cew2Ee5
+Qb04jnE
+--- b7AXWRgK45a/91iwmwt5g+CWOlU/2f4nUDfXlg/bs9A
+¢²%;Þ3RmQÚ‹WhpÌ–VŠ;º×®¡¥VÍÚñ[zš9al¦±=cLêüva<>ëu7é,†tø±’ýUܶh^&å‰Ö¿WåJP6-ÇÒ£
n‘-ˆ¿=™]

ssh/authorized_keys

@@ -1,7 +1,7 @@
-sh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCgmng5xL/auvI2F8ufFAfId2Ey55ONHjgnKKSEWLVWkPMutXT3BCnSglNAuEVRLX2zfzg3beQd80AHTow+qro5QWI/rYfeL1QPNEwoThbRFcvtWLTlgzBGA4ejjpIF9sCPNp0sXrrQRfxRP7w4b23BcRJQcsDoaEtKGKJZ2GQIoOafkYypwcunANb54EAouZTfHEPKDr26Gfw8usc2Sae32G/80QLBF2jGabyexJjNE3F6hdJTwq5iiqIVdSr4ue82zo3M8jBdtCMDGaOliI5RWSa9iuX9o2scCGDU69Gkw7ma+JHOP/e9Z8sUz03TkjPbEnGi3EC3YAHEoDzmwqTi07hppCuzacLB5NZ9UZ1g5PzBIZR8TJTONngT08EQyGrkNv2sUnn0dtBqve5tHR04NuXy65ym7Iwl2DDVbAL0NlM4gKWzOGZ2CnSLT0WmkG2sQKU37NmS2pBJ8RXJBatUFe4vQVzqlFj39iRGIBV5XR0I9xcxDfCxBHFs3aIqAqE= hwtr@hwtr-prince
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0Z5noQn3mHy5yiN3n6YyOKRhlQT6fx4NLmI/3d4vY6 root@Fel
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClSDhyOeehUOIMdRonTDD9h7kBbzC3c/QG650S7vfhLE67UNt5tuUjazQg7pFj3O/5WnyqCpBOMJoPaSZ0S5gGdo4h4xatPUBAGDjMygKhg4VA0x7Lr3Tbc1CF8dyuRKVlB+aIWLIyLHHPL5wDao7tnvmuCGKDyaV8XFaKpzRZqAlpfn8svR90Y4wNFYr1V+F+Y6r8reB1Rph6A9BY4niDKY0MbFhvTj6VJQf++1ji0FziACVpYI9aqAcZ4ngReUtgWiIsnq5UMfrEk0vYBG/3KsYElaRig76Bucz1fBA16iAgQua1hthPifsw8vmaK5k6Q3c2SOdc5PGF6IlTfSGJ root@Fel
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD49VHCU8S6zqNsaS0SFiVqULmOWtyVOIeteYSOznzTHJ0dVjXnamuj/uVsSXRkYIIdAkABWQm9WKELUC2SBBE7DgDj+Izv3cO7QkAJ9v1cxV1P1efrTytz8XtyX++XYygxXCwZ5zyqxhSF5ZW+FO0CNRx1cNisAhF6AMzoXRsyF1dqNioitXTN0xh0xx2mR0Bb3zy1kYNZVwn1uBYyd4Hz6CBgJ7Xi6d/STXWcmc0XnEJTllNSQNEpI6vJjL62JmUPubqDjVKh4awiPRPiw9By1FGaGVtHhOZ+8AvVMTps07GNVJ+XZi1DJLmeItpiCwYsWh96HCp3lup0onLzubpP pi@raspberrypi
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFQN5Ia8rTalnQgcvdxH2n7UNNT1Tq9UvNdJeg9ziJtUkKaC6H4NM4ArOEZ60izANOQX1crAD8hmBmz1Go8/4P3VXTYlTb7eDyZqLyncOe/shBXeVVLxJWzhEj60RTgecnmNYdtRAm+9INbPW/Bvcj8U2KyaykIXZGdjIuZ7TPruHjITxZYR+dkDOoVkJuYJMdYzxyHZpylPh+HjgDDvUG3oNJtj4ri5JKwLAMyq5t5S1JcLx4rXivrKREizUMMG8LzWSfjeByTzF8+lHtUdP94ygG02v/6Jod/g6taUQS9Yu+NDFqkKjRH3H9jgyd/DVGsRw5akBWbR81DATtTprx ssh-key-2022-12-15
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCgmng5xL/auvI2F8ufFAfId2Ey55ONHjgnKKSEWLVWkPMutXT3BCnSglNAuEVRLX2zfzg3beQd80AHTow+qro5QWI/rYfeL1QPNEwoThbRFcvtWLTlgzBGA4ejjpIF9sCPNp0sXrrQRfxRP7w4b23BcRJQcsDoaEtKGKJZ2GQIoOafkYypwcunANb54EAouZTfHEPKDr26Gfw8usc2Sae32G/80QLBF2jGabyexJjNE3F6hdJTwq5iiqIVdSr4ue82zo3M8jBdtCMDGaOliI5RWSa9iuX9o2scCGDU69Gkw7ma+JHOP/e9Z8sUz03TkjPbEnGi3EC3YAHEoDzmwqTi07hppCuzacLB5NZ9UZ1g5PzBIZR8TJTONngT08EQyGrkNv2sUnn0dtBqve5tHR04NuXy65ym7Iwl2DDVbAL0NlM4gKWzOGZ2CnSLT0WmkG2sQKU37NmS2pBJ8RXJBatUFe4vQVzqlFj39iRGIBV5XR0I9xcxDfCxBHFs3aIqAqE= hwtr@hwtr-prince
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/UzKwmFsAlLoCXvOq2lsC1sr1BRDW5uPkdcYUfQ7z4JowL/pscoTV9zjfJd1hPBvHLBvn7gs7gWt0wNnJfD1Oor26VreHjhi1PZE2kovrEzjmPoz+GqMPciV+HF9XNIRwDiHlUNFPt9qJjAJXJCFhzcmT9q0JQuPlNgJtQ6+By7RgPuJczpf17IbxpheLcXqtOFcTHyRT01KijIPhAtWRlmG5dahVuu50EfpmHRYZ8nCJJqkuJ6uRbFaPE6mYLnXLSzJUdyakYnzWbCd5phpoGAuFyQZnS503CFZUOFCnNEN8QfO2DXihp7lvrzzpI6PgcpvpotSo9kYFiEuB+DRlBQcVMWL0lUk2J1JHJH83y3CxwH0pUc7E1k6FAZE4pv4x0KEvbZSvmb8jAGWZkn4HvZCwXR5wGVi22s6RCdIHvR2PCpAy+ZSjpM+2FJIqDHpxY/vo3ktM9rpeCSwp14F/iiw6nanVq/KZBpCZ2paMcAU4WreCFZiPdGsdiixYlts= hungtr@bao
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAW4E8L/zGkcqixJo1102ddqeexoBMHIhXRXpWR3dTmJtbaaVbo4+rHRsjHPvHif9CRfi+BQ8CHG3zmBjH7DZPZIRCVtkms1EDe1k/G3fEnfgYc6gboJfoTdLkVjNOtdStTi03dCA/riQqUKc7/v16R5ZXIAmNCnmMHelObCSDPzYg8psZAUk1ZZY//pnhp9JRPsC2JxsshN7HCNIED9aFgrJkvUt+wUVGjVHzyQwyR6J7m1yyoivTwdmYdulG7OriLeeNq8vkoDmLGgLSC+zKehzJYOZsH3EKuxuZjQ3J9tK/NseQOhsQglRHE/OvphMwT/J96gl9dZR/LQXp4S6hwLccTzFfs8rLaTOIK6CEpqBUuBonot/1vJP5j5E73hfkHwZO7TQKwfXtpRCxCl5Nm3cB2Y3kz5mArDiwWioVsX4qd0XR0F9MFtuTVTn2f4K/Gwr9P3XMkLWXU1+1KbQiWIg+Zf5DpQgBW5HWryZzsMcjyMC2I2BJCl6Q+V8ofSM= nixos@Felia

zk/config.toml

@@ -1,7 +1,7 @@
 [note] # Settings that reflect the creation of a new note
 language = "en"
 default-title = "Untitled"
-filename = "{{date now 'timestamp'}}" # Loyal to my current style: 202208201345
+filename = "{{format-date now 'timestamp'}}" # Loyal to my current style: 202208201345
 extension = "md" # might switch to mdx
 
 [extra]