diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index 7be2e8c..328b30d 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -16,26 +16,27 @@ alias please="sudo" alias pwease="please" alias pls="please" -# kitty stuff -if [ $TERM = "xterm-kitty" ] - alias icat="kitten icat" - alias s="kitten ssh" -else - alias icat="wezterm imgcat" - alias s="ssh" -end +if status is-interactive + # kitty stuff + if [ $TERM = "xterm-kitty" ] + alias icat="kitten icat" + alias s="kitten ssh" + else + alias icat="wezterm imgcat" + alias s="ssh" + end # NixOS -if type -q nixos-rebuild - alias nrs="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all" - alias nrb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all" - alias nrs-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all --rollback" - alias nrb-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all --rollback" - alias hms="NIXPKGS_ALLOW_INSECURE=1 home-manager switch" - alias hmb="NIXPKGS_ALLOW_INSECURE=1 home-manager build" + if type -q nixos-rebuild + alias nrs="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all" + alias nrb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all" + alias nrs-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --upgrade-all --rollback" + alias nrb-rb="sudo NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild build --upgrade-all --rollback" + alias hms="NIXPKGS_ALLOW_INSECURE=1 home-manager switch" + alias hmb="NIXPKGS_ALLOW_INSECURE=1 home-manager build" + end end - # git alias git-us="git submodule update --init --recursive" diff --git a/restore.sh b/restore.sh index 4552b35..63aa2b8 100755 --- a/restore.sh +++ b/restore.sh @@ -129,10 +129,10 @@ mkdir -p $HOME/.vscode/ cp $GIT_DIR/vscode/keybindings.json $HOME/.config/Code/User/ cp $GIT_DIR/vscode/settings.json $HOME/.config/Code/User/ if command_exists "code"; then - for ext in $(cat $GIT_DIR/vscode/extensions.txt); do code --install-extension $ext; done + code $(for ext in $(cat $GIT_DIR/vscode/extensions.txt); do echo -n "--install-extension $ext "; done) cp $GIT_DIR/vscode/argv.json $HOME/.vscode/argv.json elif command_exists "code-oss"; then - for ext in $(cat $GIT_DIR/vscode/extensions.txt); do code-oss --install-extension $ext; done + code-oss $(for ext in $(cat $GIT_DIR/vscode/extensions.txt); do echo -n "--install-extension $ext "; done) cp $GIT_DIR/vscode/argv.json $HOME/.vscode-oss/argv.json fi diff --git a/vesktop/settings/settings.json b/vesktop/settings/settings.json index e7951fa..882d761 100644 --- a/vesktop/settings/settings.json +++ b/vesktop/settings/settings.json @@ -68,7 +68,10 @@ "file": true }, "AnonymiseFileNames": { - "enabled": true + "enabled": true, + "anonymiseByDefault": true, + "method": 0, + "randomisedLength": 7 }, "WebRichPresence (arRPC)": { "enabled": false @@ -149,7 +152,8 @@ "emojiSize": 48, "hyperLinkText": "{{NAME}}", "useHyperLinks": true, - "stickerSize": 160 + "stickerSize": 160, + "disableEmbedPermissionCheck": false }, "FakeProfileThemes": { "enabled": true, @@ -195,7 +199,7 @@ "size": 100, "zoom": 2, "nearestNeighbour": false, - "square": false, + "square": true, "saveZoomValues": true, "zoomSpeed": 0.5 }, @@ -400,7 +404,8 @@ "memberList": true, "voiceUsers": true, "reactorsList": true, - "colorChatMessages": false + "colorChatMessages": false, + "pollResults": true }, "SecretRingToneEnabler": { "enabled": false @@ -734,6 +739,6 @@ "authenticated": false, "url": "https://api.vencord.dev/", "settingsSync": false, - "settingsSyncVersion": 1731856858102 + "settingsSyncVersion": 1735789651501 } } \ No newline at end of file diff --git a/vscode/extensions.txt b/vscode/extensions.txt index b5e12d6..3beea09 100644 --- a/vscode/extensions.txt +++ b/vscode/extensions.txt @@ -18,7 +18,6 @@ diegomolina.css-minify dustypomerleau.rust-syntax dzhavat.git-cheatsheet equinusocio.vsc-material-theme-icons -esbenp.prettier-vscode eserozvataf.one-dark-pro-monokai-darker felipecaputo.git-project-manager fill-labs.dependi @@ -110,6 +109,7 @@ tomoki1207.pdf ttoowa.in-your-face-incredible twxs.cmake usernamehw.errorlens +vadimcn.vscode-lldb vinaykumar.vice visualstudioexptteam.intellicode-api-usage-examples visualstudioexptteam.vscodeintellicode diff --git a/vscode/settings.json b/vscode/settings.json index 944a502..815a3ce 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -115,6 +115,15 @@ "editor.defaultFormatter": "rust-lang.rust-analyzer" }, "[yaml]": { - "editor.defaultFormatter": "redhat.vscode-yaml" - } + "editor.defaultFormatter": "redhat.vscode-yaml", + }, + "remote.SSH.connectTimeout": 30, + "remote.SSH.useLocalServer": false, + "remote.SSH.remotePlatform": { + "fedora-desk": "linux" + }, + "yaml.format.singleQuote": true, + "evenBetterToml.formatter.indentEntries": false, + "evenBetterToml.formatter.indentTables": true, + "evenBetterToml.formatter.indentString": " " }