From d7c8daf0e4704626eff7e6347bf847caff7f6977 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Mon, 27 May 2024 21:39:29 -0400 Subject: [PATCH] 6 current 2024-05-27 21:21:06 24.11.20240524.bfb7a88 Unknown * --- .gitignore | 1 + boxes/wsl/home.nix | 2 +- build | 2 +- common/files.nix | 2 +- common/pkgs.nix | 3 +++ shell.nix | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f242814..d26da6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build.log error.log +.box diff --git a/boxes/wsl/home.nix b/boxes/wsl/home.nix index 455dbb7..3b06acd 100644 --- a/boxes/wsl/home.nix +++ b/boxes/wsl/home.nix @@ -4,7 +4,7 @@ let files = import ../../common/files.nix { inherit config; }; shell = import ../../common/shell.nix { inherit config pkgs; }; p = import ../../common/pkgs.nix { inherit pkgs config; }; - _p1 = p.dev ++ p.general ++ p.scripts; + _p1 = p.dev ++ p.general ++ p.scripts ++ p.wsl; zshInitArgs = [ "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" diff --git a/build b/build index d687ad9..61070cf 100755 --- a/build +++ b/build @@ -3,7 +3,7 @@ set -e #Change to change box setup -BOX="wsl" +BOX="$(cat .box)" pushd ~/nixos/ notify(){ diff --git a/common/files.nix b/common/files.nix index ee65abd..3e331c1 100644 --- a/common/files.nix +++ b/common/files.nix @@ -10,7 +10,7 @@ }; gh = { recursive = true; - source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/dotfiles/gh"; + source = ../dotfiles/gh; target = "./.config/gh"; }; btop = { diff --git a/common/pkgs.nix b/common/pkgs.nix index f0ce028..3a743c7 100644 --- a/common/pkgs.nix +++ b/common/pkgs.nix @@ -99,4 +99,7 @@ in python3 -c "print($*)" '') ]; + wsl = with pkgs;[ + wslu + ]; } diff --git a/shell.nix b/shell.nix index 8299207..8ed1054 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,7 @@ { pkgs ? import {} }: pkgs.mkShell { nativeBuildInputs = with pkgs;[ + bash sops ssh-to-age git