nvf testing

flake.lock

@@ -257,7 +257,7 @@
     },
     "fenix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
@@ -383,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760948891,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -674,11 +674,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1758834834,
-        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
+        "lastModified": 1770419553,
+        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
+        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
         "type": "github"
       },
       "original": {
@@ -716,18 +716,22 @@
     },
     "ndg": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nvf",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1765435293,
-        "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=",
+        "lastModified": 1776882296,
+        "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971",
+        "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
         "type": "github"
       },
       "original": {
         "owner": "feel-co",
+        "ref": "refs/tags/v2.6.0",
         "repo": "ndg",
         "type": "github"
       }
@@ -865,22 +869,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1764242076,
-        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1677063315,
         "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
@@ -948,16 +936,15 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1765537745,
-        "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=",
+        "lastModified": 1776987992,
+        "narHash": "sha256-hcAGb1ZH8AXFjy0UefPIgj0GCSKaaKXWU4kfPJtHutA=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0",
+        "rev": "26b98908d9c1a3260724dc5fabd16f3da1e6ba6c",
         "type": "github"
       },
       "original": {
         "owner": "notashelf",
-        "ref": "v0.8",
         "repo": "nvf",
         "type": "github"
       }

flake.nix

@@ -40,7 +40,7 @@
       url = "github:Maroka-chan/VPN-Confinement";
     };
     nvf = {
-      url = "github:notashelf/nvf/v0.8";
+      url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     autoaspm = {

hosts/darwin/cen-it-07/configuration.nix

@@ -21,9 +21,11 @@
     work.enable = true;
     apps.enable = true;
     gaming.enable = true;
+    ssh.enable = true;
   };
   
  
+
   # import home grown host specific home-manager modules
   home-manager.users.bhelderman.imports = [
     ../../../users/blake/hosts/cen-it-07.nix

modules/darwin/apps/default.nix

@@ -29,6 +29,7 @@ in {
       casks = [
         "gnucash"
         "utm"
+        "neovide-app"
         "libreoffice"
         "firefox"
         "grandperspective"

modules/darwin/default.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [
-#    ./ssh
+    ./ssh
     ./tailscale
     ./syncthing
     ./yubikey

modules/darwin/ssh/default.nix

@@ -0,0 +1,52 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  service = "ssh";
+  cfg = config.darwin.${service};
+in {
+  options.darwin.${service} = {
+    enable = lib.mkEnableOption "installs generally wanted apps";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+#    environment.systemPackages = with pkgs; [
+#      uhhh
+#    ];
+	
+    programs.ssh = {
+      extraConfig = ''
+
+        Host bebe
+          User root
+          HostName 10.10.0.1
+        Host git.blakedheld.xyz
+          Port 7567
+          User gitea
+        Host git.snowbelle.lan
+          Port 7567
+          User gitea
+        
+        Host *
+          ForwardAgent no
+          ServerAliveInterval 0
+          ServerAliveCountMax 3
+          Compression no
+          AddKeysToAgent no
+          HashKnownHosts no
+          UserKnownHostsFile ~/.ssh/known_hosts
+          ControlMaster no
+          ControlPath ~/.ssh/master-%r@%n:%p
+          ControlPersist no
+          IdentityFile /Users/bhelderman/.ssh/id_blake
+          
+
+      '';
+    };
+
+  };
+}

users/blake/dots/core/nvf/default.nix

@@ -33,7 +33,7 @@ in {
             }
             else {
               enable = true;
-              registers = "unnamedplus,unnamed";
+              registers = "unnamedplus";
             };
  
           globals = {
@@ -187,7 +187,8 @@ in {
           };
 
           languages = {
-            enableTreesitter = isLinux;
+ #           enableTreesitter = isLinux;
+            enableTreesitter = true;
 
             nix = {
               enable = true;