diff --git a/home/asakiyuki/modules/files.nix b/home/asakiyuki/modules/files.nix index e6f1ad6..3d607a0 100644 --- a/home/asakiyuki/modules/files.nix +++ b/home/asakiyuki/modules/files.nix @@ -23,6 +23,9 @@ [General] TerminalApplication=${osconfig.device.programs.terminal} + + [Icons] + Theme=Papirus ''; }; } \ No newline at end of file diff --git a/modules/features/home/bash.nix b/modules/features/home/bash.nix index 1d6f06e..2d9a838 100644 --- a/modules/features/home/bash.nix +++ b/modules/features/home/bash.nix @@ -1,19 +1,24 @@ { lib, osconfig, ... }: { programs.bash = { enable = true; - shellAliases = { - cls = "clear"; - cleanup = "sudo nix-collect-garbage -d"; - cls-log = "sudo journalctl --vacuum-time=1s"; + shellAliases = lib.attrsets.mergeAttrsList [ + { + cls = "clear"; + cleanup = "sudo nix-collect-garbage -d"; + cls-log = "sudo journalctl --vacuum-time=1s"; - logout = "pkill -KILL -u $USER"; + logout = "pkill -KILL -u $USER"; - nrs = "sudo nixos-rebuild switch --flake /etc/nixos#${osconfig.device.flake-name}"; - flake-upgrade = "nix flake update"; - spf = "superfile"; - } // lib.mkIf osconfig.virtualisation.waydroid.enable { - wss = "waydroid session stop; exit;"; - }; + nrs = "sudo nixos-rebuild switch --flake /etc/nixos#${osconfig.device.flake-name}"; + flake-upgrade = "nix flake update"; + } + { + spf = "superfile"; + } + (lib.mkIf osconfig.virtualisation.waydroid.enable { + wss = "waydroid session stop; exit;"; + }) + ]; shellOptions = [ "histappend" diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix index 3512ca4..ed3e0ce 100644 --- a/modules/features/system/packages.nix +++ b/modules/features/system/packages.nix @@ -21,6 +21,7 @@ in with pkgs; [ custom-catppuccin-gtk + papirus-icon-theme git vim