From 4867e6745b90cdeda6d7c987ad0b77ecc10ed885 Mon Sep 17 00:00:00 2001 From: asnev Date: Sun, 20 Sep 2026 12:42:24 +0700 Subject: [PATCH] removed unstable --- flake.lock | 31 +++++++------------------------ flake.nix | 4 ---- home/coyote/default.nix | 29 ++++++----------------------- home/coyote/vim.nix | 4 ++-- modules/common.nix | 13 ------------- modules/users/coyote/default.nix | 2 +- 6 files changed, 16 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index f4847d3..81bb43d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1788642154, - "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=", + "lastModified": 1789267039, + "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab", + "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788807765, - "narHash": "sha256-J9oC0bKnkXUrMegqRTXVkyDFJ0gn2U/Qpoo9HgGMQmA=", + "lastModified": 1789749394, + "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "93108a538f079596c9a16c72cf03e9322782b6dd", + "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49", "type": "github" }, "original": { @@ -37,27 +37,10 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1788752844, - "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dc5d91f840324650bac8c379428c7037a416959a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 75af936..78824da 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,6 @@ nixpkgs = { url = "github:nixos/nixpkgs/nixos-26.05"; }; - nixpkgs-unstable = { - url = "github:nixos/nixpkgs/nixos-unstable"; - }; home-manager = { url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +14,6 @@ outputs = inputs @ { self, nixpkgs, - nixpkgs-unstable, home-manager, ... }: { diff --git a/home/coyote/default.nix b/home/coyote/default.nix index a780197..dec49e2 100644 --- a/home/coyote/default.nix +++ b/home/coyote/default.nix @@ -16,11 +16,11 @@ home.packages = with pkgs; [ # productivity + vivaldi libreoffice-fresh karp keepassxc pdfarranger - thunderbird # multimedia furnace corrscope @@ -29,19 +29,16 @@ subtitlecomposer kid3 kdePackages.kdenlive - unstable.audacity - # Internet - ungoogled-chromium + audacity # games osu-lazer-bin pcsx2 # emulation - (unstable.bottles.override {removeWarningPopup = true;}) + (bottles.override {removeWarningPopup = true;}) # devel - unstable.racket - unstable.lazygit - unstable.jupyter-all - unstable.python314Packages.calysto + racket + lazygit + jupyter-all ]; programs = { @@ -64,21 +61,7 @@ ''; }; - librewolf.enable = true; - librewolf.languagePacks = ["en-GB"]; - librewolf.settings = { - "privacy.resistFingerprinting" = false; - "librewolf.webgl.prompt" = false; - "identity.fxaccounts.enabled" = true; - "middlemouse.paste" = false; - "general.autoScroll" = true; - "browser.discovery.containers.enabled" = false; - }; - yt-dlp.enable = true; - yt-dlp.package = pkgs.unstable.yt-dlp; - - starship.package = pkgs.unstable.starship; obs-studio.enable = true; obs-studio.plugins = with pkgs.obs-studio-plugins; [ diff --git a/home/coyote/vim.nix b/home/coyote/vim.nix index fc97f1a..9c7dae6 100644 --- a/home/coyote/vim.nix +++ b/home/coyote/vim.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { programs.vim = { enable = true; - packageConfigurable = pkgs.unstable.vim-full; + packageConfigurable = pkgs.vim-full; defaultEditor = true; - plugins = with pkgs.unstable.vimPlugins; [ + plugins = with pkgs.vimPlugins; [ gruvbox rainbow undotree diff --git a/modules/common.nix b/modules/common.nix index 094342c..d5705da 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -9,15 +9,8 @@ nix.settings.auto-optimise-store = true; nix.package = pkgs.lixPackageSets.stable.lix; - # global nixpkgs-unstable overlay, so unstable packages are available to Home Manager userspaces too nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ - (final: prev: { - unstable = import inputs.nixpkgs-unstable { - system = prev.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - }) (final: prev: { inherit (prev.lixPackageSets.stable) @@ -113,12 +106,6 @@ cat = "bat"; }; - # fixes Librewolf not rendering text in its UI (as of 2026-07-30) - environment.sessionVariables.XDG_DATA_DIRS = [ - "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" - "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}" - ]; - programs = { fish.enable = true; diff --git a/modules/users/coyote/default.nix b/modules/users/coyote/default.nix index 92ab002..b5f4a69 100644 --- a/modules/users/coyote/default.nix +++ b/modules/users/coyote/default.nix @@ -12,7 +12,7 @@ in { extraGroups = ["wheel" "networkmanager" "lp" "scanner"]; uid = USER_ID; }; - users.defaultUserShell = pkgs.unstable.fish; + users.defaultUserShell = pkgs.fish; # daemon blurb to get SSH for Git working environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/${builtins.toString USER_ID}/ssh-agent";