From eeedd5b850325b8d152841026f1daf9c0c98c0d5 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 24 May 2024 19:04:21 +0200 Subject: [PATCH] upgrade to unstable --- flake.nix | 24 +++++++++++++----------- nixos/homes/palo/packages/social.nix | 1 - 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 823d98a..6422e2f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,13 @@ url = "git+ssh://forgejo@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main"; flake = false; }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-legacy_2305.url = "github:nixos/nixpkgs/nixos-23.05"; - nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; - nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05"; + #nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05"; + nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05"; + nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs-legacy_2305.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs-legacy_2311.url = "github:nixos/nixpkgs/nixos-23.11"; nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-anywhere.url = "github:nix-community/nixos-anywhere"; @@ -108,7 +109,7 @@ , nixpkgs-legacy_2205 , nixpkgs-legacy_2211 , nixpkgs-legacy_2305 - , nixpkgs-unstable + , nixpkgs-legacy_2311 , overviewer , permown , polygon-art @@ -128,7 +129,6 @@ pkgs = nixpkgs.legacyPackages.${system}; inherit (nixpkgs) lib; - meta = { nixpackages ? nixpkgs }: rec { system = "x86_64-linux"; pkgs = import nixpackages { @@ -142,14 +142,15 @@ overlays = [ (_self: _super: { - unstable = import nixpkgs-unstable { + # todo : remove this, we are on unstable in the future + unstable = import nixpkgs { inherit system; config.allowUnfree = true; }; - legacy_2211 = import nixpkgs-legacy_2211 { inherit system; }; legacy_2205 = import nixpkgs-legacy_2205 { inherit system; }; - legacy_2105 = nixpkgs-legacy_2105 { inherit system; }; - legacy_2305 = nixpkgs-legacy_2105 { inherit system; }; + legacy_2211 = import nixpkgs-legacy_2211 { inherit system; }; + legacy_2305 = nixpkgs-legacy_2305 { inherit system; }; + legacy_2311 = nixpkgs-legacy_2311 { inherit system; }; polygon-art = polygon-art.packages.${system}; landingpage = landingpage.packages.${system}.plain; kmonad = kmonad.packages.${system}.kmonad; @@ -247,6 +248,7 @@ home-manager.nixosModules.home-manager stylix.nixosModules.stylix ]; + # todo : put this in `/homes` stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml"; stylix.image = ./nixos/assets/wallpaper.png; stylix.fonts = { diff --git a/nixos/homes/palo/packages/social.nix b/nixos/homes/palo/packages/social.nix index a560c65..20d7d51 100644 --- a/nixos/homes/palo/packages/social.nix +++ b/nixos/homes/palo/packages/social.nix @@ -23,7 +23,6 @@ with lib; # -------------- #element-desktop #fractal - #legacy_2205.mirage-im #cinny-desktop fluffychat #(fluffychat.overrideAttrs