diff --git a/flake.lock b/flake.lock index 44fcae0..503ebe4 100644 --- a/flake.lock +++ b/flake.lock @@ -275,22 +275,6 @@ "type": "github" } }, - "nixpkgs-fresh": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1714640452, @@ -357,7 +341,6 @@ "mailserver": "mailserver", "nix-cfg-extra": "nix-cfg-extra", "nixpkgs": "nixpkgs", - "nixpkgs-fresh": "nixpkgs-fresh", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "systems": "systems_3" diff --git a/flake.nix b/flake.nix index 62fc056..2c9568d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # separate inputs to lock some packages # fresh - mostly desktop apps - nixpkgs-fresh.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs-fresh.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; flake-parts.url = "github:hercules-ci/flake-parts"; @@ -42,7 +42,7 @@ outputs = inputs@{ nixpkgs, - nixpkgs-fresh, + # nixpkgs-fresh, nixpkgs-stable, home-manager, sops-nix, @@ -52,12 +52,12 @@ }: let system = "x86_64-linux"; - overlay-fresh = final: prev: { - fresh = import nixpkgs-fresh { - inherit system; - config.allowUnfree = true; - }; - }; + # overlay-fresh = final: prev: { + # fresh = import nixpkgs-fresh { + # inherit system; + # config.allowUnfree = true; + # }; + # }; overlay-stable = final: prev: { stable = import nixpkgs-stable { inherit system; @@ -68,8 +68,8 @@ vaapiIntel = prev.vaapiIntel.override { enableHybridCodec = true; }; }; my-overlays = [ - overlay-fresh - overlay-stable + # overlay-fresh + # overlay-stable overlay-vaapiIntel ]; inherit (inputs.nix-cfg-extra.lib) extra-data; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index a502aef..7033cdc 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -55,7 +55,7 @@ protonvpn-gui protonvpn-cli # security - fresh.keepassxc + keepassxc onlykey onlykey-agent kdePackages.plasma-vault @@ -68,12 +68,12 @@ kdePackages.kconfig # messaging - (fresh.discord.override { + (discord.override { withOpenASAR = true; }) - fresh.vesktop - fresh.telegram-desktop - fresh.signal-desktop + vesktop + telegram-desktop + signal-desktop kdePackages.tokodon kdePackages.neochat # pkgs-unstable.cinny-desktop @@ -207,7 +207,7 @@ programs.java = { enable = true; - package = pkgs.fresh.jetbrains.jdk; + package = pkgs.jetbrains.jdk; }; programs.git = {