diff --git a/jetpure/home/parts/alias.nix b/jetpure/home/parts/alias.nix index 68f902a..14918a0 100644 --- a/jetpure/home/parts/alias.nix +++ b/jetpure/home/parts/alias.nix @@ -7,7 +7,8 @@ # FAST CP & RM cp = "${fuc}/bin/cpz"; - rm = "${fuc}/bin/rmz"; + rmf = "${fuc}/bin/rmz"; + rm = "trash put"; # USEFUL ca = "cava"; diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index 5f35632..cc723b2 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -22,33 +22,25 @@ in { imports = [ ./torrserver ]; config = mkMerge [ (mkIf cfg.common.enable { - environment = { - systemPackages = [ ] ++ cfg.pkgs; - pathsToLink = [ "/share/zsh" ]; - }; + environment.systemPackages = [ ] ++ cfg.pkgs; programs = { - light = True; nano = False; + light = True; git = True // { package = pkgs.gitMinimal; }; - nh = True // { - flake = flakeDir; - clean = True // { extraArgs = "--keep-since 3d --keep 3"; }; - }; + nh = True // { flake = flakeDir; }; }; }) (mkIf cfg.hyprland.enable { - programs = { - hyprland = with pkgs; - let h = inputs.hyprland.packages.${system}; - in True // { - package = h.hyprland; - portalPackage = h.xdg-desktop-portal-hyprland; - }; - }; + programs.hyprland = with inputs.hyprland.packages.${pkgs.system}; + True // { + package = hyprland; + portalPackage = xdg-desktop-portal-hyprland; + }; }) (mkIf cfg.sway.enable { - programs = { sway = True // { package = pkgs.swayfx; }; }; + programs.sway = True // { package = pkgs.swayfx; }; }) + (mkIf cfg.hamachi.enable { programs.haguichi = True; }) (mkIf cfg.steam.enable { environment.systemPackages = with pkgs; [ protonup-qt ]; hardware.xone = True; @@ -57,6 +49,7 @@ in { gamemode = True; steam = True // { # GAMING gamescopeSession = True; + remotePlay.openFirewall = true; extraCompatPackages = with pkgs; [ proton-ge-bin ]; package = pkgs.steam.override { extraEnv = { @@ -68,7 +61,6 @@ in { }; }; }) - (mkIf cfg.hamachi.enable { programs.haguichi = True; }) ]; }