diff --git a/commit_text b/commit_text index 3eda865..fa90fa7 100644 --- a/commit_text +++ b/commit_text @@ -1 +1 @@ -Added openjdk 25 +Updated flake diff --git a/configuration.nix b/configuration.nix index 213dc9a..503db46 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,6 +5,7 @@ { config, pkgs, + pkgs-old, lib, ... }: @@ -39,7 +40,7 @@ let kdePackages.merkuro kdePackages.francis - anki + pkgs-old.anki wl-clipboard lldb @@ -74,7 +75,7 @@ let ) ./kwin4_effect_geometry_change/kwin4_effect_geometry_change.nix { }) gimp - krita + pkgs-old.krita inkscape xournalpp kdePackages.kdenlive diff --git a/flake.lock b/flake.lock index 1e90ebb..a068578 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1771683283, - "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -139,6 +139,22 @@ "type": "github" } }, + "nixpkgs-old": { + "locked": { + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1757034884, @@ -249,6 +265,7 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "nixpkgs-old": "nixpkgs-old", "nixvim": "nixvim", "plasma-manager": "plasma-manager" } diff --git a/flake.nix b/flake.nix index bf8f906..17b5fa7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-old.url = "github:nixos/nixpkgs/0182a361324364ae3f436a63005877674cf45efb"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -22,6 +23,7 @@ { self, nixpkgs, + nixpkgs-old, home-manager, plasma-manager, nixvim, @@ -50,17 +52,25 @@ }; } ]; + specialArgs = { + pkgs-old = import nixpkgs-old { + inherit system; + config.allowUnfree = false; + }; + }; in { nixosConfigurations = { nixos = lib.nixosSystem { inherit system; + inherit specialArgs; modules = baseModules ++ [ ./devices/default/default.nix ]; }; live = lib.nixosSystem { inherit system; + inherit specialArgs; modules = baseModules ++ [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") {