diff --git a/commit_text b/commit_text index d64b41d..efbe194 100644 --- a/commit_text +++ b/commit_text @@ -1 +1 @@ -Added no_yt specialisation +Updated flake (itinerary doesn't work) diff --git a/configuration.nix b/configuration.nix index 5fdc912..7ce0750 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,6 +5,7 @@ { config, pkgs, + pkgs-working-itinerary, lib, ... }: @@ -24,7 +25,7 @@ let kdePackages.kdepim-addons kdePackages.kdepim-runtime kdePackages.kcontacts - kdePackages.itinerary + pkgs-working-itinerary.kdePackages.itinerary libqalculate qalculate-qt kdotool diff --git a/flake.lock b/flake.lock index 9868199..4073b61 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761750844, + "narHash": "sha256-ab6kNHAEP/oWz8qdblnDw7TIwetr4GnmnDyvya0aw/k=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "b8082c6803353456d45e6a8c0d4b36ad33fb7d6a", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -139,6 +139,22 @@ "type": "github" } }, + "nixpkgs-working-itinerary": { + "locked": { + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1757034884, @@ -232,11 +248,11 @@ ] }, "locked": { - "lastModified": 1759321049, - "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=", + "lastModified": 1761078382, + "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd", + "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "type": "github" }, "original": { @@ -249,6 +265,7 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "nixpkgs-working-itinerary": "nixpkgs-working-itinerary", "nixvim": "nixvim", "plasma-manager": "plasma-manager" } diff --git a/flake.nix b/flake.nix index d350731..76cafc2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-working-itinerary.url = "github:nixos/nixpkgs/cf3f5c4def3c7b5f1fc012b3d839575dbe552d43"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -21,6 +22,7 @@ outputs = { nixpkgs, + nixpkgs-working-itinerary, home-manager, plasma-manager, nixvim, @@ -38,6 +40,15 @@ nixosConfigurations = { nixos = lib.nixosSystem { inherit system; + specialArgs = { + pkgs-working-itinerary = import nixpkgs-working-itinerary { + inherit system; + config.allowUnfree = false; + config.permittedInsecurePackages = [ + "olm-3.2.16" + ]; + }; + }; modules = [ { environment.systemPackages = [ inputs.nixvim.packages.${system}.default ];