Merge branch 'main' of github.com:JulienMalka/nix-config

This commit is contained in:
Julien Malka 2022-01-12 13:54:16 +01:00
commit 21775513ce
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
3 changed files with 27 additions and 28 deletions

42
flake.lock generated
View file

@ -38,11 +38,11 @@
]
},
"locked": {
"lastModified": 1641459437,
"narHash": "sha256-z0IOcc6LLbVhyri/aTyWzRqJs3p1pBK9idOiMwCWiqs=",
"lastModified": 1641799033,
"narHash": "sha256-f7/p46rC65buVGk7OHb9sxJ+kF1xzs3NUuLZExoqCqY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c751aeb19e84a0a777f36fd5ea73482a066bb406",
"rev": "f3be3cda6a69365f2acecc201b3cd1ee4f6d4614",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1641520266,
"narHash": "sha256-u80ASs6Nv7G3lx3SYf/SODArunkfyaKDCsq58jzy2+8=",
"lastModified": 1641759883,
"narHash": "sha256-dYu02npRmmG/JkIABwrHi2l7RFeAZMs5ZQK1NAEG838=",
"owner": "neovim",
"repo": "neovim",
"rev": "e58071c92c98fa54fcb29ab87ac6de7c02ede27b",
"rev": "8f27c4a0417c001fa2dedb6346673da501ea78e5",
"type": "github"
},
"original": {
@ -97,11 +97,11 @@
]
},
"locked": {
"lastModified": 1641543268,
"narHash": "sha256-+hlQi+iCGMfogRweYkuwPluhnPXdKeJe+4tlJdBkfA8=",
"lastModified": 1641802530,
"narHash": "sha256-TyY+416MyTShhIoB97YzRSVBVTGULp7bvcNtQbBqEu4=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "615aee1060084ce95aed2f9af9d223bf1cdaa80e",
"rev": "f77aec20552f9638aa7226b364123535c351fc93",
"type": "github"
},
"original": {
@ -112,11 +112,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1641528457,
"narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
"lastModified": 1641710811,
"narHash": "sha256-yVJ+CtwWZY8BnkNIJ/ue5a28yrRM6CkDF1LvmGmqqwM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ff377a78794d412a35245e05428c8f95fef3951f",
"rev": "0ecf7d414811f831060cf55707c374d54fbb1dec",
"type": "github"
},
"original": {
@ -128,11 +128,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1641423937,
"narHash": "sha256-iIBSDySeZ79FDFiI5but9EtOIRc5Ncu/gq27Hg/yXjo=",
"lastModified": 1641783572,
"narHash": "sha256-gkrIuUtbRKGEb+SrBVl6hEG4PY9rg+zhDyX0n3mRFMY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e67c94a1adbb5cf8a0448bc9c434589b2dd293c2",
"rev": "79c7b6a353e22f0eec342dead0bc69fb7ce846db",
"type": "github"
},
"original": {
@ -144,11 +144,11 @@
},
"nur": {
"locked": {
"lastModified": 1641595892,
"narHash": "sha256-HocXaA4u1hzAmMouDeT1BsOMWtyNLvQAfhMWa/CUENI=",
"lastModified": 1641844723,
"narHash": "sha256-Euvs9se2RgeI1w5ao4M1taM9R1q3RW9BaSfppbpOuw4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "cf371e86175b550a2664b214d43f207efda280cb",
"rev": "6094d2ee307f3a1d5573fee259a219ac3e28ca32",
"type": "github"
},
"original": {
@ -189,11 +189,11 @@
},
"unstable": {
"locked": {
"lastModified": 1641528457,
"narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
"lastModified": 1641710811,
"narHash": "sha256-yVJ+CtwWZY8BnkNIJ/ue5a28yrRM6CkDF1LvmGmqqwM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ff377a78794d412a35245e05428c8f95fef3951f",
"rev": "0ecf7d414811f831060cf55707c374d54fbb1dec",
"type": "github"
},
"original": {

View file

@ -25,7 +25,7 @@
enable = true;
subdomain = "ci";
};
};
nix.maxJobs = lib.mkDefault 4;
@ -35,11 +35,11 @@
networking.hostName = "lisa";
networking.interfaces.ens20.useDHCP = false;
networking.interfaces.ens20.ipv4.addresses = [ {address = "212.129.40.11"; prefixLength = 32;} ];
networking.interfaces.ens20.ipv4.addresses = [{ address = "212.129.40.11"; prefixLength = 32; }];
#networking.defaultGateway = { interface = "ens20"; };
networking.localCommands = ''
ip r del default || ip r add default dev ens20
'';
ip r del default || ip r add default dev ens20
'';
networking.interfaces.ens18.useDHCP = true;
networking.interfaces.ens19.useDHCP = false;
networking.interfaces.ens19.ipv6.addresses = [{

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "twekkel";
repo = pname;
rev = "v1.3.1";
rev = "v${version}";
sha256 = "JPaxbu7LlGV+Bh5qxVxeNSPnMQNqLaLYWBRbpETSpQs=";
};
@ -15,12 +15,11 @@ stdenv.mkDerivation rec {
"prefix=$(out)"
];
meta = with lib; {
description = "Utility to fetch time and set the system clock over HTTP";
homepage = "https://github.com/twekkel/htpdate";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with lib.maintainers; [ julienmalka ];
maintainers = with maintainers; [ julienmalka ];
};
}