From 1b5d6b1a59dc80a81e9897efdfae53969926eeaa Mon Sep 17 00:00:00 2001 From: John Costa Date: Tue, 4 Mar 2025 21:12:09 +0000 Subject: [PATCH] wip: getting stuff to sync properly --- .config/metapac/metapac/config.toml | 16 ----- .config/metapac/metapac/groups/default.toml | 71 --------------------- dotfiles.service | 4 +- scripts/manager.bash | 7 +- scripts/sync.bash | 4 ++ 5 files changed, 12 insertions(+), 90 deletions(-) delete mode 100644 .config/metapac/metapac/config.toml delete mode 100644 .config/metapac/metapac/groups/default.toml create mode 100644 scripts/sync.bash diff --git a/.config/metapac/metapac/config.toml b/.config/metapac/metapac/config.toml deleted file mode 100644 index c8b3e9f3..00000000 --- a/.config/metapac/metapac/config.toml +++ /dev/null @@ -1,16 +0,0 @@ -arch_package_manager = "paru" - -flatpak_default_systemwide = false - -# Whether to use the [hostname_groups] config table to decide which -# group files to use or to use all files in the groups folder. -# Default: false -hostname_groups_enabled = true - -# Which group files apply for which hostnames -# paths starting without a / are relative to the groups folder -# Default: None -[hostname_groups] -john-desktop = ["default"] -john-laptop = ["default"] -server = [] diff --git a/.config/metapac/metapac/groups/default.toml b/.config/metapac/metapac/groups/default.toml deleted file mode 100644 index 31e2ba85..00000000 --- a/.config/metapac/metapac/groups/default.toml +++ /dev/null @@ -1,71 +0,0 @@ -arch = [ - "amd-ucode", - "base", - "base-devel", - "btrfs-progs", - "dolphin", - "dunst", - "efibootmgr", - "fish", - "fuzzel", - "fzf", - "git", - "go", - "grim", - "gst-plugin-pipewire", - "htop", - "hyprland", - "hyprlock", - "intel-media-driver", - "iwd", - "kdeconnect", - "kitty", - "libpulse", - "libva-intel-driver", - "linux", - "linux-firmware", - "metapac", - "nano", - "neovim", - "network-manager-applet", - "networkmanager", - "noto-fonts-emoji", - "paru", - "pipewire", - "pipewire-alsa", - "pipewire-jack", - "pipewire-pulse", - "polkit-kde-agent", - "qt5-wayland", - "qt6-wayland", - "rsync", - "sddm", - "slurp", - "smartmontools", - "sof-firmware", - "starship", - "tmux", - "unzip", - "vim", - "vivaldi", - "vulkan-intel", - "vulkan-radeon", - "waybar", - "wget", - "wireless_tools", - "wireplumber", - "wl-clipboard", - "wlogout", - "wofi", - "xdg-desktop-portal-hyprland", - "xdg-utils", - "xf86-video-amdgpu", - "xf86-video-ati", - "xf86-video-nouveau", - "xf86-video-vmware", - "xorg-server", - "xorg-xinit", - "yay", - "zram-generator", "lazygit", -] - diff --git a/dotfiles.service b/dotfiles.service index fcd6400b..051f86d1 100644 --- a/dotfiles.service +++ b/dotfiles.service @@ -5,9 +5,9 @@ After=systemd-user-sessions.service After=network-online.target [Service] -User=john +User=johnc WorkingDirectory=~ -ExecStart=Code/dotfiles/scripts/manager.bash +ExecStart=bash Code/dotfiles/scripts/manager.bash [Install] WantedBy=multi-user.target diff --git a/scripts/manager.bash b/scripts/manager.bash index b118024c..f05bcebc 100755 --- a/scripts/manager.bash +++ b/scripts/manager.bash @@ -13,7 +13,12 @@ git pull # # sed -i "s/#$current_host: //" ./hypr/hyprland/monitors.conf -rsync -av .config ~ --delete +for file in ".config"/*; do + echo "rsync -av $file ~/.config --delete" + rsync -av $file ~/.config --delete +done + +# metapac sync # Cleanup diff --git a/scripts/sync.bash b/scripts/sync.bash new file mode 100644 index 00000000..84ed8ddb --- /dev/null +++ b/scripts/sync.bash @@ -0,0 +1,4 @@ +for file in ".config"/*; do + echo $file + echo "rsync -av ~/$file .config/$file --delete" +done