diff --git a/modules/shell/common.sh b/modules/shell/common.sh index c9f252a..fecfd7d 100644 --- a/modules/shell/common.sh +++ b/modules/shell/common.sh @@ -8,27 +8,30 @@ htop_pid () { } psg_kill() { - PIDS=$(ps aux | grep -v "grep" | grep ${1} | awk '{print $2}') - for pid in ${PIDS}; do - echo "killing ${pid}" - kill -9 ${pid} &> /dev/null + ps aux | grep -v "grep" | grep "${1}" | awk '{print $2}' | while read -r pid; do + if [ -n "${pid}" ]; then + echo "killing ${pid}" + kill -9 "${pid}" &> /dev/null + fi done } psg_terminate() { - PIDS=$(ps aux | grep -v "grep" | grep ${1} | awk '{print $2}') - for pid in ${PIDS}; do - echo " ${pid}" - kill -15 ${pid} &> /dev/null + ps aux | grep -v "grep" | grep "${1}" | awk '{print $2}' | while read -r pid; do + if [ -n "${pid}" ]; then + echo "Terminating ${pid}" + kill -15 "${pid}" &> /dev/null + fi done } psg_skill() { - PIDS=$(ps aux | grep -v "grep" | grep ${1} | awk '{print $2}') - for pid in ${PIDS}; do - echo "killing ${pid}" - sudo kill -9 ${pid} &> /dev/null - done; + ps aux | grep -v "grep" | grep "${1}" | awk '{print $2}' | while read -r pid; do + if [ -n "${pid}" ]; then + echo "Killing ${pid}" + sudo kill -9 "${pid}" &> /dev/null + fi + done } mail_clear() { diff --git a/readme.md b/readme.md index 6a3baa3..e7e23d6 100644 --- a/readme.md +++ b/readme.md @@ -51,6 +51,10 @@ - `nixos-rebuild switch --flake ~/.config/nixos-config` - Update remote, ssh should work now: `cd ~/.config/nixos-config && git remote remove origin && git remote add origin "git@github.com:RingOfStorms/dotfiles.git" && git pull origin master` +- atuin setup + - if atuin is on enable that mod in configuration.nix, make sure to `atuin login` get key from existing device + - TODO move key into secrets and mount it to atuin local share + ## Darwin - TODO diff --git a/users/_common/components/home_manager/atuin.nix b/users/_common/components/home_manager/atuin.nix index fc17cbd..6270354 100644 --- a/users/_common/components/home_manager/atuin.nix +++ b/users/_common/components/home_manager/atuin.nix @@ -8,6 +8,8 @@ workspaces = true; exit-mode = "return-query"; enter_accept = true; + sync_address = "http://10.12.14.2:8888"; + sync = { records = true; }; }; }; } diff --git a/users/josh/by_hosts/joe/home_manager/spotifyd.nix b/users/josh/by_hosts/joe/home_manager/spotifyd.nix deleted file mode 100644 index f7511d8..0000000 --- a/users/josh/by_hosts/joe/home_manager/spotifyd.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: -{ - # home.packages = [ pkgs.spotifyd ]; -# TODO revisit this isn't working for me yet... - services.spotifyd.enable =true; -} - - diff --git a/users/josh/by_hosts/lio/home_manager/obs.nix b/users/josh/by_hosts/lio/home_manager/obs.nix new file mode 100644 index 0000000..534c7f8 --- /dev/null +++ b/users/josh/by_hosts/lio/home_manager/obs.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + programs.obs-studio = { + enable = true; + }; +} + + diff --git a/users/josh/by_hosts/lio/home_manager/signal.nix b/users/josh/by_hosts/lio/home_manager/signal.nix new file mode 100644 index 0000000..afc1113 --- /dev/null +++ b/users/josh/by_hosts/lio/home_manager/signal.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.signal-desktop ]; +} diff --git a/users/josh/by_hosts/lio/home_manager/spotify.nix b/users/josh/by_hosts/lio/home_manager/spotify.nix new file mode 100644 index 0000000..490dc65 --- /dev/null +++ b/users/josh/by_hosts/lio/home_manager/spotify.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.spotify ]; +} + diff --git a/users/josh/by_hosts/lio/nix_modules/TODO_SSH_AUTHORIZED b/users/josh/by_hosts/lio/nix_modules/TODO_SSH_AUTHORIZED new file mode 100644 index 0000000..e69de29 diff --git a/users/josh/by_hosts/lio/nix_modules/steam.nix b/users/josh/by_hosts/lio/nix_modules/steam.nix new file mode 100644 index 0000000..ced7b52 --- /dev/null +++ b/users/josh/by_hosts/lio/nix_modules/steam.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + programs.steam.enable = true; +}