diff --git a/home/default.nix b/home/default.nix index 3c46f22..8edb0ac 100644 --- a/home/default.nix +++ b/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; } diff --git a/home/desktop/niri/default.nix b/home/desktop/niri/default.nix index 05865a5..d2e1d76 100644 --- a/home/desktop/niri/default.nix +++ b/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%-"]; diff --git a/home/desktop/utils/waybar.nix b/home/desktop/utils/waybar.nix index 72756b4..02d90cb 100644 --- a/home/desktop/utils/waybar.nix +++ b/home/desktop/utils/waybar.nix @@ -42,8 +42,8 @@ on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; }; mpris = { - format = "{player_icon} {title}"; - format-paused = "⏸️ {player_icon} {title}"; + format = "{player_icon} {dynamic}"; + format-paused = "⏸️ {player_icon} {dynamic}"; player-icons = { default = "▶️"; mpd = "🎵"; diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index df550f1..301b503 100644 --- a/home/programs/graphical.nix +++ b/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"]; - userSettings = { - vim_mode = true; - }; - extraPackages = [pkgs.nixd pkgs.vtsls]; + package = pkgs.brave; }; } diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index 2978de1..dfb2b02 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -3,7 +3,6 @@ config, ... }: { - home.shell.enableZshIntegration = true; programs.starship.enable = true; programs.zsh = { enable = true; diff --git a/images/demonslayer.png b/images/demonslayer.png new file mode 100644 index 0000000..51b68eb Binary files /dev/null and b/images/demonslayer.png differ diff --git a/images/nier.jpg b/images/nier.jpg new file mode 100644 index 0000000..f832f96 Binary files /dev/null and b/images/nier.jpg differ diff --git a/images/nier2.jpg b/images/nier2.jpg new file mode 100644 index 0000000..3fbca6c Binary files /dev/null and b/images/nier2.jpg differ diff --git a/images/nix-soft.png b/images/nix-soft.png new file mode 100644 index 0000000..3e252b8 Binary files /dev/null and b/images/nix-soft.png differ diff --git a/lib/mkconf.nix b/lib/mkconf.nix index 972a413..93f6100 100644 --- a/lib/mkconf.nix +++ b/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; diff --git a/lib/nixvim.nix b/lib/nixvim.nix index 1248388..1b26adb 100644 --- a/lib/nixvim.nix +++ b/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"; - options.desc = "LSP Format"; - key = "cf"; - action = luaFunc "vim.lsp.buf.format({async = true;})"; + key = "ca"; + action = '' + require("actions-preview").code_actions + ''; } { key = ""; @@ -284,6 +283,9 @@ in { inlayHints = true; servers = { ts_ls.enable = true; + eslint = { + enable = true; + }; nixd = { enable = true; settings = { diff --git a/nixos/modules/predicate.nix b/nixos/modules/predicate.nix deleted file mode 100644 index 586f13c..0000000 --- a/nixos/modules/predicate.nix +++ /dev/null @@ -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; - }; -} diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index cd358c3..f22246a 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -6,13 +6,14 @@ }: let user = config.user; in { - allowUnfreePkgNames = [ - # nonfree vscode required for dev containers - "vscode" - "steam-run" - "postman" - "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623 - ]; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + # nonfree vscode required for dev containers + "vscode" + "steam-run" + "postman" + "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 diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index 7356755..62452f1 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -1,11 +1,16 @@ -{...}: { - allowUnfreePkgNames = [ - "steam" - "steam-unwrapped" - "steam-run" - "steam-original" - "osu-lazer" - ]; +{ + lib, + pkgs, + ... +}: { + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-unwrapped" + "steam-run" + "steam-original" + "osu-lazer" + ]; programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/nixos/services/jellyfin.nix b/nixos/services/jellyfin.nix index 3a74d6f..91c4347 100644 --- a/nixos/services/jellyfin.nix +++ b/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; diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 3667716..5e6c633 100644 --- a/nixos/workstation.nix +++ b/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" - ]; }