From b860dab819abe727605efcc4a51737f6bd0b8a19 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Fri, 20 Dec 2024 22:50:50 +0100 Subject: [PATCH] added zoxide and eza --- nixos/configuration.nix | 12 +++++++++++- .../default.nix} | 0 .../firmware/all_firmware.tar.gz | Bin .../firmware/kernelcache.release.mac13g | Bin .../{macos => apple-silicon-linux}/homemac.nix | 0 .../widevine-overlay.nix | 0 .../{macos => apple-silicon-linux}/widevine.nix | 0 nixos/home.nix | 15 +++++++++++++-- nixos/hosts/kylekrein-mac/default.nix | 2 +- nixos/modules/hyprland/default.nix | 2 ++ nixos/modules/hyprland/hyprland.nix | 14 ++++++++++++++ 11 files changed, 41 insertions(+), 4 deletions(-) rename nixos/hardware/{macos/configuration.nix => apple-silicon-linux/default.nix} (100%) rename nixos/hardware/{macos => apple-silicon-linux}/firmware/all_firmware.tar.gz (100%) rename nixos/hardware/{macos => apple-silicon-linux}/firmware/kernelcache.release.mac13g (100%) rename nixos/hardware/{macos => apple-silicon-linux}/homemac.nix (100%) rename nixos/hardware/{macos => apple-silicon-linux}/widevine-overlay.nix (100%) rename nixos/hardware/{macos => apple-silicon-linux}/widevine.nix (100%) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fd49ef6..c19a833 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -127,11 +127,15 @@ loginBackground = false; }) nix-output-monitor - + eza + zoxide fd (pkgs.writeShellScriptBin "root-files" '' sudo ${pkgs.fd}/bin/fd --one-file-system --base-directory / --type f --hidden --exclude "{tmp,etc/passwd}" '') #https://www.reddit.com/r/NixOS/comments/1d1apm0/comment/l5tgbwz/?utm_source=share&utm_medium=web3x&utm_name=web3xcss&utm_term=1&utm_content=share_button + (pkgs.writeShellScriptBin "root-files" '' + sudo ${pkgs.fd}/bin/fd --one-file-system --base-directory / --type f --hidden --exclude "{tmp,etc/passwd}" + '') gparted exfatprogs kitty @@ -311,6 +315,12 @@ base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; }; + programs.bash = { + shellAliases = { + ls = "${pkgs.eza}/bin/eza --icons=always"; + }; + }; + #services.flatpak.enable = true; #services.flatpak.packages = [ # "flathub:app/org.kde.dolphin//stable" diff --git a/nixos/hardware/macos/configuration.nix b/nixos/hardware/apple-silicon-linux/default.nix similarity index 100% rename from nixos/hardware/macos/configuration.nix rename to nixos/hardware/apple-silicon-linux/default.nix diff --git a/nixos/hardware/macos/firmware/all_firmware.tar.gz b/nixos/hardware/apple-silicon-linux/firmware/all_firmware.tar.gz similarity index 100% rename from nixos/hardware/macos/firmware/all_firmware.tar.gz rename to nixos/hardware/apple-silicon-linux/firmware/all_firmware.tar.gz diff --git a/nixos/hardware/macos/firmware/kernelcache.release.mac13g b/nixos/hardware/apple-silicon-linux/firmware/kernelcache.release.mac13g similarity index 100% rename from nixos/hardware/macos/firmware/kernelcache.release.mac13g rename to nixos/hardware/apple-silicon-linux/firmware/kernelcache.release.mac13g diff --git a/nixos/hardware/macos/homemac.nix b/nixos/hardware/apple-silicon-linux/homemac.nix similarity index 100% rename from nixos/hardware/macos/homemac.nix rename to nixos/hardware/apple-silicon-linux/homemac.nix diff --git a/nixos/hardware/macos/widevine-overlay.nix b/nixos/hardware/apple-silicon-linux/widevine-overlay.nix similarity index 100% rename from nixos/hardware/macos/widevine-overlay.nix rename to nixos/hardware/apple-silicon-linux/widevine-overlay.nix diff --git a/nixos/hardware/macos/widevine.nix b/nixos/hardware/apple-silicon-linux/widevine.nix similarity index 100% rename from nixos/hardware/macos/widevine.nix rename to nixos/hardware/apple-silicon-linux/widevine.nix diff --git a/nixos/home.nix b/nixos/home.nix index c5dc722..a30588b 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -7,8 +7,8 @@ [ ./modules/nixvim ./modules/fastfetch - ] ++ (if hwconfig.useImpermanence then [ (import ./modules/impermanence/home.nix { inherit username; inherit inputs; } ) ] else []) - ++ (if config.programs.hyprland.enable then [./modules/hyprland/home.nix] else []) + ] ++ lib.optional (hwconfig.useImpermanence) (import ./modules/impermanence/home.nix { inherit username; inherit inputs; } ) + ++ lib.optional (config.programs.hyprland.enable) ./modules/hyprland/home.nix ++ lib.optional (builtins.pathExists ./homes/${username}) ./homes/${username}; # Home Manager needs a bit of information about you and the paths it should # manage. @@ -41,6 +41,17 @@ enableBashIntegration = true; }; + programs.eza = { + enable = true; + icons = "always"; + }; + + programs.zoxide = { + enable = true; + options = [ "--cmd cd" ]; + enableBashIntegration = true; + }; + #xdg.configFile."qt5ct/qt5ct.conf".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" { # Appearance.icon_theme = "Breeze Dark"; # }; diff --git a/nixos/hosts/kylekrein-mac/default.nix b/nixos/hosts/kylekrein-mac/default.nix index 6e5064a..29247d7 100644 --- a/nixos/hosts/kylekrein-mac/default.nix +++ b/nixos/hosts/kylekrein-mac/default.nix @@ -3,7 +3,7 @@ imports = [ inputs.apple-silicon-support.nixosModules.default ./mac-hardware-conf.nix - ../../hardware/macos/configuration.nix + ../../hardware/apple-silicon-linux ../../modules/hyprland diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix index c1de7b9..698055b 100644 --- a/nixos/modules/hyprland/default.nix +++ b/nixos/modules/hyprland/default.nix @@ -1,6 +1,8 @@ { pkgs, inputs, hwconfig, ... }: { environment.systemPackages = with pkgs; [ + kando + kdePackages.qtwayland #libsForQt5.qt5.qtwayland #libsForQt5.qt5.qtsvg diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/hyprland/hyprland.nix index 1821dd3..4dea31f 100644 --- a/nixos/modules/hyprland/hyprland.nix +++ b/nixos/modules/hyprland/hyprland.nix @@ -39,6 +39,7 @@ in "${pkgs.clipse}/bin/clipse -listen &" "${pkgs.swww}/bin/swww-daemon &" "${pkgs.swww}/bin/swww img ${wallpaper-image} &" + #"${pkgs.kando}/bin/kando" ]; exec = [ @@ -64,6 +65,7 @@ in "$mod, F, fullscreen," "$mod, R, exec, $menu" "$mod, V, exec, $clipboardManager" + #"CTRL, SPACE, global, kando:example-menu" "$mod SHIFT, I, exec, source ${toggle_monitors}" "$mod SHIFT, O, exec, hyprctl dispatch dpms on" # Move focus with mainMod + arrow keys @@ -159,6 +161,17 @@ in }; + windowrule = [ + #kando + "noblur, kando" + "opaque, kando" + "size 100% 100%, kando" + "noborder, kando" + "noanim, kando" + "float, kando" + "pin, kando" + ]; + windowrulev2 = [ # Ignore maximize requests from apps. You'll probably like this. "suppressevent maximize, class:.*" @@ -173,6 +186,7 @@ in #for clipboard manager "float,class:(clipse)" "size 622 652,class:(clipse)" # set the size of the window as necessary + ]; decoration = {