Compare commits
47 Commits
0cbd2d91cb
...
master
Author | SHA1 | Date | |
---|---|---|---|
7e85d5e6a5 | |||
87879c7e0f | |||
8ffeb40405 | |||
a82053eac1 | |||
298742233f | |||
699187b8c2 | |||
759516cbce | |||
5158676329 | |||
f63a78668f | |||
67c6380a10 | |||
f1b63c5031 | |||
fc6f33475c | |||
8812bd71e4 | |||
68b7549cee | |||
39b55ebcd8 | |||
9bce702239 | |||
6d6ed7d657 | |||
5d5d122ef5 | |||
b3744052f1 | |||
e351847b77 | |||
0200f9adb9 | |||
77ff2c9a4d | |||
0ff8296deb | |||
5392b6d7ed | |||
383af5728b | |||
fb3e854a3a | |||
f0f1d6e43c | |||
414163befb | |||
922cfa9042 | |||
8e265e7c5c | |||
30a5d0e5ed | |||
cd7fc88042 | |||
12ad926717 | |||
29d8be1490 | |||
e245cd9980 | |||
0f7ca90955 | |||
75b7a7445f | |||
2a1398b0c9 | |||
d904fffb41 | |||
0543c78038 | |||
5b66d1588d | |||
6ac70ba69e | |||
b570f59c33 | |||
4d66a82e98 | |||
f46b6f3552 | |||
a44f1383de | |||
68ad78bab1 |
@ -1,9 +1,14 @@
|
|||||||
# Sync apps with scoop
|
# Sync apps with scoop
|
||||||
# . ~/Documents/PowerShell/verify-state.ps1
|
# . ~/Documents/PowerShell/verify-state.ps1
|
||||||
. ~/Documents/PowerShell/installed-apps.ps1
|
# . ~/Documents/PowerShell/installed-apps.ps1
|
||||||
|
|
||||||
# Shell completion
|
# Shell completion
|
||||||
. ~/Documents/PowerShell/completions.ps1
|
. ~/Documents/PowerShell/completions.ps1
|
||||||
|
|
||||||
# Aliases
|
# Aliases
|
||||||
. ~/Documents/PowerShell/aliases.ps1
|
. ~/Documents/PowerShell/aliases.ps1
|
||||||
|
|
||||||
|
# Switch to default dir
|
||||||
|
if ((Get-Location) -like "*scoop\apps\windows-terminal*") {
|
||||||
|
Set-Location ~
|
||||||
|
}
|
||||||
|
@ -1,29 +1,68 @@
|
|||||||
# Unix like pwd
|
# Unix like pwd
|
||||||
if (Test-Path alias:pwd) {
|
if (Test-Path alias:pwd) {
|
||||||
Remove-Alias -Name pwd
|
Remove-Alias -Name pwd
|
||||||
}
|
}
|
||||||
Function pwd {(Get-Location).Path}
|
Function pwd { (Get-Location).Path }
|
||||||
|
|
||||||
# Change to dotfiles directory
|
# Change to dotfiles directory
|
||||||
if (Test-Path alias:dotfolder) {
|
if (Test-Path alias:dotfolder) {
|
||||||
Remove-Alias -Name dotfolder
|
Remove-Alias -Name dotfolder
|
||||||
}
|
}
|
||||||
Function dotfolder {Set-Location ~/.local/share/chezmoi}
|
Function dotfolder { Set-Location ~/.local/share/chezmoi }
|
||||||
|
|
||||||
if (Test-Path alias:dotcommit) {
|
if (Test-Path alias:dotcommit) {
|
||||||
Remove-Alias -Name dotcommit
|
Remove-Alias -Name dotcommit
|
||||||
}
|
}
|
||||||
|
|
||||||
Function dotcommit {
|
Function dotcommit {
|
||||||
# If no arguments are passed, use the default message
|
# Export installed apps to file
|
||||||
if ($args.Length -eq 0) {
|
. ~/Documents/PowerShell/installed-apps.ps1
|
||||||
$message = "Update dotfiles"
|
|
||||||
} else {
|
# If no arguments are passed, use the default message
|
||||||
$message = $args -join " "
|
if ($args.Length -eq 0) {
|
||||||
}
|
$message = "Update dotfiles"
|
||||||
chezmoi re-add
|
}
|
||||||
chezmoi diff
|
else {
|
||||||
chezmoi git -- commit -a -m $message
|
$message = $args -join " "
|
||||||
chezmoi git -- push
|
}
|
||||||
chezmoi apply
|
chezmoi re-add
|
||||||
}
|
chezmoi diff
|
||||||
|
chezmoi git -- commit -a -m $message
|
||||||
|
chezmoi git -- push
|
||||||
|
chezmoi apply
|
||||||
|
}
|
||||||
|
|
||||||
|
# Replace cat with bat
|
||||||
|
if (Test-Path alias:cat) {
|
||||||
|
Remove-Alias -Name cat
|
||||||
|
}
|
||||||
|
Set-Alias -Name cat -Value bat
|
||||||
|
|
||||||
|
# Replace ls with exa
|
||||||
|
if (Test-Path alias:ls) {
|
||||||
|
Remove-Alias -Name ls
|
||||||
|
}
|
||||||
|
Set-Alias -Name ls -Value exa
|
||||||
|
|
||||||
|
# Replace cd with zoxide
|
||||||
|
if (Test-Path alias:cd) {
|
||||||
|
Remove-Alias -Name cd
|
||||||
|
}
|
||||||
|
Set-Alias -Name cd -Value z
|
||||||
|
|
||||||
|
# Replace grep with ugrep
|
||||||
|
if (Test-Path alias:grep) {
|
||||||
|
Remove-Alias -Name grep
|
||||||
|
}
|
||||||
|
Set-Alias -Name grep -Value ugrep
|
||||||
|
|
||||||
|
# Add alias for recycle-bin
|
||||||
|
if (Test-Path alias:rb) {
|
||||||
|
Remove-Alias -Name rb
|
||||||
|
}
|
||||||
|
Set-Alias -Name rb -Value recycle-bin
|
||||||
|
|
||||||
|
# Add shorthand alias for scoop update and cleanup
|
||||||
|
Function update {
|
||||||
|
sudo scoop update * && sudo scoop cleanup * && scoop cache rm *
|
||||||
|
}
|
@ -5,4 +5,10 @@ Import-Module "$($(Get-Item $(Get-Command scoop.ps1).Path).Directory.Parent.Full
|
|||||||
# Chezmoi
|
# Chezmoi
|
||||||
if (Get-Command chezmoi -ErrorAction SilentlyContinue) { chezmoi completion powershell | Out-String | Invoke-Expression }
|
if (Get-Command chezmoi -ErrorAction SilentlyContinue) { chezmoi completion powershell | Out-String | Invoke-Expression }
|
||||||
# Github CLI
|
# Github CLI
|
||||||
Invoke-Expression -Command $(gh completion -s powershell | Out-String)
|
Invoke-Expression -Command $(gh completion -s powershell | Out-String)
|
||||||
|
# gsudo
|
||||||
|
Import-Module gsudoModule
|
||||||
|
# zoxide
|
||||||
|
Invoke-Expression (& { (zoxide init powershell | Out-String) })
|
||||||
|
# packwiz
|
||||||
|
packwiz completion powershell | Out-String | Invoke-Expression
|
||||||
|
28
Documents/PowerShell/installed-apps.ps1
Normal file
28
Documents/PowerShell/installed-apps.ps1
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
function sortScoopOutput($scoop) {
|
||||||
|
$ht = ConvertFrom-Json -AsHashtable -InputObject $scoop
|
||||||
|
$od = [ordered]@{}
|
||||||
|
# Structure of json is object with a key name and the value as an array of objects, which each have 4 key value pairs
|
||||||
|
# Sort the keys and the array of objects, as well the key value pairs in the objects
|
||||||
|
foreach ($key in $ht.Keys | Sort-Object) {
|
||||||
|
$od[$key] = @()
|
||||||
|
foreach ($app in $ht[$key] | Sort-Object) {
|
||||||
|
$app = $app | Sort-Object
|
||||||
|
$od[$key] += [ordered]@{}
|
||||||
|
foreach ($k in $app.Keys | Sort-Object) {
|
||||||
|
$od[$key][-1][$k] = $app[$k]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
# Sort the array by the name key
|
||||||
|
# NOTE: This property is hard coded, and could be changed if scoop changes the json structure
|
||||||
|
$od[$key] = $od[$key] | Sort-Object -Property name
|
||||||
|
}
|
||||||
|
$json = ConvertTo-Json -InputObject $od
|
||||||
|
$json_string = $json -join "`n"
|
||||||
|
return $json_string
|
||||||
|
}
|
||||||
|
|
||||||
|
# Scoop installed apps
|
||||||
|
# sortScoopOutput($(scoop export)) | Out-File "~\scoop\apps.json"
|
||||||
|
scoop export | Out-File "~\scoop\apps.json"
|
||||||
|
# Pipx installed apps
|
||||||
|
pipx list --json | Out-File "~\.pipx.json"
|
18
dot_config/alacritty/alacritty.toml
Normal file
18
dot_config/alacritty/alacritty.toml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
live_config_reload = true
|
||||||
|
|
||||||
|
[shell]
|
||||||
|
program = "pwsh"
|
||||||
|
args = ["-NoLogo"]
|
||||||
|
|
||||||
|
[window]
|
||||||
|
dimensions.columns = 120
|
||||||
|
dimensions.lines = 30
|
||||||
|
dynamic_padding = true
|
||||||
|
dynamic_title = true
|
||||||
|
|
||||||
|
[font]
|
||||||
|
normal.family = "CaskaydiaCove Nerd Font"
|
||||||
|
|
||||||
|
[cursor]
|
||||||
|
style.shape = "Beam"
|
||||||
|
style.blinking = "Off"
|
8
dot_config/alacritty/symlink.ps1
Normal file
8
dot_config/alacritty/symlink.ps1
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
if (Test-Path "$env:APPDATA\alacritty\alacritty.toml") {
|
||||||
|
Remove-Item -Path "$env:APPDATA\alacritty\alacritty.toml"
|
||||||
|
}
|
||||||
|
if (Test-Path "$env:APPDATA\alacritty") {
|
||||||
|
Remove-Item -Path "$env:APPDATA\alacritty" -Recurse
|
||||||
|
}
|
||||||
|
New-Item -ItemType Directory -Path "$env:APPDATA\alacritty"
|
||||||
|
New-Item -ItemType SymbolicLink -Path "$env:APPDATA\alacritty\alacritty.toml" -Value "$PSScriptRoot\alacritty.toml"
|
28
dot_config/fastfetch/config.jsonc
Normal file
28
dot_config/fastfetch/config.jsonc
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
|
||||||
|
"modules": [
|
||||||
|
"title",
|
||||||
|
"separator",
|
||||||
|
"os",
|
||||||
|
"host",
|
||||||
|
"kernel",
|
||||||
|
"uptime",
|
||||||
|
"packages",
|
||||||
|
"shell",
|
||||||
|
"de",
|
||||||
|
"wm",
|
||||||
|
"wmtheme",
|
||||||
|
"theme",
|
||||||
|
"font",
|
||||||
|
"cursor",
|
||||||
|
"terminal",
|
||||||
|
"terminalfont",
|
||||||
|
"cpu",
|
||||||
|
"gpu",
|
||||||
|
"memory",
|
||||||
|
"localip",
|
||||||
|
"battery",
|
||||||
|
"poweradapter",
|
||||||
|
"weather"
|
||||||
|
]
|
||||||
|
}
|
12
dot_editorconfig
Normal file
12
dot_editorconfig
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# https://editorconfig.org/
|
||||||
|
# top-most EditorConfig file
|
||||||
|
root = true
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
charset = utf-8
|
||||||
|
indent_style = tab
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.yml]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
@ -8,15 +8,13 @@
|
|||||||
email = ir.shoebottom@gmail.com
|
email = ir.shoebottom@gmail.com
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
[credential "https://github.com"]
|
[core]
|
||||||
helper = gh auth git-credential
|
autocrlf = true
|
||||||
[credential "https://gist.github.com"]
|
[pull]
|
||||||
helper = gh auth git-credential
|
rebase = true
|
||||||
[credential "https://vcs.cs.unb.ca"]
|
[credential]
|
||||||
provider = generic
|
helper = C:/Users/Isaac/scoop/apps/git-credential-manager/current/git-credential-manager.exe
|
||||||
[credential "https://git.shoebottom.ca"]
|
[credential "https://git.shoebottom.ca"]
|
||||||
provider = generic
|
provider = generic
|
||||||
[core]
|
|
||||||
autocrlf = false
|
|
||||||
[credential "helperselector"]
|
[credential "helperselector"]
|
||||||
selected = manager
|
selected = manager
|
||||||
|
914
dot_pipx.json
914
dot_pipx.json
File diff suppressed because it is too large
Load Diff
46
dot_ssh/config
Normal file
46
dot_ssh/config
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
Host fcslinux
|
||||||
|
Hostname fcslinux.cs.unb.ca
|
||||||
|
Port 22
|
||||||
|
User ishoebot
|
||||||
|
IdentityFile ~/.ssh/unb.ed25519
|
||||||
|
AddKeysToAgent yes
|
||||||
|
ForwardAgent yes
|
||||||
|
|
||||||
|
Host remotelab34
|
||||||
|
Hostname remotelabm34.cs.unb.ca
|
||||||
|
User ishoebot
|
||||||
|
Port 22
|
||||||
|
ProxyCommand ssh -q -W %h:%p fcslinux
|
||||||
|
|
||||||
|
Host remotelab35
|
||||||
|
Hostname remotelabm35.cs.unb.ca
|
||||||
|
User ishoebot
|
||||||
|
Port 22
|
||||||
|
ProxyCommand ssh -q -W %h:%p fcslinux
|
||||||
|
|
||||||
|
Host cs3103
|
||||||
|
Hostname cs3103.cs.unb.ca
|
||||||
|
User ishoebot
|
||||||
|
Port 22
|
||||||
|
ProxyCommand ssh -q -W %h:%p fcslinux
|
||||||
|
|
||||||
|
Host ubuntu
|
||||||
|
Hostname ssh.shoebottom.ca
|
||||||
|
User isaac
|
||||||
|
Port 2222
|
||||||
|
IdentityFile ~/.ssh/ubuntu.ed25519
|
||||||
|
AddKeysToAgent yes
|
||||||
|
|
||||||
|
Host github
|
||||||
|
Hostname github.com
|
||||||
|
User git
|
||||||
|
IdentityFile ~/.ssh/git.ed25519
|
||||||
|
AddKeysToAgent yes
|
||||||
|
ForwardAgent yes
|
||||||
|
|
||||||
|
Host gitea
|
||||||
|
Hostname ssh.shoebottom.ca
|
||||||
|
User gitea
|
||||||
|
IdentityFile ~/.ssh/git.ed25519
|
||||||
|
AddKeysToAgent yes
|
||||||
|
ForwardAgent yes
|
3072
scoop/apps.json
3072
scoop/apps.json
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user