Merge branch 'main' of https://github.com/developing-today/code

developing-today · Oct 16, 2023 · 21f4ecf · 21f4ecf
2 parents a8edd83 + 6aa13ca
commit 21f4ecf
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 27 deletions.
diff --git a/build/nixos/unmanaged/laptop-framework/flake.nix b/build/nixos/unmanaged/laptop-framework/flake.nix
@@ -143,8 +143,6 @@
         ++ homeManagerNixosModules;
     };
   };
-  # cachix
-  # binary cache
+  # hydra
   # content addressible
-  # nixos cache
 }
diff --git a/...d/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/config/modules/plugins.nix b/...d/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/config/modules/plugins.nix
@@ -60,10 +60,21 @@
     };
     lspkind = {};
     treesitter = {};
-    harpoon.keymaps.addFile = "<leader>a";
+    harpoon.keymaps = {
+      addFile = "<leader>a";
+      toggleQuickMenu = "<leader>s";
+      navFile = {
+        "1" = "<C-j>";
+        "2" = "<C-k>";
+        "3" = "<C-l>";
+        "4" = "<C-m>";
+      };
+    };
     gitsigns = {};
     lualine = {};
     telescope = {};
+    #copilot-lua = {};
+    copilot-vim = {};
     lsp = {
       servers = {
         bashls = {};

diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.lock b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.lock
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/users/user.nix b/build/nixos/unmanaged/laptop-framework/flakes/home/users/user.nix
@@ -265,7 +265,7 @@
         docker-compose
         direnv
         pavucontrol
-        pulseaudio
+        #pulseaudio
         dunst
         cmake
         #         gcc
@@ -745,7 +745,7 @@
         rustfmt
         rufo
         black
-        terraform
+        #terraform
         packer
         consul
         vault

diff --git a/build/nixos/unmanaged/laptop-framework/modules/configuration.nix b/build/nixos/unmanaged/laptop-framework/modules/configuration.nix
@@ -94,7 +94,7 @@ in {
   hardware = {
     #     bluetooth.enable = true;
     brillo.enable = false;
-    pulseaudio.enable = false;
+    # pulseaudio.enable = false;
     #     nvidia = {
     #       # Enable modesetting for Wayland compositors (hyprland)
     #       modesetting.enable = true;