From 6d0526ab074f229467da7da435c37547a66b7873 Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Fri, 16 Feb 2024 14:57:49 +0530 Subject: [PATCH] [feat] Add fnm and enable xdg --- config/nix/common/home.nix | 26 +++++++++++++++++++++----- config/nix/common/tmux.nix | 1 + 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/config/nix/common/home.nix b/config/nix/common/home.nix index 72ec2f3c..34e54516 100644 --- a/config/nix/common/home.nix +++ b/config/nix/common/home.nix @@ -22,6 +22,10 @@ in ../linux/hyprland.nix ]; + xdg = { + enable = true; + }; + programs = { fish = { enable = true; @@ -34,6 +38,9 @@ in ls = "exa"; t = "${start-tmux}"; }; + shellInit = '' + fnm env | source + ''; interactiveShellInit = '' set fish_greeting ${pkgs.macchina.outPath}/bin/macchina @@ -138,9 +145,9 @@ in # manage. username = device.user; homeDirectory = - if device.system == "x86-64-linux" - then lib.mkForce "/home/${device.user}" - else lib.mkForce "/Users/${device.user}"; + if !isNull (builtins.match ".*-darwin" device.system) + then lib.mkForce "/Users/${device.user}" + else lib.mkForce "/home/${device.user}"; stateVersion = "23.11"; @@ -148,9 +155,17 @@ in macchina ripgrep fd + fnm alejandra - neovim-nightly + dust + eza cachix + rustup + cmake + # neovim-nightly + (nerdfonts.override {fonts = ["Hasklig"];}) + mpv + # # Adds the 'hello' command to your environment. It prints a friendly # # "Hello, world!" when run. # pkgs.hello @@ -182,7 +197,8 @@ in sessionVariables = { EDITOR = "nvim"; - SHELL = "${pkgs.fish.outPath}/bin/fish"; + SHELL = "${pkgs.nushellFull}/bin/nu"; + CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target"; }; sessionPath = [ "${config.home.homeDirectory}/.local/bin" diff --git a/config/nix/common/tmux.nix b/config/nix/common/tmux.nix index 372bc351..3ee8bc15 100644 --- a/config/nix/common/tmux.nix +++ b/config/nix/common/tmux.nix @@ -40,6 +40,7 @@ in plugin = tmuxPlugins.catppuccin; extraConfig = '' set -g @catppuccin_flavour 'mocha' + set -g @catppuccin_window_default_text "" ''; } {