From b8e66b25bf2b2832d905ba5fa5bfb1560f0a730c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 13 Jul 2021 20:41:06 -0600 Subject: [PATCH 1/5] [NixOS] Load login.sh in xsession --- dotfiles/lib/login/exports.sh | 2 -- nixos/home-manager.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/lib/login/exports.sh b/dotfiles/lib/login/exports.sh index 0795e140..ed20f20d 100644 --- a/dotfiles/lib/login/exports.sh +++ b/dotfiles/lib/login/exports.sh @@ -24,8 +24,6 @@ dircolors_file="$HOME/.dircolors" [ ! -z "$SHELL" ] && test -r $dircolors_files && eval "$(dircolors $dircolors_file)" && eval $(dircolors) -export GO15VENDOREXPERIMENT=1 - if [[ $TERM == "dumb" ]]; then export PS1='$ ' fi diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index 457b34e9..d097df7f 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -5,6 +5,8 @@ windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad"; profileExtra = '' export ROFI_SYSTEMD_TERM="alacritty -e" + . "$HOME/.lib/login.sh" + load_xkb_map.sh ''; }; From e4120258c1f9e3616dc044f062a59cdd90580a3a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 14 Jul 2021 20:42:35 -0600 Subject: [PATCH 2/5] changes from ryzen-shine on Wed Jul 14 08:42:35 PM MDT 2021 --- .../config/fontconfig/conf.d/10-hm-fonts.conf | 1 + dotfiles/config/htop/htoprc | 27 ++++++++++++----- dotfiles/lib/bin/git_sync_directory.sh | 30 ++++++++++++------- nixos/base.nix | 1 + nixos/essential.nix | 2 ++ nixos/flake.lock | 16 +++++----- nixos/home-manager.nix | 21 +++++++++++-- 7 files changed, 69 insertions(+), 29 deletions(-) create mode 120000 dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf diff --git a/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf b/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf new file mode 120000 index 00000000..e05481c7 --- /dev/null +++ b/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf @@ -0,0 +1 @@ +/nix/store/6s0wirnrk3x95x54f203a20dyxf9zri2-home-manager-files/.config/fontconfig/conf.d/10-hm-fonts.conf \ No newline at end of file diff --git a/dotfiles/config/htop/htoprc b/dotfiles/config/htop/htoprc index 699ad3a6..7269a503 100644 --- a/dotfiles/config/htop/htoprc +++ b/dotfiles/config/htop/htoprc @@ -1,9 +1,10 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 +fields=0 48 17 18 38 39 40 2 46 47 49 1 sort_key=47 sort_direction=1 -hide_threads=0 +tree_sort_key=47 +tree_sort_direction=1 hide_kernel_threads=1 hide_userland_threads=1 shadow_other_users=0 @@ -12,15 +13,25 @@ show_program_path=1 highlight_base_name=0 highlight_megabytes=1 highlight_threads=0 -tree_view=0 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +tree_view=1 +tree_view_always_by_pid=0 header_margin=1 detailed_cpu_time=0 -cpu_count_from_zero=0 +cpu_count_from_one=1 +show_cpu_usage=1 +show_cpu_frequency=0 update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=0 +enable_mouse=1 delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime -right_meter_modes=2 2 2 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 +hide_function_bar=0 diff --git a/dotfiles/lib/bin/git_sync_directory.sh b/dotfiles/lib/bin/git_sync_directory.sh index 9175747f..7a846395 100755 --- a/dotfiles/lib/bin/git_sync_directory.sh +++ b/dotfiles/lib/bin/git_sync_directory.sh @@ -1,22 +1,30 @@ #!/usr/bin/env zsh -echo "Syncing $1" +#!/usr/bin/env bash + +echo "Syncing $2 at $1 with a default sync interval of $3" + +# Initialize the directory +if [ ! -d "$1" ]; then + base="$(dirname $1)" + mkdir -p "$base" + cd "$base" + git clone "$2" "$(basename $1)" +fi + cd "$1" -counter=0 while true; do - changedFile=$(inotifywait ./ -r -e modify,move,create,delete --format "%w%f" --exclude '\.git' -t 60 2>/dev/null) + changedFile=$( + inotifywait ./ -r -e modify,move,create,delete \ + --format "%w%f" --exclude '\.git' -t $3 2>/dev/null + ) if [ -z "$changedFile" ] then - counter=$((counter+1)) - if [ $counter -gt 4 ]; then - git-sync - counter=0 - else - git-sync > /dev/null - fi + echo "Syncing due to timeout" + git-sync -n -s else echo "Syncing for: $changedFile" - { git check-ignore "$changedFile" > /dev/null; } || git-sync + { git check-ignore "$changedFile" > /dev/null; } || git-sync -n -s fi done diff --git a/nixos/base.nix b/nixos/base.nix index f1403f6c..50b8959c 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -32,6 +32,7 @@ environment.etc."ipsec.secrets".text = '' include ipsec.d/ipsec.nm-l2tp.secrets ''; + networking.networkmanager = { enable = true; enableStrongSwan = true; diff --git a/nixos/essential.nix b/nixos/essential.nix index a0bd80ac..4a0d26a0 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -74,6 +74,8 @@ in gitFull htop ncdu + lsof + tzupdate rcm ripgrep silver-searcher diff --git a/nixos/flake.lock b/nixos/flake.lock index 06c56a46..25e7a803 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1626168714, - "narHash": "sha256-LivElv4aPfojh8HxJy6VAmDAf7zA40S7jGGSV7+wLvg=", + "lastModified": 1626316916, + "narHash": "sha256-rTSxPV4QKCg8Tl37p8rIsbQf/roisAY1gfEC+5rqBE8=", "owner": "IvanMalison", "repo": "home-manager", - "rev": "557c159dfaf17eff3bd55ad6e8433bf59f40fab0", + "rev": "fc49acfa52da5bb80e6a3112ee5c03d1e24beac4", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1626063113, - "narHash": "sha256-a05n5l8lqUF/Jlr66SKf01WXtmNPaQGLur3dTVhu/PI=", + "lastModified": 1626311920, + "narHash": "sha256-6kZKVvYEbsYioboSgLZD6AKDqI6SnnurUattCWsAsmY=", "owner": "IvanMalison", "repo": "nixpkgs", - "rev": "61f1957543827cf21b8c1ee999495289518e9361", + "rev": "db3b4f84cb0aeab66cce1ab0ce8f51e7f4f864f1", "type": "github" }, "original": { @@ -94,7 +94,7 @@ }, "nixpkgs_4": { "locked": { - "narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=", + "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=", "path": "/home/imalison/Projects/nixpkgs", "type": "path" }, @@ -105,7 +105,7 @@ }, "nixpkgs_5": { "locked": { - "narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=", + "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=", "path": "/home/imalison/Projects/nixpkgs", "type": "path" }, diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index d097df7f..26e1a54c 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -4,9 +4,9 @@ preferStatusNotifierItems = true; windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad"; profileExtra = '' + load_xkb_map.sh export ROFI_SYSTEMD_TERM="alacritty -e" . "$HOME/.lib/login.sh" - load_xkb_map.sh ''; }; @@ -43,7 +43,6 @@ # notifyosd # skippyxd - # volnoti services.kdeconnect = { enable = true; @@ -67,4 +66,22 @@ }; services.xsettingsd.enable = true; + + services.volnoti.enable = true; + + services.git-sync = { + enable = true; + repositories = [ + { + name = "config"; + path = "/home/imalison/config"; + uri = "git@bitbucket.org:ivanmalison/config.git"; + } + { + name = "org"; + path = "/home/imalison/org"; + uri = "git@bitbucket.org:ivanmalison/org.git"; + } + ]; + }; } From b9b2ad8c07dbd9c003d8f4a5a0e1555a16dec276 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 14 Jul 2021 20:45:20 -0600 Subject: [PATCH 3/5] changes from ryzen-shine on Wed Jul 14 08:45:20 PM MDT 2021 --- dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf | 2 +- nixos/flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf b/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf index e05481c7..e5a229d7 120000 --- a/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf +++ b/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf @@ -1 +1 @@ -/nix/store/6s0wirnrk3x95x54f203a20dyxf9zri2-home-manager-files/.config/fontconfig/conf.d/10-hm-fonts.conf \ No newline at end of file +/nix/store/ibp8cigcnq3byfkidz8iqpqy1z2yd1wh-home-manager-files/.config/fontconfig/conf.d/10-hm-fonts.conf \ No newline at end of file diff --git a/nixos/flake.lock b/nixos/flake.lock index 25e7a803..bd0a6a19 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1626316916, - "narHash": "sha256-rTSxPV4QKCg8Tl37p8rIsbQf/roisAY1gfEC+5rqBE8=", + "lastModified": 1626317009, + "narHash": "sha256-rx+U8lQM+gu072VQsa63DEHtR4IVQ1zA/Fg4CpDUsVc=", "owner": "IvanMalison", "repo": "home-manager", - "rev": "fc49acfa52da5bb80e6a3112ee5c03d1e24beac4", + "rev": "bc44222fe944712ba4e5065119f77eeb540937e3", "type": "github" }, "original": { From dc2e50861ae8037892dd92230bc4146530219827 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 15 Jul 2021 16:02:40 -0600 Subject: [PATCH 4/5] [NixOS] Add password store git repository --- .gitignore | 1 + dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf | 1 - nixos/home-manager.nix | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 120000 dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf diff --git a/.gitignore b/.gitignore index e0b35c95..a80286bb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ gotools /dotfiles/emacs.d/*.sqlite /dotfiles/config/gtk-3.0/colors.css /dotfiles/emacs.d/.cache/ +/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf diff --git a/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf b/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf deleted file mode 120000 index e5a229d7..00000000 --- a/dotfiles/config/fontconfig/conf.d/10-hm-fonts.conf +++ /dev/null @@ -1 +0,0 @@ -/nix/store/ibp8cigcnq3byfkidz8iqpqy1z2yd1wh-home-manager-files/.config/fontconfig/conf.d/10-hm-fonts.conf \ No newline at end of file diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index 26e1a54c..a7cb866c 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -82,6 +82,11 @@ path = "/home/imalison/org"; uri = "git@bitbucket.org:ivanmalison/org.git"; } + { + name = "password-store"; + path = "/home/imalison/.password-store"; + uri = "git@github.com:IvanMalison/.password-store.git"; + } ]; }; } From 65031b7c848e244a6b0e690fa06401fe6ac792c3 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 15 Jul 2021 16:07:38 -0600 Subject: [PATCH 5/5] [NixOS] Alacritty is essential --- nixos/essential.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/essential.nix b/nixos/essential.nix index 4a0d26a0..e28e72df 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -18,6 +18,7 @@ in environment.systemPackages = with pkgs; [ python-with-my-packages + alacritty emacs firefox vlc