From dcdb94250c867b3f37f4277d0bc7fa62d12a5064 Mon Sep 17 00:00:00 2001 From: Lilith Date: Sun, 14 Jul 2024 22:33:17 +0200 Subject: [PATCH] steam --- home/env.nix | 18 ++++++++++-------- home/packages.nix | 2 ++ home/persist.nix | 1 + home/zsh/default.nix | 12 +----------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/home/env.nix b/home/env.nix index 26ec66ea..b860818d 100644 --- a/home/env.nix +++ b/home/env.nix @@ -1,12 +1,14 @@ -{conf, config,...}: { +{conf, config, pkgs, ...}: { home = { - file.inbox.source = config.lib.file.mkOutOfStoreSymLink "/home/${conf.user}/sync/inbox"; + file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/${conf.user}/sync/inbox"; - shellAliases = [ - cat = "bat -p" - ls = "eza" - ll = "eza -l" - la = "eza -la" - ]; + shellAliases = { + cat = "bat -p"; + "." = "source"; + ls = "${pkgs.eza}/bin/eza -g --git --group-directories-first"; + ll = "${pkgs.eza}/bin/eza -l"; + la = "${pkgs.eza}/bin/eza -la"; + grep = "grep --color=auto"; + }; }; } diff --git a/home/packages.nix b/home/packages.nix index c238d7cb..d3d7a3b4 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -31,11 +31,13 @@ htop ollama + zoom-us ]; gaming = with pkgs; [ prismlauncher lutris + steamtinkerlaunch ]; in common ++ (lib.optionals system-config.gaming.enable gaming); diff --git a/home/persist.nix b/home/persist.nix index b050e71a..1f3b8d26 100644 --- a/home/persist.nix +++ b/home/persist.nix @@ -21,6 +21,7 @@ ".local/share/PrismLauncher" ".local/share/Steam" ".local/share/lutris" + ".local/share/games" ]; files = []; }; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index f92316f5..db1735e7 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -1,13 +1,4 @@ -{pkgs, ...}: let - aliases = { - "." = "source"; - ls = "EXA_COLORS='xx=2;37' ${pkgs.eza}/bin/eza -g --git --group-directories-first"; - l = "ls -aal"; - atree = "ls -alT"; - tree = "ls -lT"; - grep = "grep --color=auto"; - }; -in { +{pkgs, ...}: { programs.zsh = { enable = true; autosuggestion.enable = true; @@ -34,6 +25,5 @@ in { zstyle ':completion:*' menu select ''; - shellAliases = aliases; }; }