diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index 2c4ff0e..8723d8f 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -37,7 +37,6 @@ in { pkgs.qmk pkgs.jq pkgs.wireguard-tools - pkgs.cursor-cli ]; boot.binfmt = { diff --git a/modules/home/desktop/i3.nix b/modules/home/desktop/i3.nix index e04e7dc..8a34fab 100644 --- a/modules/home/desktop/i3.nix +++ b/modules/home/desktop/i3.nix @@ -25,7 +25,7 @@ ZPATH=$(zoxide query -l | sed -e "s|$HOME/||g" | rofi -dmenu) [[ -z "$ZPATH" ]] && exit ZSESH=$(echo "$ZPATH" | tr / -) - ZWIND=$(wmctrl -l | grep "$ZSESH$" || echo "") + ZWIND=$(wmctrl -l | grep "$ZSESH" || echo "") cd "$ZPATH" if [[ -z "$ZWIND" ]]; then alacritty -T "$ZSESH" -e zsh -c "zellij -s $ZSESH -n dev || zellij a $ZSESH" diff --git a/modules/nixos/unfree/default.nix b/modules/nixos/unfree/default.nix index a8f13d0..d9f045f 100644 --- a/modules/nixos/unfree/default.nix +++ b/modules/nixos/unfree/default.nix @@ -1,19 +1,13 @@ -{ - lib, - config, - ... -}: let +{ lib, config, ... }: +let cfg = config.mods.unfree; - mkPackages = mod: - if cfg.${mod}.enable - then cfg.${mod}.packages - else []; + mkPackages = mod: if cfg.${mod}.enable then cfg.${mod}.packages else [ ]; + in { - imports = [./steam.nix ./nvidia.nix ./minecraft.nix ./valheim.nix]; + imports = [ ./steam.nix ./nvidia.nix ./minecraft.nix ./valheim.nix ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ((mkPackages "steam") - ++ (mkPackages "minecraft") - ++ (mkPackages "nvidia") - ++ (mkPackages "valheim") ++ ["stremio-shell" "stremio-server" "cursor-cli"]); + ++ (mkPackages "minecraft") ++ (mkPackages "nvidia") + ++ (mkPackages "valheim") ++ [ "stremio-shell" "stremio-server" ]); }