diff --git a/configs/home-manager/alacritty/alacritty.toml b/configs/home-manager/alacritty/alacritty.toml index dc6a4e6..ebe9a48 100644 --- a/configs/home-manager/alacritty/alacritty.toml +++ b/configs/home-manager/alacritty/alacritty.toml @@ -70,8 +70,5 @@ text = "#1E1E2E" cursor = "#B4BEFE" text = "#1E1E2E" -[env] -TERM = "xterm-256color" - [font] -size = 10 +size = 11 diff --git a/flake.lock b/flake.lock index c1504fe..43d56f4 100644 --- a/flake.lock +++ b/flake.lock @@ -645,6 +645,22 @@ "type": "github" } }, + "mediainfo-yazi": { + "flake": false, + "locked": { + "lastModified": 1738192186, + "narHash": "sha256-MW0pawBT2S0rOoclCQahiYzLX5JZPuiALCG0ZzOqvM4=", + "owner": "boydaihungst", + "repo": "mediainfo.yazi", + "rev": "e2a7cfd750226ce4adc3acc42b4cf75c79fe9f0e", + "type": "github" + }, + "original": { + "owner": "boydaihungst", + "repo": "mediainfo.yazi", + "type": "github" + } + }, "minecraft-server-flake": { "inputs": { "flake-utils": [ @@ -1309,6 +1325,22 @@ "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.sug" } }, + "open-with-cmd-yazi": { + "flake": false, + "locked": { + "lastModified": 1734695728, + "narHash": "sha256-IAJSZhO6WEIjSXlUvmcX3rgpQKu358vfe5dEm7JtmPg=", + "owner": "Ape", + "repo": "open-with-cmd.yazi", + "rev": "a80d1cf41fc23f84fbdf0b8b26c5b13f06455472", + "type": "github" + }, + "original": { + "owner": "Ape", + "repo": "open-with-cmd.yazi", + "type": "github" + } + }, "packwiz": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -1381,6 +1413,7 @@ "home-manager": "home-manager_2", "lazydev": "lazydev", "luavit-meta": "luavit-meta", + "mediainfo-yazi": "mediainfo-yazi", "minecraft-server-flake": "minecraft-server-flake", "neorg": "neorg", "neorg-overlay": "neorg-overlay", @@ -1400,10 +1433,13 @@ "nvim-spell-de-latin1-suggestions": "nvim-spell-de-latin1-suggestions", "nvim-spell-de-utf8-dictionary": "nvim-spell-de-utf8-dictionary", "nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions", + "open-with-cmd-yazi": "open-with-cmd-yazi", "raspberry-pi-nix": "raspberry-pi-nix", "sops-nix": "sops-nix", + "starship-yazi": "starship-yazi", "systems": "systems_3", - "vim-mcfunction": "vim-mcfunction" + "vim-mcfunction": "vim-mcfunction", + "yazi-plugins": "yazi-plugins" } }, "rpi-bluez-firmware-src": { @@ -1545,6 +1581,22 @@ "type": "github" } }, + "starship-yazi": { + "flake": false, + "locked": { + "lastModified": 1737485134, + "narHash": "sha256-L7MkZZqJ+t+A61ceC4Q1joLF6ytoWdgx9BwZWAGAoCA=", + "owner": "Rolv-Apneseth", + "repo": "starship.yazi", + "rev": "af8bf6f82165b83272b6501ce7445cf2c61fbf51", + "type": "github" + }, + "original": { + "owner": "Rolv-Apneseth", + "repo": "starship.yazi", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1694,6 +1746,22 @@ "repo": "vim-mcfunction", "type": "github" } + }, + "yazi-plugins": { + "flake": false, + "locked": { + "lastModified": 1738169700, + "narHash": "sha256-1FZ8wcf2VVp6ZWY27vm1dUU1KAL32WwoYbNA/8RUAog=", + "owner": "yazi-rs", + "repo": "plugins", + "rev": "02d18be03812415097e83c6a912924560e4cec6d", + "type": "github" + }, + "original": { + "owner": "yazi-rs", + "repo": "plugins", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 56d22a8..7d5285a 100644 --- a/flake.nix +++ b/flake.nix @@ -150,7 +150,7 @@ }; in { devShells.default = pkgs.mkShell { - packages = with pkgs; [((nixos{}).nixos-rebuild)]; + packages = with pkgs; [(nixos{}).nixos-rebuild]; }; }); @@ -327,6 +327,24 @@ systems.follows = "systems"; }; }; + + + yazi-plugins = { + url = "github:yazi-rs/plugins"; + flake = false; + }; + starship-yazi = { + url = "github:Rolv-Apneseth/starship.yazi"; + flake = false; + }; + mediainfo-yazi = { + url = "github:boydaihungst/mediainfo.yazi"; + flake = false; + }; + open-with-cmd-yazi = { + url = "github:Ape/open-with-cmd.yazi"; + flake = false; + }; }; nixConfig = { diff --git a/modules/home-manager/shell/tmux/default.nix b/modules/home-manager/shell/tmux/default.nix index 7ac1019..2e66db8 100644 --- a/modules/home-manager/shell/tmux/default.nix +++ b/modules/home-manager/shell/tmux/default.nix @@ -14,7 +14,7 @@ sensibleOnTop = true; escapeTime = 0; tmuxp.enable = true; - terminal = "xterm-kitty"; + #terminal = "xterm-kitty"; plugins = with pkgs.tmuxPlugins; [ sensible yank diff --git a/modules/home-manager/shell/yazi/default.nix b/modules/home-manager/shell/yazi/default.nix index c60663d..7d65159 100644 --- a/modules/home-manager/shell/yazi/default.nix +++ b/modules/home-manager/shell/yazi/default.nix @@ -1,11 +1,6 @@ -{ pkgs, ... }: +{ inputs, ... }: let - yazi-plugins = pkgs.fetchFromGitHub { - owner = "yazi-rs"; - repo = "plugins"; - rev = "02d18be03812415097e83c6a912924560e4cec6d"; - hash = "sha256-1FZ8wcf2VVp6ZWY27vm1dUU1KAL32WwoYbNA/8RUAog="; - }; + inherit (inputs) yazi-plugins mediainfo-yazi starship-yazi open-with-cmd-yazi; in { programs = { @@ -15,24 +10,15 @@ in shellWrapperName = "y"; plugins = { chmod = "${yazi-plugins}/chmod.yazi"; - full-border = "${yazi-plugins}/full-border.yazi"; + #full-border = "${yazi-plugins}/full-border.yazi"; git = "${yazi-plugins}/git.yazi"; smart-enter = "${yazi-plugins}/smart-enter.yazi"; - starship = pkgs.fetchFromGitHub { - owner = "Rolv-Apneseth"; - repo = "starship.yazi"; - rev = "af8bf6f82165b83272b6501ce7445cf2c61fbf51"; - hash = "sha256-L7MkZZqJ+t+A61ceC4Q1joLF6ytoWdgx9BwZWAGAoCA="; - }; - mediainfo = pkgs.fetchFromGitHub { - owner = "boydaihungst"; - repo = "mediainfo.yazi"; - rev = "e2a7cfd750226ce4adc3acc42b4cf75c79fe9f0e"; - hash = "sha256-MW0pawBT2S0rOoclCQahiYzLX5JZPuiALCG0ZzOqvM4="; - }; + starship = starship-yazi; + mediainfo = mediainfo-yazi; + open-with-cmd = open-with-cmd-yazi; }; initLua = '' - require("full-border"):setup() + --require("full-border"):setup() require("starship"):setup() require("git"):setup() require("smart-enter"):setup({ @@ -56,10 +42,38 @@ in }; keymap = { manager.prepend_keymap = [ - { run = "cd /media/net/svartalbenheim/media_data/"; on = [ "g" "m" ]; desc = "Cd to media_data"; } - { run = "cd /media/net/svartalbenheim/media_data/media/Video"; on = [ "g" "v" ]; desc = "Cd to media_data"; } - { run = "cd /media/net/svartalbenheim/media_data/media/Audio"; on = [ "g" "a" ]; desc = "Cd to media_data"; } - { run = "plugin smart-enter"; on = [ "l" ]; desc = "Enter the child directory, or open the file"; } + { on = "K"; run = "seek -20"; desc = "Seek up 20 units in the preview"; } + { on = "J"; run = "seek 20"; desc = "Seek down 20 units in the preview"; } + { + run = "cd /media/net/svartalbenheim/media_data/"; + on = [ "g" "m" ]; + desc = "Cd to media_data"; + } + { + run = "cd /media/net/svartalbenheim/media_data/media/Video"; + on = [ "g" "v" ]; + desc = "Cd to media_data"; + } + { + run = "cd /media/net/svartalbenheim/media_data/media/Audio"; + on = [ "g" "a" ]; + desc = "Cd to media_data"; + } + { + run = "plugin smart-enter"; + on = [ "l" ]; + desc = "Enter the child directory, or open the file"; + } + { + on = "o"; + run = "plugin open-with-cmd --args=block"; + desc = "Open with command in the terminal"; + } + { + on = "O"; + run = "plugin open-with-cmd"; + desc = "Open with command"; + } ]; }; }; diff --git a/pkgs/kodi/default.nix b/pkgs/kodi/default.nix index 667fec8..5ea8ebd 100644 --- a/pkgs/kodi/default.nix +++ b/pkgs/kodi/default.nix @@ -1,5 +1,5 @@ -{ callPackage, kodi-wayland, ... }: -kodi-wayland.withPackages +{ kodi-gbm, ... }: +kodi-gbm.withPackages (kodiPkgs: with kodiPkgs; [ youtube pvr-iptvsimple @@ -8,7 +8,6 @@ kodi-wayland.withPackages inputstream-ffmpegdirect requests-cache inputstreamhelper - (callPackage ../../pkgs/kodiPackages/advanced-emulator-launcher { }) jellyfin jellycon ])