nhms switch keymap

slowed down the mouse scrolling in ghostty
Merge branch 'forgejo'
2026-04-01 23:34:39 -05:00 · 2026-04-01 23:32:28 -05:00 · 2026-04-01 20:55:17 -05:00 · 2026-04-01 20:48:38 -05:00 · 2026-04-01 20:48:07 -05:00 · 2026-04-01 20:47:20 -05:00
8 changed files with 111 additions and 43 deletions
@@ -18,11 +18,11 @@
    },
    "flake-file": {
      "locked": {
-        "lastModified": 1774666175,
-        "narHash": "sha256-WaZxvtOvVNikiNTen2Emhds2RvzFCWIb7KU9C0eWrNA=",
+        "lastModified": 1774886516,
+        "narHash": "sha256-w2LoQVM6DXrSdGUZBZqa1nYkMzHoB0t82DrptzZKhTs=",
        "owner": "vic",
        "repo": "flake-file",
-        "rev": "953d01f3ae5ba50869c5e1248062198f73e971bf",
+        "rev": "3daadf37de2bb85b0ff34e2a7ab0d71e077c2b9e",
        "type": "github"
      },
      "original": {
@@ -38,11 +38,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772408722,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1774738535,
-        "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=",
+        "lastModified": 1775080052,
+        "narHash": "sha256-jAB4ZZbx8ECu9GcE/PUUwT+wpooZ0Ssmn2imB8PVTdM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a",
+        "rev": "6267895e9898399f0ce2fe79b645e9ee4858aaff",
        "type": "github"
      },
      "original": {
@@ -184,11 +184,11 @@
    "nixos-hardware": {
      "flake": false,
      "locked": {
-        "lastModified": 1774777275,
-        "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=",
+        "lastModified": 1774933469,
+        "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd",
+        "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337",
        "type": "github"
      },
      "original": {
@@ -199,11 +199,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1774106199,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "lastModified": 1774709303,
+        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
        "type": "github"
      },
      "original": {
@@ -215,11 +215,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1774701658,
-        "narHash": "sha256-5QVei2IIfVO3GqMkiiXlrZtaniOkXyMWnqbTVkItrco=",
-        "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
+        "lastModified": 1775064974,
+        "narHash": "sha256-PqhsO5qloSyvATi9qAIrgUcEFK67xSoacjacPw+t4H0=",
+        "rev": "6ebfbc38bdc6b22822a6f991f2d922306f33cfbc",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre971056.b63fe7f000ad/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre973084.6ebfbc38bdc6/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@@ -254,11 +254,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1774736237,
-        "narHash": "sha256-uQ+Was7QP9Bupr0XZyZXOAD32Ox8z2mJnevT2FmDwS8=",
+        "lastModified": 1774852850,
+        "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "a0636d5c977743851c91d3c2e74bfac90be48835",
+        "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef",
        "type": "github"
      },
      "original": {
@@ -281,7 +281,8 @@
        ],
        "nvf": "nvf",
        "sops-nix": "sops-nix",
-        "wrapper-modules": "wrapper-modules"
+        "wrapper-modules": "wrapper-modules",
+        "wrappers": "wrappers"
      }
    },
    "sops-nix": {
@@ -291,11 +292,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774760784,
-        "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=",
+        "lastModified": 1774910634,
+        "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
+        "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
        "type": "github"
      },
      "original": {
@@ -339,11 +340,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1774767209,
-        "narHash": "sha256-bJxBN+ebX3yZj+KT/c+LeA4xIpoNghG233szgRFAWOc=",
+        "lastModified": 1774879171,
+        "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
        "owner": "BirdeeHub",
        "repo": "nix-wrapper-modules",
-        "rev": "70795f6eb74a69d736e41ee837cd7e1a6d46c0aa",
+        "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
        "type": "github"
      },
      "original": {
@@ -351,6 +352,26 @@
        "repo": "nix-wrapper-modules",
        "type": "github"
      }
+    },
+    "wrappers": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1774293387,
+        "narHash": "sha256-yVekLWxKTUfUyuvo9HVihtOK8llIP3IZCrJmftxT+Nc=",
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "rev": "3cf1e8371129e8746d37c863c5d56a81fb16caa0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lassulus",
+        "repo": "wrappers",
+        "type": "github"
+      }
    }
  },
  "root": "root",
@@ -30,5 +30,9 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
+    wrappers = {
+      url = "github:lassulus/wrappers";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };
 }
@@ -37,6 +37,8 @@
              ROOT_URL = "https://forgejo.john-stream.com";
              PROTOCOL = "https";
              COOKIE_SECURE = true;
+              KEY_FILE = config.mtls.keyFile;
+              CERT_FILE = config.mtls.certFile;
            })
          ];

