Procházet zdrojové kódy

feat(git): some new stuff

Zander Hawke před 2 měsíci
rodič
revize
64c5dfddbd

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 623 - 85
flake.lock


+ 5 - 0
flake.nix

@@ -130,6 +130,11 @@
           modules = [ ./hosts/odin ];
         };
 
+        odinVm = lib.mkSystem {
+          system = "aarch64-linux";
+          modules = [ ./hosts/odin/vm.nix ];
+        };
+
         grist = lib.mkSystem {
           system = "x86_64-linux";
           modules = [ ./hosts/odin/containers/grist.nix ];

+ 18 - 2
home/features/cli/git.nix

@@ -2,13 +2,13 @@
 
 let
   aesir = {
-    core.sshCommand = "ssh -i ~/.ssh/id_aesirdev";
+    commit.gpgSign = true;
     user = {
       email = "[email protected]";
       name = "Æsir Dev";
       signingKey = "58145313C9636027";
     };
-    commit.gpgSign = true;
+    core.sshCommand = "ssh -i ~/.ssh/id_aesirdev.pub";
   };
 
   control.user = {
@@ -27,6 +27,17 @@ let
     };
     core.sshCommand = "ssh -i ~/.ssh/zofie_architect.pub";
   };
+
+  alruna = {
+    commit.gpgSign = true;
+    gpg.format = "ssh";
+    user = {
+      email = "[email protected]";
+      name = "Alruna";
+      signingKey = "~/.ssh/id_alruna.pub";
+    };
+    core.sshCommand = "ssh -i ~/.ssh/id_alruna.pub";
+  };
 in
 
 {
@@ -57,9 +68,14 @@ in
         condition = "gitdir/i:~/workspace/zofie/**";
         contents = zofie-architect;
       }
+      {
+        condition = "gitdir/i:~/workspace/alruna/**";
+        contents = alruna;
+      }
     ];
 
     signing = {
+      format = null;
       key = "ED5EAAA8E895B23A";
       signByDefault = true;
       signer = "${pkgs.gnupg}/bin/gpg";

+ 5 - 0
home/features/cli/ssh.nix

@@ -1,6 +1,11 @@
+{
+  pkgs,
+  ...
+}:
 {
   programs.ssh = {
     enable = true;
+    package = pkgs.unstable.openssh;
     enableDefaultConfig = false;
 
     extraConfig = ''

+ 22 - 0
home/features/nvim/configs/default.nix

@@ -1,3 +1,7 @@
+{
+  pkgs,
+  ...
+}:
 {
   imports = [
     ./cmp.nix
@@ -18,6 +22,24 @@
     ./zen-mode.nix
   ];
 
+  extraPlugins = [
+    (pkgs.vimUtils.buildVimPlugin {
+      name = "markdowny.nvim";
+      src = pkgs.fetchFromGitHub {
+        owner = "antonk52";
+        repo = "markdowny.nvim";
+        rev = "37a7649";
+        hash = "sha256-f0cmEi68q4aB42WIm7nKMMwcc6KH3PXmdB3U53FdahI=";
+      };
+    })
+  ];
+
+  extraConfigLua = ''
+    require('markdowny').setup({
+      filetypes = {'markdown', 'txt'},
+    })
+  '';
+
   plugins = {
     lz-n.enable = true;
     base46.enable = true;

+ 0 - 1
home/features/nvim/configs/lspconfig.nix

@@ -111,7 +111,6 @@
       gopls.enable = true;
       html.enable = true;
       marksman.enable = true;
-      nextls.enable = true;
       nil_ls.enable = true;
       phpactor = {
         enable = true;

+ 12 - 0
home/features/nvim/configs/obsidian.nix

@@ -39,6 +39,10 @@ in
             name = "Knowledge Base";
             path = "~/workspace/thomas/knowledge";
           }
+          {
+            name = "Alruna";
+            path = "~/workspace/alruna/vault";
+          }
         ];
 
         templates.folder = "templates";
@@ -115,5 +119,13 @@ in
       end
     '') { desc = "Insert Timestamped Bullet Point"; })
 
+    (keyMap "n" "<leader>id" (mkRaw ''
+      function()
+        local date = os.date("%Y-%m-%d")
+        -- Insert the text and move the cursor to the end
+        vim.api.nvim_put({date}, "c", true, true)
+        vim.cmd("startinsert!")
+      end
+    '') { desc = "Insert Date"; })
   ];
 }

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů