diff --git a/home/programs/group/basic-apps.nix b/home/programs/group/basic-apps.nix index 4b153ce..2796032 100644 --- a/home/programs/group/basic-apps.nix +++ b/home/programs/group/basic-apps.nix @@ -11,9 +11,9 @@ switcheroo # Convert images between different formats onlyoffice-desktopeditors # Office suite blanket # Listen to different sounds - signal-desktop # Messaging app librewolf # Backup browser + imagemagick # Image manipulation tool # I love TUIs caligula # User-friendly, lightweight TUI for disk imaging (ISO, USB BOOT) @@ -24,5 +24,7 @@ tealdeer # Fast tldr client sttr # Minimalist "cyberchef" like. Cross-platform, cli app to perform various operations on string httpie # Command-line HTTP client, a user-friendly cURL replacement + wiremix # Simple TUI mixer for PipeWire + impala # TUI for managing wifi ]; } diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index fbee34b..1c0cf65 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -47,11 +47,7 @@ in { ''; shellAliases = { - s = "superfile"; - spf = "superfile"; - spt = "spotatui"; - vim = "nvim"; vi = "nvim"; v = "nvim"; diff --git a/home/programs/superfile/default.nix b/home/programs/superfile/default.nix deleted file mode 100644 index 8e38698..0000000 --- a/home/programs/superfile/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{config, ...}: { - xdg.userDirs = { - enable = true; - setSessionVariables = true; - createDirectories = true; - desktop = "${config.home.homeDirectory}/Desktop"; - download = "${config.home.homeDirectory}/Downloads"; - pictures = "${config.home.homeDirectory}/Pictures"; - music = null; - documents = null; - videos = null; - templates = null; - publicShare = null; - }; - - programs.superfile = { - enable = true; - firstUseCheck = false; - pinnedFolders = [ - { - name = "dev"; - location = "/home/hadrien/dev"; - } - { - name = "nixos"; - location = "/home/hadrien/.config/nixos"; - } - { - name = "trash"; - location = "/home/hadrien/.local/share/Trash/files"; - } - ]; - settings = { - transparent_background = true; - ignore_missing_fields = true; - }; - }; -} diff --git a/home/programs/yazi/default.nix b/home/programs/yazi/default.nix new file mode 100644 index 0000000..bc1daf6 --- /dev/null +++ b/home/programs/yazi/default.nix @@ -0,0 +1,36 @@ +{ pkgs, ... }: { + programs.yazi = { + enable = true; + shellWrapperName = "y"; + + plugins = { + git = { package = pkgs.yaziPlugins.git; setup = true; }; + ouch = pkgs.yaziPlugins.ouch; + piper = pkgs.yaziPlugins.piper; + convert = pkgs.yaziPlugins.convert; + }; + + settings.plugin = { + prepend_fetchers = [ + { url = "*"; run = "git"; group = "git"; } + { url = "*/"; run = "git"; group = "git"; } + ]; + prepend_previewers = [ + { url = "*.md"; run = ''piper -- CLICOLOR_FORCE=1 glow -w=$w -s=dark "$1"''; } + ]; + prepend_openers = [ + { url = "*.{zip,tar,gz,bz2,xz,7z,rar}"; run = "ouch"; } + ]; + }; + + keymap.mgr.prepend_keymap = [ + { on = ["C"]; run = "plugin ouch"; desc = "Compress"; } + { on = ["X"]; run = "plugin ouch --args=extract"; desc = "Extract"; } + { on = ["c" "p"]; run = "plugin convert -- --extension='png'"; desc = "Convert to PNG"; } + { on = ["c" "j"]; run = "plugin convert -- --extension='jpg'"; desc = "Convert to JPG"; } + { on = ["c" "w"]; run = "plugin convert -- --extension='webp'"; desc = "Convert to WebP"; } + ]; + }; + + home.packages = with pkgs; [ glow ouch hexyl ]; +} diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index c8e229c..eae346e 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -15,8 +15,8 @@ ../../home/programs/nixy ../../home/programs/nightshift ../../home/programs/nix-utils - ../../home/programs/superfile ../../home/programs/spotatui + ../../home/programs/yazi ../../home/programs/group/basic-apps.nix ../../home/programs/group/cybersecurity.nix diff --git a/hosts/server/home.nix b/hosts/server/home.nix index a3c0e6f..5eafaa1 100644 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -10,7 +10,7 @@ ../../home/programs/git/lazygit.nix ../../home/programs/nixy ../../home/programs/nix-utils - ../../home/programs/superfile + ../../home/programs/yazi ../../home/programs/group/dev.nix ]; diff --git a/hosts/work/home.nix b/hosts/work/home.nix index ad94bce..7ab8cd7 100644 --- a/hosts/work/home.nix +++ b/hosts/work/home.nix @@ -13,8 +13,8 @@ ../../home/programs/nixy ../../home/programs/nightshift ../../home/programs/nix-utils - ../../home/programs/superfile ../../home/programs/spotatui + ../../home/programs/yazi ../../home/programs/group/basic-apps.nix ../../home/programs/group/cybersecurity.nix diff --git a/nixos/utils.nix b/nixos/utils.nix index c50e268..30e7094 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -15,6 +15,8 @@ in { networking.hostName = hostname; networking.networkmanager.enable = true; + networking.networkmanager.wifi.backend = "iwd"; + networking.wireless.iwd.enable = true; systemd.services.NetworkManager-wait-online.enable = false; system.autoUpgrade = {