diff --git a/flake.lock b/flake.lock index 9bbafb9..b3a1c32 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1790742243, - "narHash": "sha256-kaNo6xHiL31AbNNEreG0OTKf4j6Cxlo5bPawjX7lnbQ=", + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5fcd298a00f08b6e8390baf04aa8edb62203070", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790750587, - "narHash": "sha256-VfjaoJ1Uyb7JZTrBgE5Jf2nhjtQPmD9KOd19HJwmZwM=", + "lastModified": 1791426274, + "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78e9c786dc08cd4f3420c2395cd977206a9b1da2", + "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11", "type": "github" }, "original": { @@ -37,10 +37,27 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1791260994, + "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 78824da..9865bc4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,9 @@ nixpkgs = { url = "github:nixos/nixpkgs/nixos-26.05"; }; + nixpkgs-unstable = { + url = "github:nixos/nixpkgs/151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4"; + }; home-manager = { url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -14,6 +17,7 @@ outputs = inputs @ { self, nixpkgs, + nixpkgs-unstable, home-manager, ... }: { diff --git a/home/coyote/default.nix b/home/coyote/default.nix index 6970cfb..8007c09 100644 --- a/home/coyote/default.nix +++ b/home/coyote/default.nix @@ -29,16 +29,18 @@ subtitlecomposer kid3 kdePackages.kdenlive - audacity + unstable.audacity # games osu-lazer-bin pcsx2 # emulation - (bottles.override {removeWarningPopup = true;}) + (unstable.bottles.override {removeWarningPopup = true;}) # devel - ocaml - racket - lazygit + unstable.ocaml + unstable.racket + unstable.lazygit + unstable.opencode + unstable.nodejs ]; programs = { @@ -62,6 +64,9 @@ }; 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 9c7dae6..fc97f1a 100644 --- a/home/coyote/vim.nix +++ b/home/coyote/vim.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { programs.vim = { enable = true; - packageConfigurable = pkgs.vim-full; + packageConfigurable = pkgs.unstable.vim-full; defaultEditor = true; - plugins = with pkgs.vimPlugins; [ + plugins = with pkgs.unstable.vimPlugins; [ gruvbox rainbow undotree diff --git a/modules/common.nix b/modules/common.nix index bd15b36..e6a3b54 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -11,6 +11,12 @@ 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) diff --git a/modules/users/coyote/default.nix b/modules/users/coyote/default.nix index b5f4a69..92ab002 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.fish; + users.defaultUserShell = pkgs.unstable.fish; # daemon blurb to get SSH for Git working environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/${builtins.toString USER_ID}/ssh-agent";