From 5d577f24701709ee636175d6e3a58e5d58aa3fee Mon Sep 17 00:00:00 2001 From: EsVagy42 Date: Tue, 3 Mar 2026 20:59:38 +0100 Subject: [PATCH] Updated flake --- commit_text | 2 +- configuration.nix | 5 ++--- flake.lock | 35 +++++++++-------------------------- flake.nix | 10 ++-------- 4 files changed, 14 insertions(+), 38 deletions(-) diff --git a/commit_text b/commit_text index bbe947e..fa90fa7 100644 --- a/commit_text +++ b/commit_text @@ -1 +1 @@ -Added plasma-keyboard and removed maliit +Updated flake diff --git a/configuration.nix b/configuration.nix index acdd3c3..59d92fb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,7 +5,6 @@ { config, pkgs, - pkgs-old, lib, ... }: @@ -40,7 +39,7 @@ let kdePackages.merkuro kdePackages.francis - pkgs-old.anki + anki wl-clipboard lldb @@ -75,7 +74,7 @@ let ) ./kwin4_effect_geometry_change/kwin4_effect_geometry_change.nix { }) gimp - pkgs-old.krita + krita inkscape xournalpp kdePackages.kdenlive diff --git a/flake.lock b/flake.lock index f3da368..ac5b0a9 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1771851181, - "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", + "lastModified": 1772516620, + "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", + "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -91,22 +91,6 @@ "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": 1770380644, @@ -175,11 +159,11 @@ ] }, "locked": { - "lastModified": 1770766818, - "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", + "lastModified": 1772361940, + "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "44b928068359b7d2310a34de39555c63c93a2c90", + "rev": "a4b33606111c9c5dcd10009042bb710307174f51", "type": "github" }, "original": { @@ -192,7 +176,6 @@ "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 17b5fa7..175353b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ 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"; @@ -23,7 +22,6 @@ { self, nixpkgs, - nixpkgs-old, home-manager, plasma-manager, nixvim, @@ -53,24 +51,20 @@ } ]; specialArgs = { - pkgs-old = import nixpkgs-old { - inherit system; - config.allowUnfree = false; - }; }; in { nixosConfigurations = { nixos = lib.nixosSystem { inherit system; - inherit specialArgs; + inherit specialArgs; modules = baseModules ++ [ ./devices/default/default.nix ]; }; live = lib.nixosSystem { inherit system; - inherit specialArgs; + inherit specialArgs; modules = baseModules ++ [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") {