bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Switch to nixos-unstable

Browse source
This commit is contained in:
Bad 2022-07-28 21:48:23 +02:00
parent 9af32389df
commit 234d4aa971
3 changed files with 48 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
flake.lock
View file

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1651916036, "lastModified": 1657835815,
"narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", "rev": "54a24f042f93c79f5679f133faddedec61955cf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,7 +146,7 @@
"nixos" "nixos"
], ],
"nixpkgs-unstable": [ "nixpkgs-unstable": [
"latest" "nixos"
] ]
}, },
"locked": { "locked": {
@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1657693741, "lastModified": 1658730563,
"narHash": "sha256-pllDKNpP2LIMlJ/dxOkcn8PGwS597ZarfEWf6F6rfQ0=", "narHash": "sha256-NDaSjaNdynCM02hRLOL76CKeD5Bxjxe8aNsD6AQ4U5I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "fd120f5d166057326c50c70b13531c2678076fa3", "rev": "80981ee71b32ce0747d22b1fd2dcd895219f5c1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,18 +342,18 @@
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "nixos"
], ],
"utils": [ "utils": [
"flake-utils" "flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1657661746, "lastModified": 1658924727,
"narHash": "sha256-kreOBAylgG/vCPHeikjftL7GjBvX7g/A/M7WBaHvHVw=", "narHash": "sha256-Fhh9FK9CvuCLxG1WkWJPoendDeXKI4gHYTfezo1n2Zg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "602f2ce59c0150755fa30a23e6921a1c7453f8c7", "rev": "0e2f7876d2f2ae98a67d89a8bef8c49332aae5af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,16 +381,16 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1657533762, "lastModified": 1658969450,
"narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=", "narHash": "sha256-/p7aVWbYx5SPUK/HG4SUP9D5JBYi21Ou/QDuKKw8aRY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "38860c9e91cb00f4d8cd19c7b4e36c45680c89b5", "rev": "6372876b362b94b926e224aaa3ab0ed11551026a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -417,27 +417,27 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1657476024, "lastModified": 1658826464,
"narHash": "sha256-4xnAf6VxE/efOwHt/MsG/g1gmpT78n/8oHqF1atzNjI=", "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf034a867e08b7e083df1658c915c58456dbbde2", "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1656933710, "lastModified": 1658401027,
"narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=", "narHash": "sha256-z/sDfzsFOoWNO9nZGfxDCNjHqXvSVZLDBDSgzr9qDXE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a", "rev": "83009edccc2e24afe3d0165ed98b60ff7471a5f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1657533762, "lastModified": 1658648081,
"narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=", "narHash": "sha256-RL5nr4Xhp0zQeEGG/I3t3FmqaI9QrBg5PH31NF+7A/A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "38860c9e91cb00f4d8cd19c7b4e36c45680c89b5", "rev": "e494a908e8895b9cba18e21d5fc83362f64b3f6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -569,11 +569,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1657632565, "lastModified": 1658671895,
"narHash": "sha256-jre78eJWnd3L18uLCKbuiZEWohRFDROs5OH34kp8+bs=", "narHash": "sha256-WFtdMN7WH5twFZEfBqpgc9PMCMHpgJnZyipDSPfui3U=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "4cbf23c192517cfebb0d754987aae95bc683b7a4", "rev": "7e2b983fd459977e11026683ee4afb9598960a4c",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -4,14 +4,14 @@
nixConfig.extra-experimental-features = "nix-command flakes"; nixConfig.extra-experimental-features = "nix-command flakes";
inputs = inputs =
{ {
nixos.url = "github:nixos/nixpkgs/nixos-22.05"; nixos.url = "github:nixos/nixpkgs/nixos-unstable";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/master";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixpkgs-unstable.follows = "latest"; digga.inputs.nixpkgs-unstable.follows = "nixos";
digga.inputs.latest.follows = "latest"; digga.inputs.latest.follows = "latest";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
@ -19,7 +19,7 @@
home.url = "github:nix-community/home-manager/master"; home.url = "github:nix-community/home-manager/master";
# home.url = "path:/home/mae/home-manager"; # home.url = "path:/home/mae/home-manager";
home.inputs.nixpkgs.follows = "latest"; home.inputs.nixpkgs.follows = "nixos";
home.inputs.utils.follows = "flake-utils"; home.inputs.utils.follows = "flake-utils";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";

37
profiles/core/default.nix
View file

@ -2,26 +2,12 @@
let inherit (lib) fileContents; let inherit (lib) fileContents;
in in
{ {
# Cachix
nix = {
binaryCaches = [
"https://cache.nixos.org/"
"https://nix-community.cachix.org"
];
binaryCachePublicKeys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
# For rage encryption, all hosts need a ssh key pair # For rage encryption, all hosts need a ssh key pair
services.openssh = { services.openssh = {
enable = true; enable = true;
openFirewall = lib.mkDefault false; openFirewall = lib.mkDefault false;
}; };
# This is just a representation of the nix default
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
nix.registry.nixpkgs.flake = self.inputs.nixos; nix.registry.nixpkgs.flake = self.inputs.nixos;
nix.registry.latest.flake = self.inputs.latest; nix.registry.latest.flake = self.inputs.latest;
nix.registry.pwnix.flake = self.inputs.pwnix; nix.registry.pwnix.flake = self.inputs.pwnix;
@ -93,17 +79,26 @@ in
}; };
nix = { nix = {
settings = {
substituters = [
"https://cache.nixos.org/"
"https://nix-community.cachix.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
sandbox = true;
trusted-users = [ "root" "@wheel" ];
};
# Improve nix store disk usage # Improve nix store disk usage
autoOptimiseStore = true; settings.auto-optimise-store = true;
gc.automatic = true; gc.automatic = true;
optimise.automatic = true; optimise.automatic = true;
# Prevents impurities in builds
useSandbox = true;
# give root and @wheel special privileges with nix
trustedUsers = [ "root" "@wheel" ];
# Generally useful nix option defaults # Generally useful nix option defaults
extraOptions = '' extraOptions = ''
keep-outputs = true keep-outputs = true