From ddfe750fb8dc6fd65f63afb75e647c1b0bc17797 Mon Sep 17 00:00:00 2001 From: Matthieu Morin Date: Sun, 9 Jun 2024 17:11:39 +0000 Subject: [PATCH] init --- home/laozi/common/core/default.nix | 54 ++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/home/laozi/common/core/default.nix b/home/laozi/common/core/default.nix index 4262500..6190591 100644 --- a/home/laozi/common/core/default.nix +++ b/home/laozi/common/core/default.nix @@ -1,24 +1,25 @@ -{ config, lib, pkgs, outputs, ... }: -let - -in +{ config, lib, pkgs, outputs, configLib, ... }: { - imports = [ - # Packages with custom configs go here - ./brave.nix - ./gtk.nix + imports = (configLib.scanPaths ./.) + ++ (builtins.attrValues outputs.homeManagerModules); - ] ++ (builtins.attrValues outputs.homeManagerModules); + services.ssh-agent.enable = true; home = { - username = lib.mkDefault "laozi"; + username = lib.mkDefault "ta"; homeDirectory = lib.mkDefault "/home/${config.home.username}"; stateVersion = lib.mkDefault "24.05"; sessionPath = [ "$HOME/.local/bin" + "$HOME/scripts/talon_scripts" ]; sessionVariables = { - SHELL = "bash"; + FLAKE = "$HOME/src/nix-config"; + SHELL = "zsh"; + TERM = "foot"; + TERMINAL = "foot"; + EDITOR = "nvim"; + MANPAGER = "batman"; # see ./cli/bat.nix }; }; @@ -26,7 +27,32 @@ in inherit (pkgs) # Packages that don't have custom configs go here - nix-tree; + + # TODO: spaces before comment are removed by nixpkgs-fmt + # See: https://github.com/nix-community/nixpkgs-fmt/issues/305 + borgbackup# backups + btop# resource monitor + coreutils# basic gnu utils + # curl + eza# ls replacement + fd# tree style ls + findutils# find + fzf# fuzzy search + jq# JSON pretty printer and manipulator + nix-tree# nix package tree viewer + ncdu# TUI disk usage + pciutils + pfetch# system info + pre-commit# git hooks + p7zip# compression & encryption + ripgrep# better grep + usbutils + tree# cli dir tree viewer + unzip# zip extraction + unrar# rar extraction + wget# downloader + zstd # zstd compression + zip; # zip compression }; nixpkgs = { @@ -41,7 +67,7 @@ in nix = { package = lib.mkDefault pkgs.nix; settings = { - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ "nix-command" "flakes" "repl-flake" ]; warn-dirty = false; }; }; @@ -52,4 +78,4 @@ in # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; -} +} \ No newline at end of file