From 4902dfd10131f3a1112304f8e22043e75f66607f Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Tue, 14 Jul 2026 13:24:32 +0200 Subject: [PATCH] Fix license warning in nix shell --- flake.nix | 4 ++-- modules/cli/home.nix | 1 + overlays/default.nix | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 15a47d6..11013e6 100644 --- a/flake.nix +++ b/flake.nix @@ -147,7 +147,7 @@ packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [nvim-overlay]; + overlays = [(import ./overlays inputs) nvim-overlay]; }; in rec { default = nvim; @@ -157,7 +157,7 @@ devShells = eachSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [nvim-overlay]; + overlays = [(import ./overlays inputs) nvim-overlay]; }; in rec { default = pkgs.mkShell { diff --git a/modules/cli/home.nix b/modules/cli/home.nix index 2d108d5..00ed4c7 100644 --- a/modules/cli/home.nix +++ b/modules/cli/home.nix @@ -92,6 +92,7 @@ # Global instructions - NEVER EVER commit. Do not run `git commit` (or `jj commit`) and never push changes under any circumstances unless the user explicitly asks you to commit in that message. + - when fetching github content/pr/issues/wha, use the `gh` cli. ''; xdg.configFile."claude/keybindings.json".text = builtins.toJSON { diff --git a/overlays/default.nix b/overlays/default.nix index 55c6802..f37e43e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -26,16 +26,17 @@ in { # Gnome-control-center can only be launched if XDG_CURRENT_DESKTOP is GNOME. gnome-control-center = wrapProgram super.gnome-control-center ["gnome-control-center"] "--set XDG_CURRENT_DESKTOP GNOME"; - # i can't get this to work /shrug - # slack = super.symlinkJoin { - # name = super.slack.name; - # paths = [super.slack]; - # buildInputs = [super.makeWrapper]; - # postBuild = '' - # wrapProgram $out/bin/slack --add-flags "--disable-smooth-scrolling" - # substituteInPlace ${super.slack}/share/applications/slack.desktop --replace ${super.slack} $out - # ''; - # }; + # Some nvim plugins ship without a license, so nixpkgs marks them unfree. + vimPlugins = + super.vimPlugins + // super.lib.genAttrs [ + "unclash-nvim" + "vim-wordmotion" + ] (name: + super.vimPlugins.${name}.overrideAttrs (old: { + meta = old.meta // {license = super.lib.licenses.mit;}; + })); + discord = enableWayland super.discord ["discord" "Discord"]; vesktop = enableWayland super.vesktop ["vesktop"]; pear-desktop = enableWayland super.pear-desktop ["pear-desktop"];