Compare commits

...

7 Commits

Author SHA1 Message Date
5ac2ad0f61
bumb prettier config version 2024-07-14 20:45:01 +03:00
350e8d2f78
.renovate-shared.json: attempt to group pre-commit updates 2024-07-14 20:21:16 +03:00
74c4463dca
sway/autostart-p2p: comment unmaintained Jami 2024-07-14 20:17:31 +03:00
f2881b8870
chromium: block GNOME Browser Integration
No one in my family uses GNOME and it just keeps appearing without being of any use to anyone. Meanwhile KDE Browser Integration doesn't depend on KDE and KDE Connect is nice and invisible quality of life improvements for family by having it force enabled are nice
2024-07-14 16:41:58 +03:00
16cc8855c7
zshrc: run prettier 2024-07-14 16:34:10 +03:00
345fe98f79
zshrc: comment things upsetting prettier 2024-07-14 16:32:27 +03:00
6bfeaa46d8
simplify prettier configuration 2024-07-14 16:28:37 +03:00
9 changed files with 160 additions and 202 deletions

1
.gitignore vendored
View File

@ -14,7 +14,6 @@
!.nvmrc !.nvmrc
!.pre-commit-config.yaml !.pre-commit-config.yaml
!.prettierignore !.prettierignore
!.prettierrc.json
!.renovate-shared.json* !.renovate-shared.json*
!.reuse !.reuse

View File

@ -65,18 +65,10 @@ repos:
- repo: local - repo: local
hooks: hooks:
- id: install-dev-deps
name: Install pnpm dev dependencies
entry: corepack pnpm install -D
language: system
always_run: true
#verbose: true
pass_filenames: false
- id: prettier - id: prettier
name: prettier name: prettier
entry: corepack pnpm exec prettier --cache --ignore-unknown --write entry: corepack pnpx prettier --cache --ignore-unknown --write
language: system language: system
exclude_types: [json]
# .editorconfig validity checking # .editorconfig validity checking
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python - repo: https://github.com/editorconfig-checker/editorconfig-checker.python

View File

@ -1,36 +0,0 @@
{
"bracketSameLine": true,
"endOfLine": "auto",
"insertPragma": true,
"overrides": [
{
"files": ".prettierrc",
"options": {
"parser": "json"
}
},
{
"files": "conf/librewolf.overrides.cfg",
"options": {
"parser": "babel"
}
},
{
"files": "conf/autoconfig.js.online",
"options": {
"parser": "babel"
}
}
],
"plugins": [
"@prettier/plugin-ruby",
"@prettier/plugin-xml",
"prettier-plugin-nginx",
"prettier-plugin-sh",
"prettier-plugin-toml"
],
"proseWrap": "always",
"quoteProps": "consistent",
"requirePragma": false,
"singleAttributePerLine": true
}

View File

