home/default.nix

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

home/desktop/niri/default.nix

@@ -136,9 +136,6 @@
 
         "XF86AudioMute".action.spawn = ["wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"];
         "XF86AudioMicMute".action.spawn = ["wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"];
-        "XF86AudioNext".action.spawn = ["playerctl" "next"];
-        "XF86AudioPrev".action.spawn = ["playerctl" "previous"];
-        "XF86AudioPlay".action.spawn = ["playerctl" "play-pause"];
 
         "XF86MonBrightnessUp".action.spawn = ["brightness" "+10%"];
         "XF86MonBrightnessDown".action.spawn = ["brightness" "10%-"];

home/desktop/utils/waybar.nix

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

home/programs/graphical.nix

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

home/programs/zsh.nix

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

lib/mkconf.nix

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

lib/nixvim.nix

@@ -28,7 +28,6 @@ in {
     scrolloff = 4;
     smoothscroll = true;
     ignorecase = true;
-    winborder = "rounded";
 
     undofile = true;
     undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")'';
@@ -73,10 +72,10 @@ in {
       options.desc = "copy to clipboard";
     }
     {
-      mode = "n";
+      key = "<leader>ca";
-      options.desc = "LSP Format";
+      action = ''
-      key = "<leader>cf";
+        require("actions-preview").code_actions
-      action = luaFunc "vim.lsp.buf.format({async = true;})";
+      '';
     }
     {
       key = "<C-Tab>";
@@ -284,6 +283,9 @@ in {
       inlayHints = true;
       servers = {
         ts_ls.enable = true;
+        eslint = {
+          enable = true;
+        };
         nixd = {
           enable = true;
           settings = {

nixos/modules/predicate.nix

@@ -1,16 +0,0 @@
-{
-  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,7 +6,8 @@
 }: let
   user = config.user;
 in {
-  allowUnfreePkgNames = [
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
       # nonfree vscode required for dev containers
       "vscode"
       "steam-run"

nixos/programs/gamer.nix

@@ -1,5 +1,10 @@
-{...}: {
+{
-  allowUnfreePkgNames = [
+  lib,
+  pkgs,
+  ...
+}: {
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
       "steam"
       "steam-unwrapped"
       "steam-run"

nixos/services/jellyfin.nix

@@ -1,11 +1,10 @@
-{pkgs, ...}: {
+{
   users.groups.media = {};
   services.jellyfin = {
     enable = true;
     group = "media"; # access to user stuff
     openFirewall = true;
   };
-  environment.variables.JELLYFIN_FFMPEG = "${pkgs.jellyfin-ffmpeg}/bin/ffmpeg";
   services.nginx.virtualHosts."movies.tristans.cloud" = {
     forceSSL = true;
     enableACME = true;

nixos/workstation.nix

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