From 3a94c865baad6c5c30985f0f7a1e2e86a1a66196 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 26 Apr 2023 19:45:38 +0900 Subject: [PATCH 1/4] wezterm: use juliamono --- dotfiles/wezterm/wezterm.lua | 39 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dotfiles/wezterm/wezterm.lua b/dotfiles/wezterm/wezterm.lua index 5bb1712..9952d7d 100644 --- a/dotfiles/wezterm/wezterm.lua +++ b/dotfiles/wezterm/wezterm.lua @@ -17,7 +17,7 @@ if wezterm.target_triple == 'x86_64-pc-windows-msvc' then }) for _, vsvers in - ipairs(wezterm.glob('Microsoft Visual Studio/20*', 'C:/Program Files (x86)')) + ipairs(wezterm.glob('Microsoft Visual Studio/20*', 'C:/Program Files (x86)')) do local year = vsvers:gsub('Microsoft Visual Studio/', '') table.insert(launch_menu, { @@ -26,8 +26,8 @@ if wezterm.target_triple == 'x86_64-pc-windows-msvc' then 'cmd.exe', '/k', 'C:/Program Files (x86)/' - .. vsvers - .. '/BuildTools/VC/Auxiliary/Build/vcvars64.bat', + .. vsvers + .. '/BuildTools/VC/Auxiliary/Build/vcvars64.bat', }, }) end @@ -36,22 +36,27 @@ end return { default_prog = default_prog, launch_menu = launch_menu, - --- keys = { --- { --- key = 'P', --- mods = 'CTRL', --- action = wezterm.action.ActivateCommandPalette, --- } --- }, + -- keys = { + -- { + -- key = 'P', + -- mods = 'CTRL', + -- action = wezterm.action.ActivateCommandPalette, + -- } + -- }, color_scheme = "iceberg-dark", - use_fancy_tab_bar = false, tab_bar_at_bottom = true, - - window_background_opacity = 0.8, - - font = wezterm.font 'FirgeNerd Console' + window_background_opacity = 0.85, + -- font = wezterm.font 'FirgeNerd Console' + font = wezterm.font_with_fallback { + { + family = 'JuliaMono', + harfbuzz_features = { + 'calt=0', -- disables ligature + }, + }, + 'FirgeNerd Console', -- for japanese + 'UniFont Regular', + }, } - From 9afd3d01df8f1fabb212319fb81fc09efa4a9430 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Thu, 27 Apr 2023 10:22:16 +0900 Subject: [PATCH 2/4] new: xfce4 keyshortcuts --- .../xfce4/xfce4-keyboard-shortcuts.xml | 223 ++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 extra_configs/xfce4/xfce4-keyboard-shortcuts.xml diff --git a/extra_configs/xfce4/xfce4-keyboard-shortcuts.xml b/extra_configs/xfce4/xfce4-keyboard-shortcuts.xml new file mode 100644 index 0000000..9ff0acb --- /dev/null +++ b/extra_configs/xfce4/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From dea59d4e57b0aefad2b0f0b51bd5a97e9fcf83c5 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Sun, 30 Apr 2023 23:36:20 +0900 Subject: [PATCH 3/4] update: scoop list generating script --- bin/windows/scoop_apps/.gitignore | 2 + bin/windows/scoop_apps/scoop_apps.json | 144 ------------------- bin/windows/scoop_apps/update_scoop_list.ps1 | 11 +- 3 files changed, 8 insertions(+), 149 deletions(-) create mode 100644 bin/windows/scoop_apps/.gitignore delete mode 100644 bin/windows/scoop_apps/scoop_apps.json diff --git a/bin/windows/scoop_apps/.gitignore b/bin/windows/scoop_apps/.gitignore new file mode 100644 index 0000000..3f93dc8 --- /dev/null +++ b/bin/windows/scoop_apps/.gitignore @@ -0,0 +1,2 @@ +scoop_apps.json + diff --git a/bin/windows/scoop_apps/scoop_apps.json b/bin/windows/scoop_apps/scoop_apps.json deleted file mode 100644 index 3ffae3d..0000000 --- a/bin/windows/scoop_apps/scoop_apps.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "apps": [ - { - "Updated": "2022-09-24T06:50:10.362148+09:00", - "Info": "", - "Source": "main", - "Name": "7zip", - "Version": "22.01" - }, - { - "Updated": "2022-09-24T06:45:30.615827+09:00", - "Info": "", - "Source": "main", - "Name": "bat", - "Version": "0.22.1" - }, - { - "Updated": "2022-09-26T04:52:36.3416759+09:00", - "Info": "", - "Source": "main", - "Name": "ffmpeg", - "Version": "5.1.1" - }, - { - "Updated": "2022-09-23T17:54:45.7302151+09:00", - "Info": "", - "Source": "main", - "Name": "fzf", - "Version": "0.33.0" - }, - { - "Updated": "2022-09-25T00:18:14.5435972+09:00", - "Info": "", - "Source": "main", - "Name": "gcc", - "Version": "11.2.0" - }, - { - "Updated": "2022-09-24T06:50:11.9515886+09:00", - "Info": "", - "Source": "main", - "Name": "grep", - "Version": "3.7" - }, - { - "Updated": "2022-09-24T06:43:31.7789266+09:00", - "Info": "", - "Source": "main", - "Name": "hexyl", - "Version": "0.10.0" - }, - { - "Updated": "2022-09-27T19:03:11.6544132+09:00", - "Info": "", - "Source": "main", - "Name": "innounp", - "Version": "0.50" - }, - { - "Updated": "2022-09-27T07:30:16.5298145+09:00", - "Info": "", - "Source": "main", - "Name": "jid", - "Version": "0.7.6" - }, - { - "Updated": "2022-09-27T07:29:37.5227478+09:00", - "Info": "", - "Source": "main", - "Name": "jq", - "Version": "1.6" - }, - { - "Updated": "2022-09-23T17:59:11.0595712+09:00", - "Info": "", - "Source": "main", - "Name": "less", - "Version": "608" - }, - { - "Updated": "2022-09-27T08:37:26.471311+09:00", - "Info": "", - "Source": "main", - "Name": "lua", - "Version": "5.4.2" - }, - { - "Updated": "2022-09-25T00:17:18.2293504+09:00", - "Info": "", - "Source": "main", - "Name": "make", - "Version": "4.3" - }, - { - "Updated": "2022-09-27T19:03:31.678283+09:00", - "Info": "", - "Source": "main", - "Name": "r", - "Version": "4.2.1" - }, - { - "Updated": "2022-09-28T23:47:33.9083455+09:00", - "Info": "", - "Source": "extras", - "Name": "scoop-completion", - "Version": "0.2.3" - }, - { - "Updated": "2022-09-27T07:27:52.6696127+09:00", - "Info": "", - "Source": "extras", - "Name": "spacesniffer", - "Version": "1.3.0.2" - }, - { - "Updated": "2022-09-22T23:40:06.1651065+09:00", - "Info": "", - "Source": "main", - "Name": "sudo", - "Version": "0.2020.01.26" - }, - { - "Updated": "2022-09-24T06:53:20.806641+09:00", - "Info": "", - "Source": "main", - "Name": "ugrep", - "Version": "3.9.2" - } - ], - "buckets": [ - { - "Name": "extras", - "Source": "https://github.com/ScoopInstaller/Extras", - "Updated": "2022-09-28T21:31:14+09:00", - "Manifests": 1691 - }, - { - "Name": "main", - "Source": "https://github.com/ScoopInstaller/Main", - "Updated": "2022-09-28T21:32:26+09:00", - "Manifests": 1091 - } - ] -} diff --git a/bin/windows/scoop_apps/update_scoop_list.ps1 b/bin/windows/scoop_apps/update_scoop_list.ps1 index e9f20ad..939f7d9 100644 --- a/bin/windows/scoop_apps/update_scoop_list.ps1 +++ b/bin/windows/scoop_apps/update_scoop_list.ps1 @@ -7,15 +7,16 @@ if(!(Get-Command scoop -ErrorAction SilentlyContinue)) { } # change working directory to git root -Set-Location (Join-Path $PSScriptRoot "..") +Set-Location (Join-Path $PSScriptRoot "../../..") +Write-Output (pwd).Path # export to JSON -scoop export | Out-File .\bin\scoop_apps\scoop_apps.json -Encoding utf8 +scoop export | Out-File .\bin\windows\scoop_apps\scoop_apps.json -Encoding utf8 # create minimal JSON -$minimal_list = @("7zip", "bat", "fzf", "grep", "hexyl", "less", "sudo", "ugrep") -$parsed_json = Get-Content -Path .\bin\scoop_apps\scoop_apps.json | ConvertFrom-Json +$minimal_list = @("7zip", "aria2", "bat", "fzf", "grep", "hexyl", "less", "python", "rclone", "rga", "scoop-completion", "shasum", "sudo", "tree-sitter", "ugrep") +$parsed_json = Get-Content -Path .\bin\windows\scoop_apps\scoop_apps.json | ConvertFrom-Json $buckets = ($parsed_json | Select-Object buckets).buckets $apps = ($parsed_json | Select-Object apps).apps $selected_apps = $apps | Where-Object Name -In $minimal_list @@ -23,4 +24,4 @@ $new_json = [PSCustomObject]@{ "apps" = $selected_apps "buckets" = $buckets } -ConvertTo-Json -InputObject $new_json | Out-File .\bin\scoop_apps\scoop_minimal_apps.json -Encoding utf8 \ No newline at end of file +ConvertTo-Json -InputObject $new_json | Out-File .\bin\windows\scoop_apps\scoop_minimal_apps.json -Encoding utf8 From 7a0f18e525c709b57d8313871c9b3c394bd072be Mon Sep 17 00:00:00 2001 From: qwjyh Date: Sun, 30 Apr 2023 23:39:49 +0900 Subject: [PATCH 4/4] update: scoop minimal list --- .../scoop_apps/scoop_minimal_apps.json | 139 +++++++++++++----- 1 file changed, 103 insertions(+), 36 deletions(-) diff --git a/bin/windows/scoop_apps/scoop_minimal_apps.json b/bin/windows/scoop_apps/scoop_minimal_apps.json index fd88203..f7b872e 100644 --- a/bin/windows/scoop_apps/scoop_minimal_apps.json +++ b/bin/windows/scoop_apps/scoop_minimal_apps.json @@ -1,74 +1,141 @@ { "apps": [ { + "Source": "main", + "Version": "22.01", + "Info": "", "Updated": "2022-09-24T06:50:10.362148+09:00", - "Info": "", - "Source": "main", - "Name": "7zip", - "Version": "22.01" + "Name": "7zip" }, { - "Updated": "2022-09-24T06:45:30.615827+09:00", - "Info": "", "Source": "main", - "Name": "bat", - "Version": "0.22.1" + "Version": "1.36.0-1", + "Info": "", + "Updated": "2023-04-09T02:55:15.2743335+09:00", + "Name": "aria2" }, { - "Updated": "2022-09-23T17:54:45.7302151+09:00", - "Info": "", "Source": "main", - "Name": "fzf", - "Version": "0.33.0" + "Version": "0.23.0", + "Info": "", + "Updated": "2023-03-26T18:39:04.208662+09:00", + "Name": "bat" }, { + "Source": "main", + "Version": "0.39.0", + "Info": "", + "Updated": "2023-04-05T08:47:47.296666+09:00", + "Name": "fzf" + }, + { + "Source": "main", + "Version": "3.7", + "Info": "", "Updated": "2022-09-24T06:50:11.9515886+09:00", - "Info": "", - "Source": "main", - "Name": "grep", - "Version": "3.7" + "Name": "grep" }, { - "Updated": "2022-09-24T06:43:31.7789266+09:00", - "Info": "", "Source": "main", - "Name": "hexyl", - "Version": "0.10.0" + "Version": "0.12.0", + "Info": "", + "Updated": "2022-12-08T17:23:48.8883596+09:00", + "Name": "hexyl" }, { + "Source": "main", + "Version": "608", + "Info": "", "Updated": "2022-09-23T17:59:11.0595712+09:00", - "Info": "", - "Source": "main", - "Name": "less", - "Version": "608" + "Name": "less" }, { + "Source": "main", + "Version": "3.11.3", + "Info": "", + "Updated": "2023-04-06T12:06:41.1763977+09:00", + "Name": "python" + }, + { + "Source": "main", + "Version": "1.62.2", + "Info": "", + "Updated": "2023-03-23T13:54:55.8666374+09:00", + "Name": "rclone" + }, + { + "Source": "main", + "Version": "0.9.6", + "Info": "", + "Updated": "2022-10-08T23:14:27.9876049+09:00", + "Name": "rga" + }, + { + "Source": "extras", + "Version": "0.2.4", + "Info": "", + "Updated": "2022-10-28T07:59:17.3048878+09:00", + "Name": "scoop-completion" + }, + { + "Source": "main", + "Version": "0.2020.02.27", + "Info": "", + "Updated": "2022-09-30T17:43:48.986598+09:00", + "Name": "shasum" + }, + { + "Source": "main", + "Version": "0.2020.01.26", + "Info": "", "Updated": "2022-09-22T23:40:06.1651065+09:00", - "Info": "", - "Source": "main", - "Name": "sudo", - "Version": "0.2020.01.26" + "Name": "sudo" }, { - "Updated": "2022-09-24T06:53:20.806641+09:00", - "Info": "", "Source": "main", - "Name": "ugrep", - "Version": "3.9.2" + "Version": "0.20.8", + "Info": "", + "Updated": "2023-04-05T08:49:04.7238976+09:00", + "Name": "tree-sitter" + }, + { + "Source": "main", + "Version": "3.11.2", + "Info": "", + "Updated": "2023-04-09T00:09:13.2749821+09:00", + "Name": "ugrep" } ], "buckets": [ { "Name": "extras", "Source": "https://github.com/ScoopInstaller/Extras", - "Updated": "2022-09-28T21:31:14+09:00", - "Manifests": 1691 + "Updated": "2023-04-30T23:13:19+09:00", + "Manifests": 1862 + }, + { + "Name": "games", + "Source": "https://github.com/Calinou/scoop-games", + "Updated": "2023-04-30T21:31:23+09:00", + "Manifests": 270 }, { "Name": "main", "Source": "https://github.com/ScoopInstaller/Main", - "Updated": "2022-09-28T21:32:26+09:00", - "Manifests": 1091 + "Updated": "2023-04-30T21:31:42+09:00", + "Manifests": 1196 + }, + { + "Name": "my-bucket", + "Source": "https://github.com/qwjyh/scoop_bucket.git", + "Updated": "2023-04-06T19:37:51+09:00", + "Manifests": 5 + }, + { + "Name": "sysinternals", + "Source": "https://github.com/niheaven/scoop-sysinternals", + "Updated": "2023-04-18T21:02:21+09:00", + "Manifests": 75 } ] }