Merge branch 'master' of github.com:Kropatz/dotfiles

.gitconfig

@@ -25,5 +25,3 @@
     path = .gitconfig-gitea
 [includeIf "gitdir/i:~/projects/fh/**"]
     path = .gitconfig-gitlabfh
-[core]
-	editor = kate

flake.lock

@@ -118,6 +118,24 @@
         "type": "github"
       }
     },
+    "nixinate": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1688141737,
+        "narHash": "sha256-qHrNMYWukOKmKVf6wXOGKj1xxUnOGjvTRbt/PLLXuBE=",
+        "owner": "matthewcroughan",
+        "repo": "nixinate",
+        "rev": "7902ae845e6cc5bd450e510cdf5e009a6e4a44d9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "matthewcroughan",
+        "repo": "nixinate",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1699159446,
@@ -188,6 +206,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1653060744,
+        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1699110214,
         "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=",
@@ -207,9 +241,10 @@
       "inputs": {
         "agenix": "agenix",
         "home-manager": "home-manager_2",
+        "nixinate": "nixinate",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },

flake.nix

@@ -14,6 +14,7 @@
         url = "github:nix-community/NixOS-WSL";
         inputs.nixpkgs.follows = "nixpkgs";
       };
+      nixinate.url = "github:matthewcroughan/nixinate";
   };
   outputs = { self,
               nixpkgs,
@@ -21,7 +22,8 @@
               nixos-wsl,
               nixpkgs-unstable,
               agenix,
-              home-manager
+              home-manager,
+                nixinate
             }@inputs:
     let
       system = "x86_64-linux";
@@ -29,6 +31,7 @@
         unstable = nixpkgs-unstable.legacyPackages.${prev.system};
       };
     in {
+    apps = nixinate.nixinate.${system} self;
     nixosConfigurations.server = nixpkgs.lib.nixosSystem {
       inherit system;
       modules = [
@@ -66,6 +69,15 @@
         ./modules/netdata.nix
         home-manager.nixosModules.home-manager
         agenix.nixosModules.default
+        {
+          _module.args.nixinate = {
+            host = "192.168.2.1";
+            sshUser = "anon";
+            buildOn = "remote"; # valid args are "local" or "remote"
+            substituteOnTarget = true; # if buildOn is "local" then it will substitute on the target, "-s"
+            hermetic = false;
+          };
+        }
       ];
       specialArgs = {
         ## Custom variables (e.g. ip, interface, etc)

users/home-manager/nvim/nvim.nix

@@ -9,6 +9,7 @@
     };
     programs.neovim = {
       enable = true;
+      defaultEditor = true;
       extraPackages = with pkgs; [
         rnix-lsp
         gcc

users/kopatz.nix

@@ -44,7 +44,7 @@ in
     shell = pkgs.zsh;
     extraGroups = [ "networkmanager" "wheel" "docker" "libvirtd" ];
     packages = with pkgs; [
-      discord
+      (discord.override { withVencord = true; })
       librewolf
       ungoogled-chromium
     ];