Compare commits

...

14 Commits

Author SHA1 Message Date
Giulio De Pasquale
9036134313 Merge remote-tracking branch 'origin/nixos-21.11' 2022-12-01 14:35:47 +01:00
Giulio De Pasquale
2ca262a113 Update lock 2022-12-01 14:33:15 +01:00
Giulio De Pasquale
cb440990c4 ssh: Add UCSB robbins server 2022-11-14 12:32:58 +01:00
Giulio De Pasquale
8773a28f89 flake, neovim: Removed vim-extra-plugins 2022-11-14 12:27:38 +01:00
Giulio De Pasquale
c6cd815553 Merge remote-tracking branch 'origin/master' into nixos-21.11 2022-11-14 12:21:30 +01:00
Giulio De Pasquale
851024988c Merge remote-tracking branch 'origin/master' into nixos-21.11 2022-11-10 19:03:16 +01:00
Giulio De Pasquale
a747591ba9 Merge remote-tracking branch 'origin/master' into nixos-21.11 2022-11-10 19:01:00 +01:00
Giulio De Pasquale
1626fb71cf Merge remote-tracking branch 'origin/master' into nixos-21.11 2022-11-10 15:07:48 +01:00
Giulio De Pasquale
54cf90be5f Merge remote-tracking branch 'origin/master' into nixos-21.11 2022-11-08 19:07:36 +01:00
Giulio De Pasquale
381c96746b Merge remote-tracking branch 'origin/master' into nixos-21.11 2022-11-07 19:20:07 +01:00
Giulio De Pasquale
8bee241a07 Save SSH keys when on darwin 2022-10-14 14:52:48 +02:00
Giulio De Pasquale
548107f7af Add macOS specific SSH config 2022-10-14 14:49:36 +02:00
Giulio De Pasquale
318bfda3b6 Update lock 2022-10-14 14:18:57 +02:00
Giulio De Pasquale
2950d3d8dc Added giulioMac user config 2022-10-14 14:17:50 +02:00
4 changed files with 42 additions and 83 deletions

100
flake.lock generated
View File

@ -1,64 +1,34 @@
{ {
"nodes": { "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1669724862,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
"owner": "rycee", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rycee", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1669721229, "lastModified": 1669901374,
"narHash": "sha256-4Sh+gXzEVHI6E/8c7OgDW60tYKh9ZGPVoL2YXlC2Yk0=", "narHash": "sha256-lObvfluyiZ9cgCMgKSrUOjzbx9Oap9949jlnNRPPYqg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46eabb1198af88c73036edecdf6950c19be33308", "rev": "1c5443f6cdce419174f198141bd76a3fd9502950",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,32 +40,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669546925, "lastModified": 1669834992,
"narHash": "sha256-Gvtk9agz88tBgqmCdHl5U7gYttTkiuEd8/Rq1Im0pTg=", "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fecf05d4861f3985e8dee73f08bc82668ef75125", "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "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", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -104,27 +58,21 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-unstable": "nixos-unstable", "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": { "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" "type": "github"
}, },
"original": { "original": {
"owner": "m15a", "owner": "numtide",
"repo": "nixpkgs-vim-extra-plugins", "repo": "flake-utils",
"type": "github" "type": "github"
} }
} }

View File

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

View File

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

View File

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