aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/.bash_profile11
-rw-r--r--common/.editorconfig (renamed from linux/home/.editorconfig)6
-rw-r--r--common/.face (renamed from linux/home/.face)bin11569 -> 11569 bytes
-rw-r--r--common/.gitconfig (renamed from linux/home/.gitconfig)6
-rw-r--r--common/.gitignore (renamed from linux/home/.gitignore)20
-rw-r--r--common/.gitmodules (renamed from linux/home/.gitmodules)0
-rw-r--r--common/.gitsubtrees7
-rw-r--r--common/.prettierrc.yml (renamed from linux/home/.prettierrc.yml)0
-rw-r--r--common/.profile18
-rw-r--r--common/.zprofile (renamed from linux/home/.zprofile)0
-rw-r--r--linux/home/.github/workflows/release.yml59
-rw-r--r--linux/home/.gitsubtrees8
-rw-r--r--linux/home/.profile16
13 files changed, 49 insertions, 102 deletions
diff --git a/common/.bash_profile b/common/.bash_profile
new file mode 100644
index 0000000..f6c3ee4
--- /dev/null
+++ b/common/.bash_profile
@@ -0,0 +1,11 @@
+# ~/.bash_profile
+
+# Source ~/.profile if it exists (environment variables)
+if [ -f "$HOME/.profile" ]; then
+ . "$HOME/.profile"
+fi
+
+# Source ~/.bashrc for interactive settings (aliases, prompt, etc.)
+if [ -f "$HOME/.bashrc" ]; then
+ . "$HOME/.bashrc"
+fi
diff --git a/linux/home/.editorconfig b/common/.editorconfig
index b76ecee..22f30d4 100644
--- a/linux/home/.editorconfig
+++ b/common/.editorconfig
@@ -8,7 +8,7 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
-indent_size = 4
+indent_size = 2
max_line_length = 10000
# Makefile-specific settings
@@ -48,6 +48,10 @@ end_statement_with_semicolon = keep
[*.py]
indent_size = 4
+# Shell config
+[*.sh]
+indent_size = 4
+
# Bash config
[*.bash]
indent_size = 4
diff --git a/linux/home/.face b/common/.face
index 3aafd06..3aafd06 100644
--- a/linux/home/.face
+++ b/common/.face
Binary files differ
diff --git a/linux/home/.gitconfig b/common/.gitconfig
index c54adec..2c0d5ef 100644
--- a/linux/home/.gitconfig
+++ b/common/.gitconfig
@@ -1,6 +1,6 @@
[user]
- name =
- email =
+ name =
+ email =
[init]
defaultBranch = main
@@ -30,3 +30,5 @@
[credential "https://gist.github.com"]
helper =
helper = !sh -c 'command -v gh >/dev/null 2>&1 && exec gh auth git-credential || exit 0'
+[credential]
+ helper = cache
diff --git a/linux/home/.gitignore b/common/.gitignore
index 0a635f8..9c9bef7 100644
--- a/linux/home/.gitignore
+++ b/common/.gitignore
@@ -4,9 +4,6 @@
# Ignore git config
.gitconfig
-# Ignore dotfiles dir
-.cfg
-
# Ignore Packer's compiled files
packer_compiled.lua
@@ -25,32 +22,23 @@ zcompdump
# Ignore node_modules directory
node_modules/
-## Ignore .png files
-#*.png
-
# Ignore .zip files
*.zip
# Ignore .pxd files
*.pxd
-# Ignore .local directory
-#^.local/
-
# Ignore .cache directory
^.cache/
-# Ignore downloads directory
+# Ignore normal directories
^downloads/
-
-# Ignore music directory
^music/
-
-# Ignore pictures/images directory
^images/
^pictures/
-
-# Ignore virtual machine directory
+^videos/
^virt/
+# Ignore dotfiles dir
+~/.cfg
.cfg
diff --git a/linux/home/.gitmodules b/common/.gitmodules
index 37da2b9..37da2b9 100644
--- a/linux/home/.gitmodules
+++ b/common/.gitmodules
diff --git a/common/.gitsubtrees b/common/.gitsubtrees
new file mode 100644
index 0000000..d8a7f29
--- /dev/null
+++ b/common/.gitsubtrees
@@ -0,0 +1,7 @@
+[subtree "common/config/nvim"]
+ path = common/config/nvim
+ url = git@github.com:srdusr/nvim.git
+
+[subtree "common/scripts"]
+ path = common/scripts
+ url = git@github.com:srdusr/scripts.git
diff --git a/linux/home/.prettierrc.yml b/common/.prettierrc.yml
index c5d13e2..c5d13e2 100644
--- a/linux/home/.prettierrc.yml
+++ b/common/.prettierrc.yml
diff --git a/common/.profile b/common/.profile
new file mode 100644
index 0000000..b710f29
--- /dev/null
+++ b/common/.profile
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export EDITOR="$(command -v nvim || command -v vim || echo nano)"
+
+#if [ "$(tty)" = "/dev/tty1" -a -z "$(printenv HYPRLAND_INSTANCE_SIGNATURE)" ]; then
+if [ "$DISPLAY" = "" ] && [ "$XDG_VTNR" -eq 1 ]; then
+ exec ~/.scripts/env/linux/autorun/session_manager.sh
+fi
+
+load_zsh_env() {
+ if [ "$ZSH_VERSION" != "" ]; then
+ if [ -f ~/.config/zsh/.zshenv ]; then
+ . ~/.config/zsh/.zshenv
+ fi
+ fi
+}
+
+load_zsh_env
diff --git a/linux/home/.zprofile b/common/.zprofile
index dafce71..dafce71 100644
--- a/linux/home/.zprofile
+++ b/common/.zprofile
diff --git a/linux/home/.github/workflows/release.yml b/linux/home/.github/workflows/release.yml
deleted file mode 100644
index 0dcf439..0000000
--- a/linux/home/.github/workflows/release.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: Create Release
-
-on:
- push:
- tags:
- - 'v*' # This triggers the workflow on version tags
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Download dotfiles zip
- run: |
- mkdir -p $HOME/temp-dotfiles
- cd $HOME/temp-dotfiles
- echo "Downloading dotfiles-main.zip..."
- curl -LOk https://github.com/srdusr/dotfiles/archive/main.zip
- ls -lh main.zip # Log file size
- unzip main.zip -d dotfiles-main
- mv dotfiles-main/dotfiles-main dotfiles
- ls -lh dotfiles # Log extracted files
-
- - name: Create zip file
- run: |
- cd $HOME/temp-dotfiles
- zip -r dotfiles.zip dotfiles
-
- - name: Move zip file to home directory
- run: |
- mv /home/runner/temp-dotfiles/dotfiles.zip /home/runner/dotfiles.zip
- ls -lh $HOME/dotfiles.zip # Verify existence after move (optional)
-
- - name: Clean up
- run: |
- rm -rf $HOME/temp-dotfiles
- echo $HOME
-
- - name: Create GitHub Release
- id: create_release
- uses: actions/create-release@v1
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- tag_name: ${{ github.ref }}
- release_name: Release ${{ github.ref }}
- body: Automatically generated release
- draft: false
- prerelease: false
-
- - name: Upload zip to release
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: /home/runner/dotfiles.zip
- asset_name: dotfiles.zip
- asset_content_type: application/zip
diff --git a/linux/home/.gitsubtrees b/linux/home/.gitsubtrees
deleted file mode 100644
index dd055cf..0000000
--- a/linux/home/.gitsubtrees
+++ /dev/null
@@ -1,8 +0,0 @@
-[subtree ".config/nvim"]
- path = .config/nvim
- url = git@github.com:srdusr/nvim.git
-
-[subtree ".scripts"]
- path = .scripts
- url = git@github.com:srdusr/scripts.git
-
diff --git a/linux/home/.profile b/linux/home/.profile
deleted file mode 100644
index 623fbb0..0000000
--- a/linux/home/.profile
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-#if [ "$(tty)" = "/dev/tty1" -a -z "$(printenv HYPRLAND_INSTANCE_SIGNATURE)" ]; then
-if [ "$DISPLAY" = "" ] && [ "$XDG_VTNR" -eq 1 ]; then
- exec ~/.scripts/session_manager.sh
-fi
-
-load_zsh_env() {
- if [ "$ZSH_VERSION" != "" ]; then
- if [ -f ~/.config/zsh/.zshenv ]; then
- . ~/.config/zsh/.zshenv
- fi
- fi
-}
-
-load_zsh_env