diff --git a/flake.lock b/flake.lock index f55fb86..ba12984 100644 --- a/flake.lock +++ b/flake.lock @@ -1,36 +1,5 @@ { "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": [ @@ -41,13 +10,13 @@ "locked": { "lastModified": 1669724862, "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=", - "owner": "rycee", + "owner": "nix-community", "repo": "home-manager", "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9", "type": "github" }, "original": { - "owner": "rycee", + "owner": "nix-community", "ref": "release-22.11", "repo": "home-manager", "type": "github" @@ -85,28 +54,11 @@ "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" - } - }, "root": { "inputs": { "home-manager": "home-manager", "nixos-unstable": "nixos-unstable", - "nixpkgs": "nixpkgs", - "vim-extra-plugins": "vim-extra-plugins" + "nixpkgs": "nixpkgs" } }, "utils": { @@ -123,26 +75,6 @@ "repo": "flake-utils", "type": "github" } - }, - "vim-extra-plugins": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1669750172, - "narHash": "sha256-T1oYifNziJZAXGTej65PGABoRc578oGAoOOm5s9Tc5Q=", - "owner": "m15a", - "repo": "nixpkgs-vim-extra-plugins", - "rev": "fcb2f5377654c96b24377d0f77af1431f4bd146e", - "type": "github" - }, - "original": { - "owner": "m15a", - "repo": "nixpkgs-vim-extra-plugins", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5808da3..b2a6523 100644 --- a/flake.nix +++ b/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" ]; + }; }; } diff --git a/roles/home/neovim.nix b/roles/home/neovim.nix index 3132572..1a784ca 100644 --- a/roles/home/neovim.nix +++ b/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 = '' diff --git a/roles/home/ssh.nix b/roles/home/ssh.nix index a625ef3..23bac5a 100644 --- a/roles/home/ssh.nix +++ b/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 ''; }; }