Updated flake

This commit is contained in:
EsVagy42 2026-02-25 16:59:19 +01:00
parent 5416062c2b
commit 04357ec34a
4 changed files with 37 additions and 9 deletions

View file

@ -1 +1 @@
Added openjdk 25 Updated flake

View file

@ -5,6 +5,7 @@
{ {
config, config,
pkgs, pkgs,
pkgs-old,
lib, lib,
... ...
}: }:
@ -39,7 +40,7 @@ let
kdePackages.merkuro kdePackages.merkuro
kdePackages.francis kdePackages.francis
anki pkgs-old.anki
wl-clipboard wl-clipboard
lldb lldb
@ -74,7 +75,7 @@ let
) ./kwin4_effect_geometry_change/kwin4_effect_geometry_change.nix { }) ) ./kwin4_effect_geometry_change/kwin4_effect_geometry_change.nix { })
gimp gimp
krita pkgs-old.krita
inkscape inkscape
xournalpp xournalpp
kdePackages.kdenlive kdePackages.kdenlive

29
flake.lock generated
View file

@ -65,11 +65,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771683283, "lastModified": 1771851181,
"narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1771848320,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0182a361324364ae3f436a63005877674cf45efb", "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,6 +139,22 @@
"type": "github" "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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1757034884, "lastModified": 1757034884,
@ -249,6 +265,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-old": "nixpkgs-old",
"nixvim": "nixvim", "nixvim": "nixvim",
"plasma-manager": "plasma-manager" "plasma-manager": "plasma-manager"
} }

View file

@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-old.url = "github:nixos/nixpkgs/0182a361324364ae3f436a63005877674cf45efb";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -22,6 +23,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-old,
home-manager, home-manager,
plasma-manager, plasma-manager,
nixvim, nixvim,
@ -50,17 +52,25 @@
}; };
} }
]; ];
specialArgs = {
pkgs-old = import nixpkgs-old {
inherit system;
config.allowUnfree = false;
};
};
in in
{ {
nixosConfigurations = { nixosConfigurations = {
nixos = lib.nixosSystem { nixos = lib.nixosSystem {
inherit system; inherit system;
inherit specialArgs;
modules = baseModules ++ [ modules = baseModules ++ [
./devices/default/default.nix ./devices/default/default.nix
]; ];
}; };
live = lib.nixosSystem { live = lib.nixosSystem {
inherit system; inherit system;
inherit specialArgs;
modules = baseModules ++ [ modules = baseModules ++ [
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
{ {