From 87398c4f79b16bb67c2d02ed249a0d2b11c6c4ec Mon Sep 17 00:00:00 2001 From: TrudeEH Date: Thu, 24 Oct 2024 11:24:03 +0100 Subject: [PATCH] Add support for CLI env --- install.sh | 4 +++- nix/home.nix | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index adaa5b12..9aa57758 100755 --- a/install.sh +++ b/install.sh @@ -31,6 +31,8 @@ case $main_menu in # Install Home-manager nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager nix-channel --update + mkdir -p $HOME/.pre-nix-backup/ + mv $HOME/.bashrc $HOME/.profile $HOME/.pre-nix-backup/ nix-shell '' -A install # Apply config @@ -38,7 +40,7 @@ case $main_menu in rm $HOME/.config/home-manager/home.nix cp ./nix/home.nix $HOME/.config/home-manager/home.nix - home-manager -b backup switch + home-manager switch -b backup ;; 2) sudo cp -rf ./nix/nixos/* /etc/nixos/ diff --git a/nix/home.nix b/nix/home.nix index 084791f2..fe05ca0d 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -5,6 +5,7 @@ let inherit (lib) mkIf optionals; inherit (pkgs.stdenv) isLinux isDarwin; #GNOME on Linux userName = "trude"; + isDesktop = false; # Disable for servers and WSL in { # ======================================================================= @@ -18,9 +19,7 @@ in nixpkgs.config.allowUnfree = true; home.packages = with pkgs; [ - google-chrome gh unzip fastfetch - prismlauncher # Override nerdfont to install JetBrains only. (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) @@ -72,8 +71,10 @@ in fi '') ] + # Desktop-only apps + ++ optionals isDesktop [google-chrome prismlauncher] # Linux-only apps - ++ optionals isLinux [newsflash eyedropper gnome-terminal epiphany gnome-podcasts impression gnome-boxes adw-gtk3 gnomeExtensions.vitals gnomeExtensions.appindicator gnomeExtensions.caffeine gnomeExtensions.search-light] + ++ optionals (isDesktop && isLinux) [newsflash eyedropper gnome-terminal epiphany gnome-podcasts impression gnome-boxes adw-gtk3 gnomeExtensions.vitals gnomeExtensions.appindicator gnomeExtensions.caffeine gnomeExtensions.search-light] # macOS-only apps ++ optionals isDarwin []; @@ -85,7 +86,7 @@ in } else {}); home.sessionVariables = { - EDITOR = "nvim"; + EDITOR = "code"; }; # ===================================================== @@ -641,7 +642,7 @@ in initExtra = "set completion-ignore-case On"; bashrcExtra = '' set -o vi - export EDITOR="nvim"; + export EDITOR="code"; export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ "; ''; };