peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: peperunas:9036134313d85e31c98ff9a684ec635d8166853e
Branches Tags
peperunas:master
peperunas:nixos-21.11
peperunas:laptopshit
..
compare: peperunas:e360aac9e60229122ca0db406910597b0b80ec33
Branches Tags
peperunas:master
peperunas:nixos-21.11
peperunas:laptopshit

No commits in common. "9036134313d85e31c98ff9a684ec635d8166853e" and "e360aac9e60229122ca0db406910597b0b80ec33" have entirely different histories.
9036134313 ... e360aac9e6

4 changed files with 83 additions and 42 deletions
Show Stats Expand all files Collapse all files

100
flake.lock generated
View File

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

10
flake.nix
View File

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

2
roles/home/neovim.nix
View File

@ -41,6 +41,8 @@
(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 = ''

13
roles/home/ssh.nix
View File

@ -1,5 +1,3 @@
{ lib, pkgs, ... }:
{ {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
@ -10,12 +8,7 @@
user = "root"; user = "root";
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";
@ -173,10 +166,6 @@
extraConfig = '' extraConfig = ''
IdentitiesOnly yes IdentitiesOnly yes
ServerAliveInterval 3600 ServerAliveInterval 3600
'' + lib.optionalString pkgs.stdenv.isDarwin ''
AddKeysToAgent yes
UseKeychain yes
TCPKeepAlive no
''; '';
}; };
} }