Merge remote-tracking branch 'origin/nixos-21.11'

flake.lock

@@ -1,64 +1,34 @@
 {
   "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1667907331,
+        "lastModified": 1669724862,
-        "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+        "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
-        "owner": "rycee",
+        "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+        "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
         "type": "github"
       },
       "original": {
-        "owner": "rycee",
+        "owner": "nix-community",
-        "ref": "release-22.05",
+        "ref": "release-22.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1669721229,
+        "lastModified": 1669901374,
-        "narHash": "sha256-4Sh+gXzEVHI6E/8c7OgDW60tYKh9ZGPVoL2YXlC2Yk0=",
+        "narHash": "sha256-lObvfluyiZ9cgCMgKSrUOjzbx9Oap9949jlnNRPPYqg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46eabb1198af88c73036edecdf6950c19be33308",
+        "rev": "1c5443f6cdce419174f198141bd76a3fd9502950",
         "type": "github"
       },
       "original": {
@@ -70,32 +40,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669546925,
+        "lastModified": 1669834992,
-        "narHash": "sha256-Gvtk9agz88tBgqmCdHl5U7gYttTkiuEd8/Rq1Im0pTg=",
+        "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fecf05d4861f3985e8dee73f08bc82668ef75125",
+        "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.05",
+        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1659190188,
-        "narHash": "sha256-LudYrDFPFaQMW0l68TYkPWRPKmqpxIFU1nWfylIp9AQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a3fddd46a7f3418d7e3940ded94701aba569161d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -104,27 +58,21 @@
       "inputs": {
         "home-manager": "home-manager",
         "nixos-unstable": "nixos-unstable",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "vim-extra-plugins": "vim-extra-plugins"
       }
     },
-    "vim-extra-plugins": {
+    "utils": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
-      },
       "locked": {
-        "lastModified": 1669558651,
+        "lastModified": 1667395993,
-        "narHash": "sha256-0oZd2rdg2050yapyjX7zMWsYWptFp55YFHoEFgsVrN0=",
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "m15a",
+        "owner": "numtide",
-        "repo": "nixpkgs-vim-extra-plugins",
+        "repo": "flake-utils",
-        "rev": "38107b1aceaccc2ac14a4697bbcea3d70fd016f6",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
-        "owner": "m15a",
+        "owner": "numtide",
-        "repo": "nixpkgs-vim-extra-plugins",
+        "repo": "flake-utils",
         "type": "github"
       }
     }

flake.nix

@@ -3,14 +3,13 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
     nixos-unstable.url = "github:NixOS/nixpkgs/master";
     home-manager = {
-      url = "github:rycee/home-manager/release-22.11";
+      url = "github:nix-community/home-manager/release-22.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    vim-extra-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins";
   };
 
   outputs =
-    inputs@{ self, nixpkgs, nixos-unstable, home-manager, vim-extra-plugins }:
+    inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
     let
       x64System = "x86_64-linux";
       darwinSystem = "aarch64-darwin";
@@ -22,7 +21,6 @@
           config.allowUnfree = true;
           overlays = [
             (final: prev: { inherit unstable; })
-            vim-extra-plugins.overlays.default
           ];
         };
 
@@ -68,5 +66,9 @@
           roles = [ "gnome" ];
         };
       };
+      homeConfigurations.giulioMac = utilsDarwin.user.mkHMUser {
+        name = "giulio";
+        roles = [ "ssh" ];
+      };
     };
 }

roles/home/neovim.nix

@@ -41,8 +41,6 @@
       (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
       nvim-treesitter-textobjects
       minimap-vim
-
-      pkgs.vimExtraPlugins.leap-nvim
     ];
 
     extraConfig = ''

roles/home/ssh.nix

@@ -1,3 +1,5 @@
+{ lib, pkgs, ... }:
+
 {
   programs.ssh = {
     enable = true;
@@ -8,7 +10,12 @@
         user = "root";
         identityFile = "~/.ssh/architectproxy";
       };
-
+      
+      "192.35.222.32" = {
+        user = "giulio";
+        identityFile = "~/.ssh/gitlab-ucsb";
+      };
+ 
       "tommy.devs.giugl.io" = {
         user = "giulio";
         identityFile = "~/.ssh/tommypc";
@@ -166,6 +173,10 @@
     extraConfig = ''
       IdentitiesOnly yes
       ServerAliveInterval 3600
+    '' + lib.optionalString pkgs.stdenv.isDarwin ''
+      AddKeysToAgent yes
+      UseKeychain yes
+      TCPKeepAlive no
     '';
   };
 }