winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore: move nix config to common options

Browse source
This commit is contained in:
winston 2023-06-16 13:48:24 +02:00
parent aac44c4fed
commit 3c42ae4797
Signed by: winston
GPG key ID: 3786770EDBC2B481
3 changed files with 29 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
flake.lock
View file

@ -150,15 +150,12 @@
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
@ -195,11 +192,11 @@
]
},
"locked": {
"lastModified": 1686693747,
"narHash": "sha256-pf0rcQeKejsBfv6NPZCXAo1gN2XtRYm2jzRwHswYeEc=",
"lastModified": 1686852570,
"narHash": "sha256-Hzufya/HxjSliCwpuLJCGY0WCQajzcpsnhFGa+TCkCM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "62f111ef1e50e518dbb3f0782a31dcd244a0a2d7",
"rev": "4e09c83255c5b23d58714d56672d3946faf1bcef",
"type": "github"
},
"original": {
@ -215,11 +212,11 @@
"wezterm-src": "wezterm-src"
},
"locked": {
"lastModified": 1686874448,
"narHash": "sha256-FKD1FYFVT0GY8AgXe7+kLgJvFi22hj7eQyV3kmQrJls=",
"lastModified": 1686899105,
"narHash": "sha256-72QMUpbD6lFKOXzgEZEfwkggHxV2e2MJG+N9FA2wwVI=",
"owner": "nekowinston",
"repo": "nur",
"rev": "eb3cda0b36a64cf77ea6037231befc9dfe2bf648",
"rev": "389c6d4c4df17981277456d2d7f53b3d7ae75e6c",
"type": "github"
},
"original": {
@ -235,11 +232,11 @@
]
},
"locked": {
"lastModified": 1686671165,
"narHash": "sha256-q3Poq8FlulxDMCETXL0ehb9J3h5Naf5yGh1x42RXXRI=",
"lastModified": 1686740472,
"narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "14eede9450dc45b92adc9f1dfac873eac7e1a5de",
"rev": "e11c61073b777e025993c5ef63ddbf776a9cca15",
"type": "github"
},
"original": {
@ -250,11 +247,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1686582075,
"narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=",
"lastModified": 1686828063,
"narHash": "sha256-Cv0Sx1N5+3xBDF5OnmFU3Qoh9OqZmXDBKg1fgXlXTWs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e63eed145566cca98158613f3700515b4009ce3",
"rev": "683f2f5ba2ea54abb633d0b17bc9f7f6dede5799",
"type": "github"
},
"original": {
@ -284,11 +281,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686582075,
"narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=",
"lastModified": 1686828063,
"narHash": "sha256-Cv0Sx1N5+3xBDF5OnmFU3Qoh9OqZmXDBKg1fgXlXTWs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7e63eed145566cca98158613f3700515b4009ce3",
"rev": "683f2f5ba2ea54abb633d0b17bc9f7f6dede5799",
"type": "github"
},
"original": {
@ -300,11 +297,11 @@
},
"nur": {
"locked": {
"lastModified": 1686696247,
"narHash": "sha256-gZL5rk1iySrvKbdw8NU5BaSDWuWA5O7ZWw+j+vxXjc4=",
"lastModified": 1686894171,
"narHash": "sha256-QyEdSgyOdSGM3kS6N/r+0i47VbeZI41OZik37ipkQBs=",
"owner": "nix-community",
"repo": "nur",
"rev": "c3677b051af4921de6e184749035d08859e4ed62",
"rev": "1c14e580cdf9e778d76a15ff13d6d302da628a30",
"type": "github"
},
"original": {
@ -371,11 +368,11 @@
]
},
"locked": {
"lastModified": 1685759304,
"narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
"lastModified": 1676437770,
"narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
"rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e",
"type": "github"
},
"original": {
@ -443,21 +440,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm-src": {
"flake": false,
"locked": {

3
flake.nix
View file

@ -115,8 +115,5 @@
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
];
extra-trusted-users = ["@sudo" "@wheel"];
tarball-ttl = 604800;
warn-dirty = false;
};
}

7
machines/common/default.nix
View file

@ -5,15 +5,18 @@
nixpkgs.config.allowUnfree = true;
nix = {
gc.automatic = true;
package = pkgs.nixVersions.nix_2_15;
package = pkgs.nixVersions.nix_2_16;
settings = {
auto-optimise-store = pkgs.stdenv.isLinux;
experimental-features = [
"auto-allocate-uids"
"flakes"
"nix-command"
"repl-flake"
];
auto-optimise-store = pkgs.stdenv.isLinux;
tarball-ttl = 604800;
trusted-users = ["@staff" "@sudo" "@wheel"];
warn-dirty = false;
};
};
}