framework: unfree predicate module

lf => yazy
add grayjay

home/default.nix

@@ -7,7 +7,6 @@
   imports = [
     ./programs/neovim/.
     ./programs/git.nix
-    ./programs/lf/.
     ./programs/zsh.nix
     ./programs/tmux/.
   ];
@@ -40,6 +39,8 @@
     ytfzf
   ];
 
+  programs.yazi.enable = true;
+
   programs.zoxide.enable = true;
 
   programs.rbw = {
@@ -65,10 +66,7 @@
     };
   };
 
-  programs.fzf = {
+  programs.fzf.enable = true;
-    enable = true;
-    enableZshIntegration = true;
-  };
 
   programs.direnv.enable = true;
 }

home/desktop/utils/waybar.nix

@@ -42,8 +42,8 @@
           on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
         };
         mpris = {
-          format = "{player_icon} {dynamic}";
+          format = "{player_icon} {title}";
-          format-paused = "⏸️ {player_icon} {dynamic}";
+          format-paused = "⏸️ {player_icon} {title}";
           player-icons = {
             default = "▶️";
             mpd = "🎵";

home/programs/graphical.nix

@@ -1,7 +1,6 @@
 {
   pkgs,
   inputs,
-  user,
   ...
 }: {
   imports = [
@@ -26,6 +25,7 @@
     youtube-music
     transmission_4-gtk
     feishin
+    grayjay
 
     # other
     element-desktop
@@ -68,8 +68,12 @@
     ];
   };
 
-  programs.chromium = {
+  programs.zed-editor = {
     enable = true;
-    package = pkgs.brave;
+    extensions = ["tsgo" "nix" "ansible" "helm"];
+    userSettings = {
+      vim_mode = true;
+    };
+    extraPackages = [pkgs.nixd pkgs.vtsls];
   };
 }

home/programs/zsh.nix

@@ -3,6 +3,7 @@
   config,
   ...
 }: {
+  home.shell.enableZshIntegration = true;
   programs.starship.enable = true;
   programs.zsh = {
     enable = true;

lib/mkconf.nix

@@ -20,6 +20,7 @@ in
       ++ [
         home-manager.nixosModules.home-manager
         sops-nix.nixosModules.sops
+        ../nixos/modules/predicate.nix
         {
           home-manager = {
             useGlobalPkgs = true;

lib/nixvim.nix

@@ -284,9 +284,6 @@ in {
       inlayHints = true;
       servers = {
         ts_ls.enable = true;
-        eslint = {
-          enable = true;
-        };
         nixd = {
           enable = true;
           settings = {

nixos/modules/predicate.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  options = {
+    allowUnfreePkgNames = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+    };
+  };
+
+  config = {
+    nixpkgs.config.allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) config.allowUnfreePkgNames;
+  };
+}

nixos/modules/work.nix

@@ -6,14 +6,13 @@
 }: let
   user = config.user;
 in {
-  nixpkgs.config.allowUnfreePredicate = pkg:
+  allowUnfreePkgNames = [
-    builtins.elem (lib.getName pkg) [
+    # nonfree vscode required for dev containers
-      # nonfree vscode required for dev containers
+    "vscode"
-      "vscode"
+    "steam-run"
-      "steam-run"
+    "postman"
-      "postman"
+    "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
-      "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
+  ];
-    ];
 
   nixpkgs.config.permittedInsecurePackages = [
     "openssl-1.1.1w" # required for mongodb

nixos/programs/gamer.nix

@@ -1,16 +1,11 @@
-{
+{...}: {
-  lib,
+  allowUnfreePkgNames = [
-  pkgs,
+    "steam"
-  ...
+    "steam-unwrapped"
-}: {
+    "steam-run"
-  nixpkgs.config.allowUnfreePredicate = pkg:
+    "steam-original"
-    builtins.elem (lib.getName pkg) [
+    "osu-lazer"
-      "steam"
+  ];
-      "steam-unwrapped"
-      "steam-run"
-      "steam-original"
-      "osu-lazer"
-    ];
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;

nixos/workstation.nix

@@ -102,4 +102,8 @@
   services.udev.extraRules = ''
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="3434", ATTRS{idProduct}=="0e60", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
   '';
+
+  allowUnfreePkgNames = [
+    "grayjay"
+  ];
 }