lgmrszd/nix-cfg
1
0
Fork 0
mirror of https://git.lgmrszd.xyz/Lgmrszd/nix-cfg.git synced 2024-11-22 11:17:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove "fresh" input

Browse source
This commit is contained in:
Lgmrszd 2024-05-21 00:23:04 +03:00
parent 89c12bba9f
commit 9d3b9afdf6
No known key found for this signature in database
GPG key ID: 9396B8BA6FBB14DE
3 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -275,22 +275,6 @@
"type": "github" "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": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1714640452, "lastModified": 1714640452,
@ -357,7 +341,6 @@
"mailserver": "mailserver", "mailserver": "mailserver",
"nix-cfg-extra": "nix-cfg-extra", "nix-cfg-extra": "nix-cfg-extra",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-fresh": "nixpkgs-fresh",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_3" "systems": "systems_3"

20
flake.nix
View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# separate inputs to lock some packages # separate inputs to lock some packages
# fresh - mostly desktop apps # 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"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
@ -42,7 +42,7 @@
outputs = inputs@{ outputs = inputs@{
nixpkgs, nixpkgs,
nixpkgs-fresh, # nixpkgs-fresh,
nixpkgs-stable, nixpkgs-stable,
home-manager, home-manager,
sops-nix, sops-nix,
@ -52,12 +52,12 @@
}: }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
overlay-fresh = final: prev: { # overlay-fresh = final: prev: {
fresh = import nixpkgs-fresh { # fresh = import nixpkgs-fresh {
inherit system; # inherit system;
config.allowUnfree = true; # config.allowUnfree = true;
}; # };
}; # };
overlay-stable = final: prev: { overlay-stable = final: prev: {
stable = import nixpkgs-stable { stable = import nixpkgs-stable {
inherit system; inherit system;
@ -68,8 +68,8 @@
vaapiIntel = prev.vaapiIntel.override { enableHybridCodec = true; }; vaapiIntel = prev.vaapiIntel.override { enableHybridCodec = true; };
}; };
my-overlays = [ my-overlays = [
overlay-fresh # overlay-fresh
overlay-stable # overlay-stable
overlay-vaapiIntel overlay-vaapiIntel
]; ];
inherit (inputs.nix-cfg-extra.lib) extra-data; inherit (inputs.nix-cfg-extra.lib) extra-data;

12
hosts/laptop/home.nix
View file

@ -55,7 +55,7 @@
protonvpn-gui protonvpn-gui
protonvpn-cli protonvpn-cli
# security # security
fresh.keepassxc keepassxc
onlykey onlykey
onlykey-agent onlykey-agent
kdePackages.plasma-vault kdePackages.plasma-vault
@ -68,12 +68,12 @@
kdePackages.kconfig kdePackages.kconfig
# messaging # messaging
(fresh.discord.override { (discord.override {
withOpenASAR = true; withOpenASAR = true;
}) })
fresh.vesktop vesktop
fresh.telegram-desktop telegram-desktop
fresh.signal-desktop signal-desktop
kdePackages.tokodon kdePackages.tokodon
kdePackages.neochat kdePackages.neochat
# pkgs-unstable.cinny-desktop # pkgs-unstable.cinny-desktop
@ -207,7 +207,7 @@
programs.java = { programs.java = {
enable = true; enable = true;
package = pkgs.fresh.jetbrains.jdk; package = pkgs.jetbrains.jdk;
}; };
programs.git = { programs.git = {