From 1a4a4dc067d509c063ff7fe4d199f70536b88766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 1 Dec 2024 12:08:22 +0000 Subject: [PATCH] upgrade to 24.11 --- flake.lock | 87 ++++----------------------------------- flake.nix | 15 +------ nixos/common-hardware.nix | 24 ----------- 3 files changed, 11 insertions(+), 115 deletions(-) diff --git a/flake.lock b/flake.lock index 9d4eeef4..dda45d15 100644 --- a/flake.lock +++ b/flake.lock @@ -38,25 +38,6 @@ "type": "github" } }, - "cryptpad": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1731404649, - "narHash": "sha256-w3LUeLpAtjlouY2KucVgBRTQtnmYPe4htFgvv0qYQWg=", - "owner": "michaelshmitty", - "repo": "cryptpad-flake", - "rev": "c63905f634daf850b1385d53ee4d7799e9e1c89d", - "type": "github" - }, - "original": { - "owner": "michaelshmitty", - "repo": "cryptpad-flake", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -156,24 +137,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -253,16 +216,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -366,22 +329,6 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-master": { "locked": { "lastModified": 1732399023, @@ -432,16 +379,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -465,12 +412,11 @@ "root": { "inputs": { "alejandra": "alejandra", - "cryptpad": "cryptpad", "darwin": "darwin", "disko": "disko", "endless-sky": "endless-sky", "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "helix": "helix", "home-manager": "home-manager", "lix-module": "lix-module", @@ -579,21 +525,6 @@ "repo": "default", "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cb4134b2..5f15167f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "NixOS configuration with flakes"; outputs = { alejandra, - cryptpad, darwin, disko, endless-sky, @@ -30,10 +29,6 @@ (import ./nixos/server-common.nix) sops.nixosModules.sops disko.nixosModules.disko - ({pkgs, ...}: { - nixpkgs.overlays = [inputs.cryptpad.overlays.default]; - }) - inputs.cryptpad.nixosModules.cryptpad ]; specialArgs = {inherit inputs system;}; }; @@ -347,7 +342,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-24.05"; + ref = "nixos-24.11"; }; nixpkgs-rust-analyzer = { type = "github"; @@ -375,7 +370,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-24.05"; + ref = "release-24.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; flake-utils = { @@ -409,8 +404,6 @@ repo = "nix-ld"; ref = "main"; inputs.nixpkgs.follows = "nixpkgs-stable"; - inputs.flake-utils.follows = "flake-utils"; - inputs.flake-compat.follows = "flake-compat"; }; helix = { type = "github"; @@ -426,7 +419,6 @@ repo = "sops-nix"; ref = "master"; inputs.nixpkgs.follows = "nixpkgs-stable"; - inputs.nixpkgs-stable.follows = "nixpkgs-stable"; }; alejandra = { type = "github"; @@ -435,9 +427,6 @@ ref = "main"; inputs.nixpkgs.follows = "nixpkgs-nixos-unstable"; }; - cryptpad = { - url = "github:michaelshmitty/cryptpad-flake"; - }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs-stable"; diff --git a/nixos/common-hardware.nix b/nixos/common-hardware.nix index 5652ab53..42eff18f 100644 --- a/nixos/common-hardware.nix +++ b/nixos/common-hardware.nix @@ -9,30 +9,6 @@ networking.networkmanager = { enable = true; - dispatcherScripts = [ - { - source = pkgs.writeText "upHook" '' - enable_disable_wifi () - { - result=$(nmcli dev | grep "ethernet" | grep -w "connected") - if [ -n "$result" ]; then - nmcli radio wifi off - else - nmcli radio wifi on - fi - } - - if [ "$2" = "up" ]; then - enable_disable_wifi - fi - - if [ "$2" = "down" ]; then - enable_disable_wifi - fi - ''; - type = "basic"; - } - ]; }; security.rtkit.enable = true;