changes from ryzen-shine on Wed Jul 14 08:42:35 PM MDT 2021

This commit is contained in:
Ivan Malison 2021-07-14 20:42:35 -06:00
parent b8e66b25bf
commit e4120258c1
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
7 changed files with 69 additions and 29 deletions

View File

@ -0,0 +1 @@
/nix/store/6s0wirnrk3x95x54f203a20dyxf9zri2-home-manager-files/.config/fontconfig/conf.d/10-hm-fonts.conf

View File

@ -1,9 +1,10 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # 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_key=47
sort_direction=1 sort_direction=1
hide_threads=0 tree_sort_key=47
tree_sort_direction=1
hide_kernel_threads=1 hide_kernel_threads=1
hide_userland_threads=1 hide_userland_threads=1
shadow_other_users=0 shadow_other_users=0
@ -12,15 +13,25 @@ show_program_path=1
highlight_base_name=0 highlight_base_name=0
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=0 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 header_margin=1
detailed_cpu_time=0 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 update_process_names=0
account_guest_in_cpu_meter=0 account_guest_in_cpu_meter=0
color_scheme=0 color_scheme=0
enable_mouse=1
delay=15 delay=15
left_meters=AllCPUs Memory Swap left_meters=AllCPUs Memory Swap
left_meter_modes=1 1 1 left_meter_modes=1 1 1
right_meters=Tasks LoadAverage Uptime right_meters=Tasks LoadAverage Uptime
right_meter_modes=2 2 2 right_meter_modes=2 2 2
hide_function_bar=0

View File

@ -1,22 +1,30 @@
#!/usr/bin/env zsh #!/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" cd "$1"
counter=0
while true; do 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" ] if [ -z "$changedFile" ]
then then
counter=$((counter+1)) echo "Syncing due to timeout"
if [ $counter -gt 4 ]; then git-sync -n -s
git-sync
counter=0
else
git-sync > /dev/null
fi
else else
echo "Syncing for: $changedFile" echo "Syncing for: $changedFile"
{ git check-ignore "$changedFile" > /dev/null; } || git-sync { git check-ignore "$changedFile" > /dev/null; } || git-sync -n -s
fi fi
done done

View File

@ -32,6 +32,7 @@
environment.etc."ipsec.secrets".text = '' environment.etc."ipsec.secrets".text = ''
include ipsec.d/ipsec.nm-l2tp.secrets include ipsec.d/ipsec.nm-l2tp.secrets
''; '';
networking.networkmanager = { networking.networkmanager = {
enable = true; enable = true;
enableStrongSwan = true; enableStrongSwan = true;

View File

@ -74,6 +74,8 @@ in
gitFull gitFull
htop htop
ncdu ncdu
lsof
tzupdate
rcm rcm
ripgrep ripgrep
silver-searcher silver-searcher

View File

@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1626168714, "lastModified": 1626316916,
"narHash": "sha256-LivElv4aPfojh8HxJy6VAmDAf7zA40S7jGGSV7+wLvg=", "narHash": "sha256-rTSxPV4QKCg8Tl37p8rIsbQf/roisAY1gfEC+5rqBE8=",
"owner": "IvanMalison", "owner": "IvanMalison",
"repo": "home-manager", "repo": "home-manager",
"rev": "557c159dfaf17eff3bd55ad6e8433bf59f40fab0", "rev": "fc49acfa52da5bb80e6a3112ee5c03d1e24beac4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1626063113, "lastModified": 1626311920,
"narHash": "sha256-a05n5l8lqUF/Jlr66SKf01WXtmNPaQGLur3dTVhu/PI=", "narHash": "sha256-6kZKVvYEbsYioboSgLZD6AKDqI6SnnurUattCWsAsmY=",
"owner": "IvanMalison", "owner": "IvanMalison",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61f1957543827cf21b8c1ee999495289518e9361", "rev": "db3b4f84cb0aeab66cce1ab0ce8f51e7f4f864f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,7 +94,7 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=", "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=",
"path": "/home/imalison/Projects/nixpkgs", "path": "/home/imalison/Projects/nixpkgs",
"type": "path" "type": "path"
}, },
@ -105,7 +105,7 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"narHash": "sha256-oHUlQvEu4A9dWu52bZdxg29z5Xy6NVJGZjmsKwb6yo4=", "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=",
"path": "/home/imalison/Projects/nixpkgs", "path": "/home/imalison/Projects/nixpkgs",
"type": "path" "type": "path"
}, },

View File

@ -4,9 +4,9 @@
preferStatusNotifierItems = true; preferStatusNotifierItems = true;
windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad"; windowManager.command = "${pkgs.haskellPackages.imalison-xmonad}/bin/imalison-xmonad";
profileExtra = '' profileExtra = ''
load_xkb_map.sh
export ROFI_SYSTEMD_TERM="alacritty -e" export ROFI_SYSTEMD_TERM="alacritty -e"
. "$HOME/.lib/login.sh" . "$HOME/.lib/login.sh"
load_xkb_map.sh
''; '';
}; };
@ -43,7 +43,6 @@
# notifyosd # notifyosd
# skippyxd # skippyxd
# volnoti
services.kdeconnect = { services.kdeconnect = {
enable = true; enable = true;
@ -67,4 +66,22 @@
}; };
services.xsettingsd.enable = true; 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";
}
];
};
} }