From b7571d8e1ae7905f586b728302624025c65301a0 Mon Sep 17 00:00:00 2001 From: zoe Date: Mon, 14 Aug 2023 12:38:13 +0200 Subject: [PATCH] use unstable for goto --- flake.nix | 19 ++++++++++++++----- user.nix | 7 ++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index fa439e0..db41641 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; mozilla.url = "github:mozilla/nixpkgs-mozilla"; - # hyprland.url = "github:hyprwm/Hyprland"; supercolor.url = "github:zoe-bat/supercolor"; kaokao.url = "github:zoe-bat/kaokao"; i3layouts-rofi.url = "github:zoe-bat/i3layouts-rofi"; @@ -12,13 +12,22 @@ }; }; outputs = { self, nixpkgs, home-manager, supercolor, i3layouts-rofi, kaokao - , mozilla }@inputs: - let system = "x86_64-linux"; + , mozilla, nixpkgs-unstable }@inputs: + let + system = "x86_64-linux"; + overlay-unstable = final: prev: { + unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + }; in { nixosConfigurations.bat = nixpkgs.lib.nixosSystem { - system = system; + inherit system; modules = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ mozilla.overlays.rust ]; }) + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ mozilla.overlays.rust overlay-unstable ]; + }) ./configuration.nix ]; specialArgs = inputs; diff --git a/user.nix b/user.nix index 14faa35..c9b81b0 100644 --- a/user.nix +++ b/user.nix @@ -1,4 +1,4 @@ -{ pkgs, supercolor, kaokao, i3layouts-rofi, ... }: +{ pkgs, supercolor, nixpkgs-unstable, kaokao, i3layouts-rofi, ... }: let my-python-packages = p: with p; [ pytest i3ipc python-lsp-server ]; rust = pkgs.latest.rustChannels.stable.rust.override { @@ -140,6 +140,9 @@ in { vscode mdbook + ## games + unstable.godot_4 + ## nix any-nix-shell nixfmt @@ -180,8 +183,6 @@ in { ## 3d blender blockbench-electron - ## godot - godot_4 ## arduino arduino ## tilemap editor