diff --git a/flake.lock b/flake.lock index a5aee44..6bbee4c 100644 --- a/flake.lock +++ b/flake.lock @@ -34,19 +34,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1669071065, + "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "f7641a3ff398ccce952e19a199d775934e518c1d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -56,7 +57,7 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "utils": "utils" + "utils": "utils_2" }, "locked": { "lastModified": 1669143911, @@ -82,11 +83,11 @@ ] }, "locked": { - "lastModified": 1669440958, - "narHash": "sha256-kMBkFFwXwTJEQQSoiP64ojnIEn+wz/G3+xNevkV6dis=", + "lastModified": 1669493294, + "narHash": "sha256-E/LbKqPSVPCojeV9TqUYK71uysz6mxnJnp7AgPtOlCo=", "owner": "h7x4", "repo": "nix-attr-search", - "rev": "ca3e27ec770bf3d3f980a7ff41718c528fd43ef1", + "rev": "d30a1093a36e5a0f32d5e22bf50883c0066fd488", "type": "github" }, "original": { @@ -97,26 +98,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669378442, - "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", + "lastModified": 1669465383, + "narHash": "sha256-fVbG427suESAEb8/P47O/zD/G9BSeFxLh94IUzgOchs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", + "rev": "899e7caf59d1954882a8e2dff45ccc0387c186f6", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1669320964, - "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", + "lastModified": 1669411043, + "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", + "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", "type": "github" }, "original": { @@ -174,6 +175,21 @@ "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": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1e83869..dd33017 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-22.05"; + nixpkgs.url = "nixpkgs/nixos-22.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-22.05"; + url = "github:nix-community/home-manager/release-22.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/packages.nix b/home/packages.nix index f9f18e7..14f5c58 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -117,7 +117,6 @@ in { ahoviewer anki ark - audacity calibre cool-retro-term copyq diff --git a/home/services/picom.nix b/home/services/picom.nix index 842b400..05d43f5 100644 --- a/home/services/picom.nix +++ b/home/services/picom.nix @@ -4,12 +4,12 @@ enable = true; fade = true; - fadeSteps = [ "0.1" "0.1" ]; + fadeSteps = [ 0.1 0.1 ]; fadeExclude = []; shadow = true; shadowOffsets = [ (-7) (-7) ]; - shadowOpacity = "0.25"; + shadowOpacity = 0.25; shadowExclude = [ "class_g = 'XAVA'" "class_g = 'stalonetray'" diff --git a/hosts/common.nix b/hosts/common.nix index cbb004f..dd41beb 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -11,9 +11,6 @@ in { nix = { package = unstable-pkgs.nixVersions.stable; distributedBuilds = config.networking.hostName != "Tsuki"; - binaryCaches = [ - "https://cache.nixos.org/" - ]; extraOptions = '' experimental-features = nix-command flakes @@ -21,7 +18,12 @@ in { allowed-uris = http:// https:// ''; - trustedUsers = [ "h7x4" "nix-builder" ]; + settings = { + trusted-users = [ "h7x4" "nix-builder" ]; + binary-caches = [ + "https://cache.nixos.org/" + ]; + }; buildMachines = [ {