@ -13,6 +13,12 @@
"matchPackagePatterns": [ "matchPackagePatterns": [
"*" "*"
] ]
},
{
"groupName": "all pre-commit updates",
"matchUpdateTypes": [
"pre-commit"
]
} }
], ],
"pre-commit": { "pre-commit": {

View File

@ -1,3 +1,4 @@
# Very Important Communication Programs, P2P, not expected to get sold # Very Important Communication Programs, P2P, not expected to get sold
exec --no-startup-id flatpak run --env=TZ=UTC net.jami.Jami # Unmaintained for personal reasons says the flatpak
#exec --no-startup-id flatpak run --env=TZ=UTC net.jami.Jami
exec --no-startup-id /usr/local/bin/briar exec --no-startup-id /usr/local/bin/briar

View File

@ -133,6 +133,10 @@
"toolbar_pin": "force_pinned", "toolbar_pin": "force_pinned",
"update_url": "https://clients2.google.com/service/update2/crx" "update_url": "https://clients2.google.com/service/update2/crx"
}, },
"gphhapmejobijbbhgpjhcjognlahblep": {
"blocked_install_message": "Tämä on KDE-talous, jossa kukaan ei tietääkseni käytä GNOMEa. Tämä lisäosa KDEn vastaavasta poiketen on riippuvainen GNOMEsta.",
"installation_mode": "blocked"
},
"hojggiaghnldpcknpbciehjcaoafceil": { "hojggiaghnldpcknpbciehjcaoafceil": {
"installation_mode": "normal_installed", "installation_mode": "normal_installed",
"override_update_url": true, "override_update_url": true,

10
package.json vendored
View File

@ -1,11 +1,7 @@
{ {
"devDependencies": { "devDependencies": {
"@prettier/plugin-ruby": "4.0.4", "@aminda/global-prettier-config": "2024.28.4"
"@prettier/plugin-xml": "3.4.1",
"prettier": "3.3.2",
"prettier-plugin-nginx": "1.0.3",
"prettier-plugin-sh": "0.14.0",
"prettier-plugin-toml": "2.0.1"
}, },
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903" "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903",
"prettier": "@aminda/global-prettier-config"
} }

60
pnpm-lock.yaml generated vendored
View File

@ -1,5 +1,3 @@
# @format
lockfileVersion: "9.0" lockfileVersion: "9.0"
settings: settings:
@ -9,26 +7,17 @@ settings:
importers: importers:
.: .:
devDependencies: devDependencies:
"@prettier/plugin-ruby": "@aminda/global-prettier-config":
specifier: 4.0.4 specifier: 2024.28.4
version: 4.0.4(prettier@3.3.2) version: 2024.28.4
"@prettier/plugin-xml":
specifier: 3.4.1
version: 3.4.1(prettier@3.3.2)
prettier:
specifier: 3.3.2
version: 3.3.2
prettier-plugin-nginx:
specifier: 1.0.3
version: 1.0.3
prettier-plugin-sh:
specifier: 0.14.0
version: 0.14.0(prettier@3.3.2)
prettier-plugin-toml:
specifier: 2.0.1
version: 2.0.1(prettier@3.3.2)
packages: packages:
"@aminda/global-prettier-config@2024.28.4":
resolution:
{
integrity: sha512-VjyTd8fFRnLgZRAMDRr9pm5hknnsVxpTCshvvE7RAiuH72hUzC82rm5vXDJjrhkedWJir2qZjmiC5Vo2LoR4tw==,
}
"@prettier/plugin-ruby@4.0.4": "@prettier/plugin-ruby@4.0.4":
resolution: resolution:
{ {
@ -99,10 +88,10 @@ packages:
peerDependencies: peerDependencies:
prettier: ^3.0.3 prettier: ^3.0.3
prettier@3.3.2: prettier@3.3.3:
resolution: resolution:
{ {
integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==, integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==,
} }
engines: { node: ">=14" } engines: { node: ">=14" }
hasBin: true hasBin: true
@ -127,14 +116,23 @@ packages:
} }
snapshots: snapshots:
"@prettier/plugin-ruby@4.0.4(prettier@3.3.2)": "@aminda/global-prettier-config@2024.28.4":
dependencies: dependencies:
prettier: 3.3.2 "@prettier/plugin-ruby": 4.0.4(prettier@3.3.3)
"@prettier/plugin-xml": 3.4.1(prettier@3.3.3)
prettier: 3.3.3
prettier-plugin-nginx: 1.0.3
prettier-plugin-sh: 0.14.0(prettier@3.3.3)
prettier-plugin-toml: 2.0.1(prettier@3.3.3)
"@prettier/plugin-xml@3.4.1(prettier@3.3.2)": "@prettier/plugin-ruby@4.0.4(prettier@3.3.3)":
dependencies:
prettier: 3.3.3
"@prettier/plugin-xml@3.4.1(prettier@3.3.3)":
dependencies: dependencies:
"@xml-tools/parser": 1.0.11 "@xml-tools/parser": 1.0.11
prettier: 3.3.2 prettier: 3.3.3
"@taplo/core@0.1.1": {} "@taplo/core@0.1.1": {}
@ -154,18 +152,18 @@ snapshots:
prettier-plugin-nginx@1.0.3: {} prettier-plugin-nginx@1.0.3: {}
prettier-plugin-sh@0.14.0(prettier@3.3.2): prettier-plugin-sh@0.14.0(prettier@3.3.3):
dependencies: dependencies:
mvdan-sh: 0.10.1 mvdan-sh: 0.10.1
prettier: 3.3.2 prettier: 3.3.3
sh-syntax: 0.4.2 sh-syntax: 0.4.2
prettier-plugin-toml@2.0.1(prettier@3.3.2): prettier-plugin-toml@2.0.1(prettier@3.3.3):
dependencies: dependencies:
"@taplo/lib": 0.4.0-alpha.2 "@taplo/lib": 0.4.0-alpha.2
prettier: 3.3.2 prettier: 3.3.3
prettier@3.3.2: {} prettier@3.3.3: {}
regexp-to-ast@0.5.0: {} regexp-to-ast@0.5.0: {}

View File

@ -30,8 +30,7 @@ UNAME=$(uname)
# enable terminal bell # enable terminal bell
if [[ -f /usr/bin/xset ]]; if [[ -f /usr/bin/xset ]]; then
then
(xset b on &) (xset b on &)
fi fi
@ -81,7 +80,7 @@ zstyle ':completion:*' menu select=2
if [[ $UNAME != Darwin ]]; then if [[ $UNAME != Darwin ]]; then
eval "$(dircolors -b)" eval "$(dircolors -b)"
fi fi
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} #zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
zstyle ':completion:*' list-colors '' zstyle ':completion:*' list-colors ''
zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*' zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
@ -100,17 +99,17 @@ fi
(uptime &) (uptime &)
(echo "") (echo "")
if [[ $UNAME != Darwin ]] then; #if [[ $UNAME != Darwin ]] then;
(who -H -w -u|head -n10&) # (who -H -w -u|head -n10&)
(echo "") # (echo "")
# (last -10 -w -x&) # (last -10 -w -x&)
fi #fi
if [[ $UNAME = Darwin ]]; then #if [[ $UNAME = Darwin ]]; then
(who -H -u|head -n10&) # (who -H -u|head -n10&)
(echo "") # (echo "")
(last -10&) # (last -10&)
fi #fi
# Only print motivational phrases if username is aminda or mikaela # Only print motivational phrases if username is aminda or mikaela
if [[ $(whoami) == aminda ]] || [[ $(whoami) == mikaela ]]; then if [[ $(whoami) == aminda ]] || [[ $(whoami) == mikaela ]]; then
@ -575,8 +574,7 @@ alias mpvm="mpv --no-video"
alias mpvms="mpv --no-video --shuffle" alias mpvms="mpv --no-video --shuffle"
# Compatibility with my i3 alsactl mess # Compatibility with my i3 alsactl mess
if [ -f ~/.config/asound.state ] if [ -f ~/.config/asound.state ]; then
then
alias alsactl="\alsactl -f ~/.config/asound.state" alias alsactl="\alsactl -f ~/.config/asound.state"
fi fi
@ -645,9 +643,7 @@ function geoip() {
## for unit193 ;) ## for unit193 ;)
## use command "ex" to extract any archive files. ## use command "ex" to extract any archive files.
## "ex package.zip" for example ## "ex package.zip" for example
function ex () function ex() {
{
if [ -f "$1" ]; then if [ -f "$1" ]; then
case "$1" in case "$1" in
*.tar) tar xvf $1 ;; *.tar) tar xvf $1 ;;
@ -664,9 +660,11 @@ case "$1" in
DIR=${1%%_*.deb} DIR=${1%%_*.deb}
ar xv $1 ar xv $1
mkdir ${DIR} mkdir ${DIR}
tar -C ${DIR} -xzvf data.tar.gz ;; tar -C ${DIR} -xzvf data.tar.gz
;;
*.rpm) rpm2cpio $1 | cpio -vid ;; *.rpm) rpm2cpio $1 | cpio -vid ;;
*) echo ""${1}" cannot be extracted via extract()" *)
echo ""${1}" cannot be extracted via extract()"
;; ;;
esac esac
else else