diff --git a/awesome/modules/autostart.lua b/awesome/modules/autostart.lua index ab7446b..d9a3378 100644 --- a/awesome/modules/autostart.lua +++ b/awesome/modules/autostart.lua @@ -7,23 +7,20 @@ if is_reloading() then return end -awful.spawn(CONFIG_DIR .. "utils/xcape_conf.sh") awful.spawn("picom -b") awful.spawn("/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1") -- authentication popup for obs virtual camera etc awful.spawn("redshift") awful.spawn("sxhkd") if not is_laptop then - awful.spawn(CONFIG_DIR .. "utils/xrandr_conf.sh") - awful.spawn("discord", { screen = 3 }) awful.spawn("vscodium") awful.spawn("spotify", { tag = "2", screen = 3, urgent = false }) awful.spawn("firefox") - awful.spawn(terminal .. " -e fish -c \"sleep 5 && ncpamixer\"", + awful.spawn(terminal .. " -e fish -C \"sleep 5 && ncpamixer\"", { tag = "3", screen = 3, urgent = false, focus = false }) - awful.spawn(terminal .. " -e btop", { tag = "4", screen = 3, urgent = false, focus = false }) - awful.spawn(terminal .. " -e fish -c \"sleep 5 && snoud\"", { tag = "5", screen = 3, urgent = false, focus = false }) - awful.spawn(terminal .. " -e fish -c \"sleep 2 && gomuks\"", { tag = "6", screen = 3, urgent = false, focus = false }) + awful.spawn(terminal .. " -e fish -C btop", { tag = "4", screen = 3, urgent = false, focus = false }) + awful.spawn(terminal .. " -e fish -C \"sleep 5 && snoud\"", { tag = "5", screen = 3, urgent = false, focus = false }) + awful.spawn(terminal .. " -e fish -C \"sleep 2 && gomuks\"", { tag = "9", screen = 3, urgent = false, focus = false }) end diff --git a/awesome/rc.lua b/awesome/rc.lua index 3b428f1..4400ef1 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -8,6 +8,7 @@ local awful = require("awful") CONFIG_DIR = awful.util.get_configuration_dir() HOME_DIR = CONFIG_DIR .. "../../" SCRIPTS_DIR = HOME_DIR .. "dotfiles/scripts/" +HOME_BIN = HOME_DIR .. "bin/" require("awful.autofocus") -- Widget and layout library local wibox = require("wibox") @@ -90,12 +91,14 @@ local main_menu = awful.menu({ { "terminal", terminal }, { "file manager", file_manager }, { "OVR Utils", function() awful.spawn("./proj/godot/ovr-utils/builds/linux/ovr-utils.x86_64") end }, + { "sinpin-vr", function() awful.spawn(terminal .. " -e fish -C ~/bin/sinpin-vr/sinpin_vr") end }, { "close menu", function() end } } }) local launcher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = main_menu }) +local blahaj = awful.widget.launcher({ image = beautiful.blahaj, menu = {} }) -- Menubar configuration menubar.utils.terminal = terminal -- Set the terminal for applications that require it @@ -106,7 +109,7 @@ menubar.menu_gen.all_menu_dirs = { --"/var/lib/flatpak/exports/share/applications", } -local juneday = awful.widget.watch(SCRIPTS_DIR .. "june", 600, function(widget, stdout) +local juneday = awful.widget.watch(HOME_BIN .. "june", 600, function(widget, stdout) for line in stdout:gmatch("[^\r\n]+") do widget.text = " [ " .. line .. " ] " break @@ -116,7 +119,7 @@ local juneday = awful.widget.watch(SCRIPTS_DIR .. "june", 600, function(widget, end) -- Create a textclock widget -local textclock = wibox.widget.textclock() +local textclock = awful.widget.textclock() -- Create a wibox for each screen and add it -- buttons for each tag widget @@ -200,6 +203,7 @@ awful.screen.connect_for_each_screen(function(s) layout = wibox.layout.fixed.horizontal, launcher, s.mytaglist, + blahaj, }, s.mytasklist, -- Middle widget { -- Right widgets diff --git a/awesome/themes/default/background.png b/awesome/themes/default/background.png index 55c143f..65b7f86 100644 Binary files a/awesome/themes/default/background.png and b/awesome/themes/default/background.png differ diff --git a/awesome/themes/default/background_nyarch.png b/awesome/themes/default/bg_nyarch.png similarity index 100% rename from awesome/themes/default/background_nyarch.png rename to awesome/themes/default/bg_nyarch.png diff --git a/awesome/themes/default/bg_sea_sunset_shader.png b/awesome/themes/default/bg_sea_sunset_shader.png new file mode 100644 index 0000000..55c143f Binary files /dev/null and b/awesome/themes/default/bg_sea_sunset_shader.png differ diff --git a/awesome/themes/default/background_shork.png b/awesome/themes/default/bg_shork.png similarity index 100% rename from awesome/themes/default/background_shork.png rename to awesome/themes/default/bg_shork.png diff --git a/awesome/themes/default/blahaj.png b/awesome/themes/default/blahaj.png new file mode 100644 index 0000000..a054609 Binary files /dev/null and b/awesome/themes/default/blahaj.png differ diff --git a/awesome/themes/default/theme.lua b/awesome/themes/default/theme.lua index 0783fee..eb32518 100644 --- a/awesome/themes/default/theme.lua +++ b/awesome/themes/default/theme.lua @@ -121,6 +121,7 @@ theme.wallpaper = theme_path .. "background.png" -- theme.menu_height, theme.bg_focus, theme.fg_focus -- ) theme.awesome_icon = theme_path .. "icon.png" +theme.blahaj = theme_path .. "blahaj.png" -- Define the icon theme for application icons. If not set then the icons -- from /usr/share/icons and /usr/share/icons/hicolor will be used. diff --git a/blender/3.5/config/userpref.blend b/blender/3.5/config/userpref.blend index 1926f6a..2c36550 100644 Binary files a/blender/3.5/config/userpref.blend and b/blender/3.5/config/userpref.blend differ diff --git a/fish/config.fish b/fish/config.fish index 1dd5541..41a8288 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -7,10 +7,19 @@ alias l "ls -hAGg" alias ll "ls -l" alias wtr "weather.sh" alias wifi "nmcli device wifi rescan && nmcli device wifi list" -alias pass "head -c 42 /dev/urandom | base64" alias ff fastfetch alias pf pfetch alias gst "git status" alias glog "git log --oneline" +alias cac "cargo clippy" +alias car "cargo run" +alias carr "cargo run --release" +alias cacp "cargo clippy -- -W clippy::pedantic" +alias tab "echo \"hard_tabs = true\" > rustfmt.toml" +alias :3 "echo meow :3" +alias py python +fish_add_path /home/crispypin/bin/ +fish_add_path /home/crispypin/.cargo/bin fish_add_path /home/crispypin/bin/scripts fish_add_path /home/crispypin/bin/snoud +fish_add_path /home/crispypin/bin/sinpin-vr diff --git a/fish/fish_variables b/fish/fish_variables index 94c7756..5cdac63 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -40,4 +40,4 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d -SETUVAR fish_user_paths:/home/crispypin/bin/snoud\x1e/home/crispypin/bin/scripts +SETUVAR fish_user_paths:/home/crispypin/bin/sinpin\x2dvr\x1e/home/crispypin/bin\x1e/home/crispypin/\x2ecargo/bin\x1e/home/crispypin/bin/snoud\x1e/home/crispypin/bin/scripts diff --git a/fish_history b/fish_history new file mode 120000 index 0000000..c8c5689 --- /dev/null +++ b/fish_history @@ -0,0 +1 @@ +/home/crispypin/.local/share/fish/fish_history \ No newline at end of file diff --git a/install.conf.yaml b/install.conf.yaml index 17f91e1..3e12b27 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -25,6 +25,7 @@ ~/.config/sxhkd: sxhkd ~/.config/templates: templates ~/.config/user-dirs.dirs: user-dirs.dirs + ~/.config/warpd/config: warpd_config ~/.config/VSCodium/User/settings.json: vscodium.json ~/.local/share/ovr-utils/overlay_data.json: ovr-utils/overlay_data.json ~/.steam/debian-installation/steamapps/common/Logic World/componentrestrictions.succ: steam/Logic World/componentrestrictions.succ diff --git a/ovr-utils/overlay_data.json b/ovr-utils/overlay_data.json index 6694be7..f22adfc 100644 --- a/ovr-utils/overlay_data.json +++ b/ovr-utils/overlay_data.json @@ -1 +1 @@ -{"overlays":{"BatteryLevel 787":{"alpha":0.6,"fallback":["left","right","head"],"offsets":{"head":{"pos":[0,0,-0.35],"rot":[0,0,0,1]},"left":{"pos":[0,0,0],"rot":[0,0,0,1]},"right":{"pos":[0.086597,0.027936,0.165674],"rot":[-0.668819,-0.087167,-0.394435,0.624102]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://overlays/BatteryLevel.tscn","target":"right","visible":true,"width":0.1},"Clock 53":{"alpha":0.5,"fallback":["left","right","head"],"offsets":{"head":{"pos":[-0.244381,-0.385513,-0.586836],"rot":[-0.389447,0.235124,0.072405,0.887584]},"left":{"pos":[-0.039802,0.025886,0.116723],"rot":[-0.385533,0.138926,0.40202,0.818806]},"right":{"pos":[0,0,0],"rot":[0,0,0,1]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://overlays/Clock.tscn","target":"head","visible":true,"width":0.1},"KeyboardOverlay 95":{"alpha":0.8,"fallback":["left","right","head"],"offsets":{"head":{"pos":[0,0,-0.35],"rot":[0,0,0,1]},"left":{"pos":[0.194313,-0.024168,0.136503],"rot":[-0.64431,0.048261,0.03915,0.762235]},"right":{"pos":[0,0,0],"rot":[0,0,0,1]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://overlays/KeyboardOverlay.tscn","target":"left","visible":false,"width":0.4},"MainOverlay":{"alpha":0.5,"fallback":["left","right","head"],"offsets":{"head":{"pos":[0,0,-0.5],"rot":[0,0,0,1]},"left":{"pos":[0.15152,0.052258,0.000667],"rot":[-0.652702,-0.027279,0.008815,0.757072]},"right":{"pos":[0.060803,0.066139,0.047436],"rot":[-0.61547,-0.107841,0.222651,0.748327]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://special_overlays/MainOverlay.tscn","target":"right","visible":true,"width":0.25}},"version":1} +{"overlays":{"BatteryLevel 787":{"alpha":0.6,"fallback":["left","right","head"],"offsets":{"head":{"pos":[0,0,-0.35],"rot":[0,0,0,1]},"left":{"pos":[0,0,0],"rot":[0,0,0,1]},"right":{"pos":[0.086597,0.027936,0.165674],"rot":[-0.668819,-0.087167,-0.394435,0.624102]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://overlays/BatteryLevel.tscn","target":"right","visible":true,"width":0.1},"Clock 53":{"alpha":0.6,"fallback":["left","right","head"],"offsets":{"head":{"pos":[-0.226232,-0.327426,-0.5479],"rot":[-0.192412,0.149258,0.035293,0.969254]},"left":{"pos":[-0.055556,0.06252,0.087553],"rot":[-0.319538,0.260592,0.405969,0.815584]},"right":{"pos":[0,0,0],"rot":[0,0,0,1]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://overlays/Clock.tscn","target":"head","visible":true,"width":0.1},"KeyboardOverlay 95":{"alpha":0.8,"fallback":["left","right","head"],"offsets":{"head":{"pos":[0,0,-0.35],"rot":[0,0,0,1]},"left":{"pos":[0.194313,-0.024168,0.136503],"rot":[-0.64431,0.048261,0.03915,0.762235]},"right":{"pos":[0,0,0],"rot":[0,0,0,1]},"world":{"pos":[-0.529671,1.220752,1.079115],"rot":[-0.175528,0.744516,0.250599,0.593369]}},"path":"res://overlays/KeyboardOverlay.tscn","target":"left","visible":false,"width":0.4},"MainOverlay":{"alpha":0.5,"fallback":["left","right","head"],"offsets":{"head":{"pos":[0,0,-0.5],"rot":[0,0,0,1]},"left":{"pos":[0.15152,0.052258,0.000667],"rot":[-0.652702,-0.027279,0.008815,0.757072]},"right":{"pos":[0.060803,0.066139,0.047436],"rot":[-0.61547,-0.107841,0.222651,0.748327]},"world":{"pos":[0,1,0],"rot":[0,0,0,1]}},"path":"res://special_overlays/MainOverlay.tscn","target":"right","visible":true,"width":0.25}},"version":1} diff --git a/scripts/cut_video.sh b/scripts/cut_video.sh index aa36d10..b6eb225 100755 --- a/scripts/cut_video.sh +++ b/scripts/cut_video.sh @@ -11,4 +11,5 @@ if [ $# -eq 0 ]; then fi ffmpeg -i "$1" -ss $2 -to $3 -c copy $4"_raw.mp4" -ffmpeg -i "$1" -ss $2 -to $3 $4".mp4" +# ffmpeg -i "$1" -ss $2 -to $3 $4".mp4" +ffmpeg -i $4"_raw.mp4" $4".mp4" diff --git a/scripts/june b/scripts/june deleted file mode 100755 index 6900426..0000000 Binary files a/scripts/june and /dev/null differ diff --git a/scripts/task.sh b/scripts/task.sh new file mode 100755 index 0000000..b06774b --- /dev/null +++ b/scripts/task.sh @@ -0,0 +1 @@ +sed '/# unlikely/q' ~/documents/notes/projects.md | sed 's/#.*//;/^$/d' | shuf -n1 | echo "[$(date +%H:%M)] Work on this for an hour: $(cat -)" diff --git a/steam/ChilloutVR/game.config b/steam/ChilloutVR/game.config index 627bd24..8cd4801 100644 --- a/steam/ChilloutVR/game.config +++ b/steam/ChilloutVR/game.config @@ -2,7 +2,7 @@ "settings": [ { "name": "GeneralPlayerHeight", - "value": "181", + "value": "182", "type": 0 }, { @@ -37,7 +37,7 @@ }, { "name": "GeneralPortalSafeDistance", - "value": "300", + "value": "296", "type": 0 }, { @@ -77,7 +77,7 @@ }, { "name": "GraphicsMsaaLevel", - "value": "4", + "value": "2", "type": 0 }, { @@ -107,7 +107,7 @@ }, { "name": "GraphicsColorGrading", - "value": "True", + "value": "False", "type": 2 }, { @@ -162,12 +162,12 @@ }, { "name": "GraphicsResolutionPresets", - "value": "960x528", + "value": "1920x1056", "type": 3 }, { "name": "GraphicsHighResPortalImages", - "value": "True", + "value": "False", "type": 2 }, { @@ -287,12 +287,12 @@ }, { "name": "AudioMaster", - "value": "100", + "value": "65", "type": 0 }, { "name": "AudioWorldSFX", - "value": "0", + "value": "18", "type": 0 }, { @@ -302,7 +302,7 @@ }, { "name": "AudioPlayerVoice", - "value": "63", + "value": "50", "type": 0 }, { @@ -312,7 +312,7 @@ }, { "name": "AudioUi", - "value": "0", + "value": "8", "type": 0 }, { @@ -372,7 +372,7 @@ }, { "name": "ControlTurnSpeed", - "value": "42", + "value": "30", "type": 0 }, { @@ -392,12 +392,12 @@ }, { "name": "ControlDeadZoneLeft", - "value": "12", + "value": "10", "type": 0 }, { "name": "ControlDeadZoneRight", - "value": "33", + "value": "17", "type": 0 }, { @@ -622,7 +622,7 @@ }, { "name": "ContentFilterScreenEffects", - "value": "0", + "value": "2", "type": 0 }, { @@ -762,22 +762,22 @@ }, { "name": "ContentFilterPropsFlashingColors", - "value": "1", + "value": "0", "type": 0 }, { "name": "ContentFilterPropsFlashingLights", - "value": "1", + "value": "0", "type": 0 }, { "name": "ContentFilterPropsScreenEffects", - "value": "1", + "value": "2", "type": 0 }, { "name": "ContentFilterPropsExtremelyBright", - "value": "0", + "value": "2", "type": 0 }, { @@ -787,7 +787,7 @@ }, { "name": "ContentFilterPropsViolence", - "value": "1", + "value": "0", "type": 0 }, { @@ -812,12 +812,12 @@ }, { "name": "ContentFilterPropsExcessivelySmall", - "value": "1", + "value": "0", "type": 0 }, { "name": "ContentFilterPropsHorror", - "value": "1", + "value": "0", "type": 0 }, { @@ -1017,7 +1017,7 @@ }, { "name": "IKTrackingSmoothing", - "value": "0", + "value": "5", "type": 1 }, { @@ -1072,7 +1072,7 @@ }, { "name": "ExperimentalMaxConcurrentDownloads", - "value": "1", + "value": "2", "type": 0 }, { @@ -1222,7 +1222,7 @@ }, { "name": "SelfModerationVolume", - "value": "99", + "value": "185", "type": 0 }, { @@ -1237,7 +1237,7 @@ }, { "name": "SelfModerationAvatar", - "value": "1", + "value": "2", "type": 0 }, { diff --git a/steam/Logic World/settings_profile1.succ b/steam/Logic World/settings_profile1.succ index 1093151..5efb3c4 100644 --- a/steam/Logic World/settings_profile1.succ +++ b/steam/Logic World/settings_profile1.succ @@ -51,24 +51,24 @@ MHG.OutlinePegs: true MHG.OutlineWires: true MHG.OutlineConnectedPegWires: true MHG.OutlineInteractables: true -MHG.Graphics.RenderDistance.LimitRenderDistance: true -MHG.Graphics.RenderDistance.MaxRenderDistance: 600 -MHG.ScreenshotResolutionScale: 1 +MHG.Graphics.RenderDistance.LimitRenderDistance: false +MHG.Graphics.RenderDistance.MaxRenderDistance: 150 +MHG.ScreenshotResolutionScale: 2 MHG.ScreenshotSounds: true MHG.ScreenshotEncoding: PNG MHG.ScreenshotJpgQuality: 100 MHG.Avatar.OfflineName: Crispy -MHG.Avatar.BodyColor: 9B4EE5 -MHG.Avatar.FaceColor: 010032 +MHG.Avatar.BodyColor: B44EE5 +MHG.Avatar.FaceColor: FF0082 MHG.Avatar.SHINYBOBBY: false MHG.Avatar.BobbyStyle: Casual MHG.FieldOfView: 80 -MHG.SeeYourOwnShadow: false +MHG.SeeYourOwnShadow: true MHG.NametagScale: 1 MHG.NametagOpacity: 1 MHG.ShowNametags: Always MHG.NametagsFollowCamera: true -MHG.RealtimeReflections.Enabled: true +MHG.RealtimeReflections.Enabled: false MHG.RealtimeReflections.UpdateMode: Frame MHG.RealtimeReflections.UpdateInterval_Frame: 1 MHG.RealtimeReflections.UpdateInterval_Seconds: 1 @@ -112,7 +112,7 @@ MHG.Graphics.ShadowCascades: FourCascades MHG.Graphics.SoftShadowsEnabled: true MHG.Graphics.OutlineThickness: 2 MHG.Graphics.OutlineFill: 10 -MHG.Graphics.OutlineIntensity: 75 +MHG.Graphics.OutlineIntensity: 60 MHG.Graphics.OutlineCorners: false MHG.Graphics.AmbientOcclusionEnabled: true MHG.Graphics.BloomEnabled: false @@ -120,7 +120,7 @@ MHG.Graphics.AntiAliasing: _8x MHG.Graphics.MaxFPS: 60 MHG.Graphics.RenderScale: 1 MHG.Graphics.Vsync: SingleBuffered -MHG.Graphics.FullscreenMode: Windowed +MHG.Graphics.FullscreenMode: FullScreenWindow MHG.Graphics.ShaderQuality.BarrierShaderVariant: _2D LogicUI.ColorChoosing.FunSpinnyCircle: false LogicUI.ColorChoosing.FunSpinnySquare: false @@ -498,8 +498,8 @@ Configurable Menus: LogicUI.ConfigurableMenus.Scale: 100 LogicUI.ConfigurableMenus.ResizingSettings: MenuPosition_Pixels: - x: 527.8109 - y: 1049 + x: 559.0909 + y: 1079 MenuSize_Pixels: x: 2721.818 y: 1230.227 @@ -647,7 +647,7 @@ Configurable Menus: y: 851.5 MenuSize_Pixels: x: 1230 - y: 720.4545 + y: 724.5454 Edit Drum Menu: LogicUI.ConfigurableMenus.Scale: 100 LogicUI.ConfigurableMenus.ResizingSettings: diff --git a/steam/launch-options/cvr-launch-options.md b/steam/launch-options/cvr-launch-options.md index cf9ca62..5d39e7b 100644 --- a/steam/launch-options/cvr-launch-options.md +++ b/steam/launch-options/cvr-launch-options.md @@ -2,4 +2,4 @@ PROTON_LOG=0 PROTON_LOG_DIR=/tmp %command% -skipsteam --disable-videoplayers --melonloader.hideconsole ---disable-videoplayers --melonloader.hideconsole +--disable-videoplayers --melonloader.hideconsole -skipsteam diff --git a/vscodium.json b/vscodium.json index ee9eb6f..c7ec1fe 100644 --- a/vscodium.json +++ b/vscodium.json @@ -9,51 +9,40 @@ "**/*.meta": true }, "editor.quickSuggestionsDelay": 0, - "python.autoComplete.addBrackets": true, "editor.suggestSelection": "first", - "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", "editor.hover.delay": 10, "workbench.hover.delay": 50, - "editorconfig.generateAuto": false, "window.menuBarVisibility": "toggle", "liveServer.settings.root": "docs/", "liveServer.settings.donotVerifyTags": true, "editor.insertSpaces": false, - "editor.fontFamily": "\"-linja lipamanka\", sans, mono", - "editor.minimap.renderCharacters": false, - "Lua.telemetry.enable": false, + "editor.fontFamily": "\"-Wingdings\",\"-linja lipamanka\", sans, mono", "Lua.workspace.library": [ "~/proj/forks/awesome" ], - "color-highlight.markRuler": false, - "bracket-pair-colorizer-2.depreciation-notice": false, "liveServer.settings.donotShowInfoMsg": true, - "python.analysis.typeCheckingMode": "basic", - "python.experiments.enabled": false, "editor.copyWithSyntaxHighlighting": false, "terminal.integrated.defaultProfile.linux": "fish", - "rust.clippy_preference": "on", - "C_Cpp.renameRequiresIdentifier": false, "editor.renderWhitespace": "all", "terminal.integrated.fontFamily": "monospace", "markdown.preview.fontFamily": "sans", "editor.bracketPairColorization.enabled": false, - "rust-analyzer.inlayHints.parameterHints.enable": false, "rust-analyzer.cargo.buildScripts.enable": true, "editor.fontLigatures": true, "redhat.telemetry.enabled": false, "files.trimTrailingWhitespace": true, - "editor.glyphMargin": false, "editor.formatOnSave": true, "omnisharp.useModernNet": false, "[python]": { "editor.defaultFormatter": "ms-python.black-formatter" }, "workbench.colorTheme": "One Candy", - "window.zoomLevel": 1, "extensions.autoCheckUpdates": false, "extensions.autoUpdate": false, - "lldb.suppressUpdateNotifications": true, "zenMode.hideLineNumbers": false, - "editor.inlayHints.enabled": "offUnlessPressed" + "editor.wordWrap": "on", + "editor.minimap.renderCharacters": false, + "editor.inlayHints.enabled": "offUnlessPressed", + "window.zoomLevel": 1, + "diffEditor.ignoreTrimWhitespace": false } \ No newline at end of file