diff options
| -rw-r--r-- | config/lf/lfrc | 24 | ||||
| -rw-r--r-- | config/zsh/zshrc | 4 | ||||
| -rw-r--r-- | configuration.nix | 3 | ||||
| m--------- | extras/notes | 0 | ||||
| -rw-r--r-- | hardware-configuration.nix | 1 | ||||
| -rw-r--r-- | home.nix | 1 | ||||
| -rw-r--r-- | modules/mpv.home.nix | 28 | ||||
| -rw-r--r-- | overlays-home.nix | 10 | ||||
| -rw-r--r-- | overlays-system.nix | 2 | ||||
| -rw-r--r-- | packages.nix | 4 |
10 files changed, 61 insertions, 16 deletions
diff --git a/config/lf/lfrc b/config/lf/lfrc index 3a9b26d..98c495e 100644 --- a/config/lf/lfrc +++ b/config/lf/lfrc @@ -4,9 +4,11 @@ set icons true set ignorecase true set relativenumber true set ratios 2:3 +set dirpreviews false -set preview false +set preview true set previewer ~/.config/lf/previewer.sh +set cursorpreviewfmt "\033[7m" cmd open_internal ${{ case $(file --mime-type "$f" -bL) in @@ -39,12 +41,6 @@ cmd move_to_trash ${{ done; }} -cmd rename %{{ - printf " Rename to: " - read ans - mv -i "$f" "$ans" -}} - cmd show_images ${{ if [ "$(echo "$fx" | wc -l)" = "1" ]; then sxiv $(dirname "$fx") & @@ -53,6 +49,18 @@ cmd show_images ${{ fi; }} +cmd unzip_zip ${{ + unzip $f; +}} + +cmd unzip_7z ${{ + nix-zsh -p p7zip --run '7z x $f'; +}} + +cmd unzip_rar ${{ + NIXPKGS_ALLOW_UNFREE=1 nix-zsh -p unrar --run 'unrar x $f'; +}} + # }}} # Unset old keys {{{ @@ -74,8 +82,6 @@ map x cut map y copy map mf mkfile map md mkdir -map rr rename - # View changes map <enter> open_internal diff --git a/config/zsh/zshrc b/config/zsh/zshrc index 9bf0e26..2182122 100644 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -19,7 +19,9 @@ for f in $ZSH_CUSTOM_CONF_FILES/*.zsh; do source $f; done; source $ZSH_CUSTOM_CONF_FILES/aliases.zsh; # Direnv setup -eval "$(direnv hook zsh)" +if [[ "$DIRENV_DISABLE_HOOK" != "1" ]]; then + eval "$(direnv hook zsh)" +fi; # Plugins # source ~/.config/zshplugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh; diff --git a/configuration.nix b/configuration.nix index b41be4d..40796f0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -57,7 +57,8 @@ in # }; # }; - hardware.bluetooth.enable = false; + # NOTE: Enable bluetooth using this and then use bluetoothctl + # hardware.bluetooth.enable = true; # services.blueman.enable = true; # services.vdirsyncer = { diff --git a/extras/notes b/extras/notes -Subproject 67264efaf392e2b1c2c00dda3f5e97eada5f991 +Subproject 55f17aa629282ed961f47e25b1fe54e93fae781 diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 6db9258..4cc7a61 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -37,6 +37,7 @@ services.udev = { packages = [ pkgs.android-udev-rules + pkgs.platformio-core.udev ]; extraRules = '' @@ -8,6 +8,7 @@ in ./modules/music.home.nix ./modules/git.home.nix ./modules/xresources.home.nix + ./modules/mpv.home.nix ]; home.packages = with pkgs; [ diff --git a/modules/mpv.home.nix b/modules/mpv.home.nix new file mode 100644 index 0000000..a62e357 --- /dev/null +++ b/modules/mpv.home.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: +{ + programs.mpv = { + enable = true; + + bindings = { + "Alt+0" = "set window-scale 0.5"; + }; + + config = { + force-window = true; + ytdl-format = "bestvideo+bestaudio"; + cache-default = 4000000; + }; + + scripts = [ + pkgs.mpvScripts.uosc + ]; + + # scriptOpts = { + # osc = { + # scalewindowed = 2.0; + # vidscale = false; + # visibility = "always"; + # }; + # }; + }; +} diff --git a/overlays-home.nix b/overlays-home.nix index 00558d3..dbeb552 100644 --- a/overlays-home.nix +++ b/overlays-home.nix @@ -1,8 +1,14 @@ { pkgs, ... }: let - overlays = import ./overlays/default.nix {}; -in { + overlays = import ./overlays/default.nix { }; +in +{ nixpkgs.overlays = with overlays; [ pass-with-dmenu + + # Home manager issue {https://discourse.nixos.org/t/error-when-upgrading-nixos-related-to-fcitx-engines/26940} + (self: super: { + fcitx-engines = super.fcitx5; + }) ]; } diff --git a/overlays-system.nix b/overlays-system.nix index 1c4d4ed..a14e8d6 100644 --- a/overlays-system.nix +++ b/overlays-system.nix @@ -1,6 +1,6 @@ { pkgs, ... }: let - overlays = import ./overlays/default.nix {}; + overlays = import ./overlays/default.nix { }; in { nixpkgs.overlays = with overlays; [ diff --git a/packages.nix b/packages.nix index 67f6155..811cbc2 100644 --- a/packages.nix +++ b/packages.nix @@ -29,7 +29,7 @@ let gcc gnumake - nodejs-16_x + nodejs-18_x # godot @@ -61,7 +61,7 @@ let # Media spotify - mpv + # mpv sxiv youtube-dl imagemagick |