Some other changes

jitcos · Jan 22, 2024 · 4f330b9 · 4f330b9
1 parent 6226164
commit 4f330b9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 28 deletions.
diff --git a/config/common_modules/rpm-ostree.yml b/config/common_modules/rpm-ostree.yml
@@ -37,4 +37,19 @@ install:
   - samba-ldb-ldap-modules
   - samba-winbind-clients
   - samba-winbind-modules
-  - libvirt
+  - libvirt
+
+remove:
+  - firefox
+  - firefox-langpacks
+  - htop
+  - nvtop
+  - gnome-software-rpm-ostree
+  - gnome-tour
+  - gnome-initial-setup
+  - gnome-system-monitor
+  - gnome-shell-extension-apps-menu
+  - gnome-shell-extension-launch-new-instance
+  - gnome-shell-extension-places-menu
+  - gnome-shell-extension-window-list
+  - gnome-classic-session
diff --git a/config/common_modules/systemd.yml b/config/common_modules/systemd.yml
@@ -6,8 +6,10 @@ system:
     - com.system76.PowerDaemon.service
     - system76-power-wake.service
     - com.system76.Scheduler.service
+    - dx-groups.service
   masked:
     - power-profiles-daemon.service
 user:
   enabled:
     - podman.socket
+    - dx-user-vscode.service
diff --git a/config/files/usr/bin/dx-user-vscode b/config/files/usr/bin/dx-user-vscode
@@ -2,21 +2,11 @@
 
 # SCRIPT VERSION
 USER_SETUP_VER=2
-USER_SETUP_VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/vscode-configured"
+USER_SETUP_VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/cabos/vscode-configured"
 USER_SETUP_VER_RAN=$(cat "$USER_SETUP_VER_FILE")
 
 mkdir -p "$(dirname "$USER_SETUP_VER_FILE")" || exit 1
 
-USER_SETUP_VER_FILE_V1="$HOME/.bluefin-vscode-configured"
-# Upgrade from v1 to v2 changes only the location of the USER_SETUP_VER.
-# Exit if v1 file is present.
-if [[ -f $USER_SETUP_VER_FILE_V1 ]]; then
-  echo "User setup v1 has already run. Exiting..."
-  rm $USER_SETUP_VER_FILE_V1
-  echo "$USER_SETUP_VER" > "$USER_SETUP_VER_FILE"
-  exit 0
-fi
-
 # Run script if updated
 if [[ -f $USER_SETUP_VER_FILE && "$USER_SETUP_VER" = "$USER_SETUP_VER_RAN" ]]; then
   echo "User setup v$VER has already run. Exiting..."
@@ -27,13 +17,13 @@ fi
 # Pre-install preferred VSCode Extensions
 code --install-extension ms-vscode-remote.remote-containers
 code --install-extension ms-azuretools.vscode-docker
-code --install-extention trongthanh.theme-boxythemekit
-code --install-extention EditorConfig.EditorConfig
-code --install-extention dbaeumer.vscode-eslint
-code --install-extention drKnoxy.eslint-disable-snippets
-code --install-extention eamodio.gitlens
-code --install-extention esbenp.prettier-vscode
-code --install-extention ms-vscode-remote.remote-ssh
+code --install-extension trongthanh.theme-boxythemekit
+code --install-extension EditorConfig.EditorConfig
+code --install-extension dbaeumer.vscode-eslint
+code --install-extension drKnoxy.eslint-disable-snippets
+code --install-extension eamodio.gitlens
+code --install-extension esbenp.prettier-vscode
+code --install-extension ms-vscode-remote.remote-ssh
 
 # Prevent future executions
 echo "Writing state file"

diff --git a/config/files/usr/etc/skel.d/.config/Code/User/settings.json b/config/files/usr/etc/skel.d/.config/Code/User/settings.json
@@ -48,5 +48,6 @@
     "[json]": {
         "editor.defaultFormatter": "vscode.json-language-features"
     },
-    "diffEditor.codeLens": true
+    "diffEditor.codeLens": true,
+    "window.titleBarStyle": "custom"
 }
diff --git a/config/scripts/extensions.sh b/config/scripts/extensions.sh
@@ -10,17 +10,16 @@ echo 'Installing extensions'
 
 cd /tmp
 
-git clone https://gitlab.com/arcmenu/ArcMenu.git
-cd ArcMenu
-make DESTDIR=/ install
-cd ..
-
-git clone https://github.com/theychx/WorkspaceSwitcherWrapAround.git
-mkdir /usr/share/gnome-shell/extensions/WorkspaceSwitcherWrapAround
-cp WorkspaceSwitcherWrapAround/src/* /usr/share/gnome-shell/extensions/WorkspaceSwitcherWrapAround
+git clone https://github.com/theychx/WorkspaceSwitcherWrapAround.git /usr/share/gnome-shell/extensions/workspace-switch-wraparound@theychx.org
 
 git clone https://github.com/ethnarque/gnome-disable-workspace-animation.git
 cp -r gnome-disable-workspace-animation/disable-workspace-animation@ethnarque /usr/share/gnome-shell/extensions
 
 git clone https://github.com/cleardevice/gnome-disable-workspace-switcher.git
 cp -r gnome-disable-workspace-switcher/disable-workspace-switcher-overlay@cleardevice /usr/share/gnome-shell/extensions
+
+git clone https://gitlab.com/arcmenu/ArcMenu.git
+cd ArcMenu
+make DESTDIR=/ install
+
+dconf update