oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
0
Fork 0
Code Issues Pull Requests Activity

bi-annual nixos upgrade: `22.05` -> `22.11`

This commit is contained in:
Oystein Kristoffer Tveit 2022-11-26 22:50:17 +01:00
parent 9c6a4e0da5
commit 2e3c8631fe
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
5 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock
View File

@ -34,19 +34,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1669071065,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -56,7 +57,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"utils": "utils" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1669143911, "lastModified": 1669143911,
@ -82,11 +83,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1669440958, "lastModified": 1669493294,
"narHash": "sha256-kMBkFFwXwTJEQQSoiP64ojnIEn+wz/G3+xNevkV6dis=", "narHash": "sha256-E/LbKqPSVPCojeV9TqUYK71uysz6mxnJnp7AgPtOlCo=",
"owner": "h7x4", "owner": "h7x4",
"repo": "nix-attr-search", "repo": "nix-attr-search",
"rev": "ca3e27ec770bf3d3f980a7ff41718c528fd43ef1", "rev": "d30a1093a36e5a0f32d5e22bf50883c0066fd488",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,26 +98,26 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669378442, "lastModified": 1669465383,
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", "narHash": "sha256-fVbG427suESAEb8/P47O/zD/G9BSeFxLh94IUzgOchs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", "rev": "899e7caf59d1954882a8e2dff45ccc0387c186f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.05", "ref": "nixos-22.11",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1669320964, "lastModified": 1669411043,
"narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,6 +175,21 @@
"type": "github" "type": "github"
} }
}, },
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"vscode-server": { "vscode-server": {
"flake": false, "flake": false,
"locked": { "locked": {

4
flake.nix
View File

@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs.url = "nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.05"; url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

1
home/packages.nix
View File

@ -117,7 +117,6 @@ in {
ahoviewer ahoviewer
anki anki
ark ark
audacity
calibre calibre
cool-retro-term cool-retro-term
copyq copyq

4
home/services/picom.nix
View File

@ -4,12 +4,12 @@
enable = true; enable = true;
fade = true; fade = true;
fadeSteps = [ "0.1" "0.1" ]; fadeSteps = [ 0.1 0.1 ];
fadeExclude = []; fadeExclude = [];
shadow = true; shadow = true;
shadowOffsets = [ (-7) (-7) ]; shadowOffsets = [ (-7) (-7) ];
shadowOpacity = "0.25"; shadowOpacity = 0.25;
shadowExclude = [ shadowExclude = [
"class_g = 'XAVA'" "class_g = 'XAVA'"
"class_g = 'stalonetray'" "class_g = 'stalonetray'"

10
hosts/common.nix
View File

@ -11,9 +11,6 @@ in {
nix = { nix = {
package = unstable-pkgs.nixVersions.stable; package = unstable-pkgs.nixVersions.stable;
distributedBuilds = config.networking.hostName != "Tsuki"; distributedBuilds = config.networking.hostName != "Tsuki";
binaryCaches = [
"https://cache.nixos.org/"
];
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
@ -21,7 +18,12 @@ in {
allowed-uris = http:// https:// allowed-uris = http:// https://
''; '';
trustedUsers = [ "h7x4" "nix-builder" ]; settings = {
trusted-users = [ "h7x4" "nix-builder" ];
binary-caches = [
"https://cache.nixos.org/"
];
};
buildMachines = [ buildMachines = [
{ {