@@ -41,6 +41,7 @@
        busybox
        dig
        samba
+        my-neovim
      ];

      security.pam.services.swaylock = {};
@@ -123,6 +124,7 @@
          home.packages = with pkgs; [
            bash
            discord
+            my-neovim
          ];
          ssh.matchSets = {
            appdaemon = true;
@@ -64,6 +64,7 @@ in

        environment.systemPackages = [
          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.janus-ca
+          inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.my-neovim
        ];

        forgejo.enable = true;
@@ -43,6 +43,7 @@
        shell-integration = "zsh";
        shell-integration-features = [ "no-title" "sudo" ];
        gtk-single-instance = true;
+        mouse-scroll-multiplier = 0.375;

        window-position-x = 25;
        window-position-y = 25;
@@ -6,7 +6,7 @@
    };
  };

-  perSystem = { system, pkgs, ... }: {
+  perSystem = { system, pkgs, config, ... }: {
    packages.my-neovim = ((inputs.nvf.lib.neovimConfiguration {
      inherit pkgs;
      modules = [
@@ -32,17 +32,28 @@
            theme.name = "catppuccin";
            theme.style = "mocha";

-            git = {
-              enable = true;
-            };
+            git.enable = true;
+            # git.neogit.enable = true;
+
+            # https://github.com/akinsho/toggleterm.nvim
+            terminal.toggleterm.enable = true;
+            terminal.toggleterm.lazygit.enable = true;
+            terminal.toggleterm.lazygit.direction = "float";
+            terminal.toggleterm.lazygit.mappings.open = "<C-g>";
+
+
+            utility.nix-develop.enable = true;
+
+            utility.oil-nvim.enable = true;
+            utility.oil-nvim.gitStatus.enable = true;

            filetree.neo-tree = {
              enable = true;
            };

-            lazy = {
-              enable = true;
-            };
+            # lazy = {
+            #   enable = true;
+            # };

            # globals = {
            #   SimpylFold_docstring_preview = 1;
@@ -102,16 +113,38 @@

            keymaps = [
              {
-                key = "<leader>fd";
-                mode = "n";
+                desc = "Edit key mappings";
+                key = "<leader>ekm";
+                mode = [ "n" ];
                silent = false;
-                action = ":Telescope find_files";
+                action = "<cmd>:edit +/keymaps /home/john/.config/home-manager/jsl-dendritic/modules/programs/neovim.nix<CR>";
              }
              {
-                key = "<C-b>";
+                desc = "Home Manager Switch";
+                key = "<leader>nhms";
+                mode = [ "n" ];
+                silent = false;
+                action = "<cmd>:TermExec cmd='clear && nhms && exit' name='Nix Home Manager Switch' direction=float<CR>";
+              }
+              {
+                desc = "Key Maps [Telescope]";
+                key = "<leader>fkm";
                mode = "n";
-                silent = true;
-                action = ":Neotree";
+                silent = false;
+                action = "<cmd>:Telescope keymaps<CR>";
+              }
+              {
+                desc = "Toggle Filesystem Tree [NeoTree]";
+                key = "<C-b>";
+                mode = [ "n" "v" "t" ];
+                silent = false;
+                action = "<cmd>:Neotree toggle filesystem left action=show<CR>";
+              }
+              {
+                key = "<C-`>";
+                mode = ["n" "v" "t"];
+                silent = false;
+                action = "<cmd>:ToggleTerm<CR>";
              } 
            ];
          };
@@ -127,6 +127,10 @@ in

        matchBlocks = lib.mkMerge [
          {
+            "john-pc-ubuntu" = {
+              hostname = "192.168.1.85";
+            };
+
            "*" = lib.mkMerge [
              {
                user = "john";
Author	SHA1	Message	Date
John Lancaster	9b51398ceb	nhms switch keymap	2026-04-01 23:34:39 -05:00
John Lancaster	2a97dbf7ca	slowed down the mouse scrolling in ghostty	2026-04-01 23:32:28 -05:00
John Lancaster	d7e32c0a2f	Merge branch 'forgejo'	2026-04-01 20:55:17 -05:00
John Lancaster	76cb1d078b	added key and cert files to https config in forgejo	2026-04-01 20:48:38 -05:00
John Lancaster	fb7750235f	added my-neovim to soteria	2026-04-01 20:48:07 -05:00
John Lancaster	4c90263866	flake.lock update	2026-04-01 20:47:20 -05:00
John Lancaster	cf02260941	my-neovim shortcuts	2026-03-31 23:11:23 -05:00
John Lancaster	609d2a5cca	p14 ssh config	2026-03-31 23:09:32 -05:00