add more vscode configs

flake.lock

@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690271650,
+        "lastModified": 1690370995,
-        "narHash": "sha256-qwdsW8DBY1qH+9luliIH7VzgwvL+ZGI3LZWC0LTiDMI=",
+        "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6dc93f0daec55ee2f441da385aaf143863e3d671",
+        "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,12 +2,21 @@
   description = "A Very Flakey Home Manager";
 
   inputs = {
+    # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    # You can access packages and modules from different nixpkgs revs
+    # at the same time. Here's a working example:
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    # Also see the 'unstable-packages' overlay at 'nix/overlays/default.nix'.
+
+    # Home manager
     home-manager = {
       url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # TODO: Add any other flake you might need
+    # hardware.url = "github.com/nixos/nixos-hardware";
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
@@ -19,29 +28,42 @@
       ];
     in
     rec {
+      # Your custom packages
+      # Accessible through 'nix build', 'nix shell', etc
       packages = forAllSystems (system:
         let pkgs = nixpkgs.legacyPackages.${system};
        in import ./nix/pkgs { inherit pkgs; }
       );
-      
+      # Devshell for bootstrapping
+      # Accessible through 'nix develop' or 'nix-shell' (legacy)
       devShells = forAllSystems (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in import ./nix/shell.nix { inherit pkgs; }
       );
         
+      # Your custom packages and modifications, exported as overlays
       overlays = import ./nix/overlays { inherit inputs; };
+      # Reusable nixos modules you might want to export
+      # These are usually stuff you would upstream into nixpkgs
       nixosModules = import ./nix/modules/nixos;
+      # Reusable home-manager modules you might want to export
+      # These are usually stuff you would upstream into home-manager
       homeManagerModules = import ./nix/modules/home-manager;
 
+      # NixOS configuration entrypoint
+      # Available through 'nixos-rebuild --flake .#your-hostname'
       nixosConfigurations = {
         pixnix = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs outputs; };
           modules = [
+            # > Our main nixos configuration file <
             ./nix/nixos/configuration.nix
           ];
         };
       };
 
+      # Standalone home-manager configuration entrypoint
+      # Available through 'home-manager --flake .#your-username@your-hostname'
       homeConfigurations = {
         "john@penguin-fw" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.x86_64-linux;
@@ -56,6 +78,19 @@
             }
           ];
         };
+        "john@penguin-duet" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.aarch64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
+          modules = [
+            ./nix/home/penguin-duet.nix
+            {
+              home = {
+                username = "john";
+                homeDirectory = "/home/john";
+              };
+            }
+          ];
+        };
       };
     };
 }

nix/home/common.nix

@@ -35,11 +35,10 @@
   programs = {
     home-manager.enable = true;
 
-    # direnv = {
+    direnv = {
-    #   enable = lib.mkDefault true;
+      enable = lib.mkDefault true;
-    #   # enableFishIntegration = true;
+      nix-direnv.enable = true;
-    #   nix-direnv.enable = true;
+    };
-    # };
 
     fish = {
       enable = true;

nix/lib/vscode.nix

@@ -1,9 +1,11 @@
-{ pkgs, lib, ... }: {
+{ outputs, pkgs, lib, ... }: {
 
-  nixpkgs.config = {
+  nixpkgs = {
+    config = {
       allowUnfree = true;
       allowUnfreePredicate = (_: true);
     };
+  };
 
   programs.vscode = {
     enable = true;
@@ -22,24 +24,96 @@
       vscodevim.vim
       yzhang.markdown-all-in-one
     ];
+    keybindings = [
+      {
+        key = "backspace";
+        command = "-markdown.extension.onBackspaceKey";
+        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && vim.mode != 'CommandlineInProgress' && vim.mode != 'EasyMotionInputMode' && vim.mode != 'EasyMotionMode' && vim.mode != 'Normal' && vim.mode != 'Replace' && vim.mode != 'SearchInProgressMode' && vim.mode != 'SurroundInputMode' && vim.mode != 'Visual' && vim.mode != 'VisualBlock' && vim.mode != 'VisualLine' && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "ctrl+shift+alt+down";
+        command = "-markdown.extension.onCopyLineDown";
+        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "ctrl+shift+alt+up";
+        command = "-markdown.extension.onCopyLineUp";
+        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "ctrl+enter";
+        command = "-markdown.extension.onCtrlEnterKey";
+        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "enter";
+        command = "-markdown.extension.onEnterKey";
+        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && vim.mode != 'CommandlineInProgress' && vim.mode != 'EasyMotionInputMode' && vim.mode != 'EasyMotionMode' && vim.mode != 'Normal' && vim.mode != 'Replace' && vim.mode != 'SearchInProgressMode' && vim.mode != 'SurroundInputMode' && vim.mode != 'Visual' && vim.mode != 'VisualBlock' && vim.mode != 'VisualLine' && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "ctrl+]";
+        command = "-markdown.extension.onIndentLines";
+        when = "editorTextFocus && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "alt+down";
+        command = "-markdown.extension.onMoveLineDown";
+        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "alt+up";
+        command = "-markdown.extension.onMoveLineUp";
+        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "ctrl+[";
+        command = "-markdown.extension.onOutdentLines";
+        when = "editorTextFocus && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "shift+enter";
+        command = "-markdown.extension.onShiftEnterKey";
+        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "shift+tab";
+        command = "-markdown.extension.onShiftTabKey";
+        when = "editorTextFocus && markdown.extension.editor.cursor.inList && !editorHasMultipleSelections && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+      {
+        key = "tab";
+        command = "-markdown.extension.onTabKey";
+        when = "editorTextFocus && markdown.extension.editor.cursor.inList && !editorHasMultipleSelections && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !inlineSuggestionVisible && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+      }
+    ];
     userSettings = {
       "diffEditor.ignoreTrimWhitespace" = false;
       "editor.acceptSuggestionOnCommitCharacter" = false;
       "editor.acceptSuggestionOnEnter" = "off";
+      "editor.detectIndentation" = false;
+      "editor.inlineSuggest.enabled" = true;
       "editor.lineNumbers" = "relative";
       "editor.renderControlCharacters" = true;
-      "editor.renderWhitespace" = "boundary";
+      "editor.renderWhitespace" = "all";
       "editor.tabCompletion" = "off";
       "editor.tabSize" = 2;
       "explorer.confirmDragAndDrop" = false;
       "files.hotExit" = "onExitAndWindowClose";
+      "files.trimTrailingWhitespace" = true;
       "git.confirmSync" = false;
       "git.ignoreLegacyWarning" = true;
+      "github.copilot.enable" = {
+        "*" = true;
+        "plaintext" = true;
+        "markdown" = true;
+        "scminput" = false;
+        "yaml" = true;
+      };
       "powershell.codeFormatting.useCorrectCasing" = true;
       "security.workspace.trust.untrustedFiles" = "open";
       "vim.statusBarColorControl" = true;
       "vim.useCtrlKeys" = false;
-      "window.restoreWindows" = "all";
+      "window.restoreWindows" = "none";
       "workbench.startupEditor" = "none";
       "workbench.colorCustomizations" = {
         "statusBar.background" = "#005f5f";
@@ -55,6 +129,5 @@
     };
   };
 
-  services.gnome-keyring.enable = true;
 }