diff --git a/nixos/flake.lock b/nixos/flake.lock index 52dcf45..9327918 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -26,11 +26,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1687595284, - "narHash": "sha256-W4bGX7yCjWLeAugWpCMURlXxgPmXBJGTr/isGyd6Uew=", + "lastModified": 1687647567, + "narHash": "sha256-Ua90LZYJO7/7KW/KK/AqijhIekd+wxPwbVKXuBYzJeQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "05a584b4f63f5de442f59c8cec01dddc77312856", + "rev": "6ca1e16eb3016c94b7ac16699e1d4158bd4e39a4", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687466461, - "narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=", + "lastModified": 1687729501, + "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b", + "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1687502512, - "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", + "lastModified": 1687681650, + "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f", + "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", "type": "github" }, "original": { diff --git a/nixos/modules/utils/default.nix b/nixos/modules/utils/default.nix index f1177e9..0f58410 100644 --- a/nixos/modules/utils/default.nix +++ b/nixos/modules/utils/default.nix @@ -12,6 +12,7 @@ duf git-crypt lynx + nsxiv w3m zenith ]; diff --git a/nixos/modules/utils/vifm/default.nix b/nixos/modules/utils/vifm/default.nix index 6046d15..61e1da7 100644 --- a/nixos/modules/utils/vifm/default.nix +++ b/nixos/modules/utils/vifm/default.nix @@ -1,14 +1,22 @@ { config, lib, pkgs, ... }: { - home-manager.users.tdpeuter.home = { - packages = with pkgs; [ - vifm - font-awesome_5 - ]; - file = { - ".config/vifm".source = ../../../../stow/vifm/.config/vifm; - }; + home-manager.users.tdpeuter.home = { + packages = with pkgs; [ + vifm + + chafa # Terminal image previewer + glow # Terminal Markdown renderer + + font-awesome_5 + ]; + + # Put files separately so history still works + file = { + ".config/vifm/colors".source = ../../../../stow/vifm/.config/vifm/colors; + ".config/vifm/scripts".source = ../../../../stow/vifm/.config/vifm/scripts; + ".config/vifm/vifmrc".source = ../../../../stow/vifm/.config/vifm/vifmrc; }; + }; } diff --git a/stow/mpv/.config/mpv/mpv.conf b/stow/mpv/.config/mpv/mpv.conf index d2fe746..94e3b21 100644 --- a/stow/mpv/.config/mpv/mpv.conf +++ b/stow/mpv/.config/mpv/mpv.conf @@ -25,6 +25,7 @@ save-position-on-quit=yes # Disable video output vid=no +fs=no # Profile for terminal-only [terminal] diff --git a/stow/vifm/.config/vifm/vifmrc b/stow/vifm/.config/vifm/vifmrc index afe0139..b4b588a 100644 --- a/stow/vifm/.config/vifm/vifmrc +++ b/stow/vifm/.config/vifm/vifmrc @@ -205,6 +205,7 @@ filextype {*.djvu}, " Audio filetype {*.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus}, \