diff --git a/files/git/gitconfig b/files/git/gitconfig index d49227b..26052ee 100644 --- a/files/git/gitconfig +++ b/files/git/gitconfig @@ -16,10 +16,14 @@ sort = -committerdate [alias] fpush = push --force-with-lease + +# Signing [tag] gpgsign = true [commit] gpgsign = true +[gpg] + format = ssh [include] path = ~/.gitconfig.local diff --git a/files/omp/colors/.gitignore b/files/omp/colors/.gitignore deleted file mode 100644 index 3c3629e..0000000 --- a/files/omp/colors/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/files/omp/colors/bun.lockb b/files/omp/colors/bun.lockb deleted file mode 100755 index 528a96a..0000000 Binary files a/files/omp/colors/bun.lockb and /dev/null differ diff --git a/files/omp/colors/colors.json b/files/omp/colors/colors.json deleted file mode 100644 index 183e4aa..0000000 --- a/files/omp/colors/colors.json +++ /dev/null @@ -1,106 +0,0 @@ -[ - { - "properties": { - "steps": 8, - "hue": { - "start": 209, - "end": 259, - "curve": "easeOutQuad" - }, - "saturation": { - "start": 0.03, - "end": 1, - "rate": 1, - "curve": "easeOutQuad" - }, - "brightness": { - "start": 1, - "end": 0.03, - "curve": "easeInQuart" - } - }, - "options": { - "minorSteps": [0, 1], - "name": "Main", - "rotation": "clockwise" - } - }, - { - "properties": { - "steps": 8, - "hue": { - "start": 0, - "end": 15, - "curve": "easeOutQuad" - }, - "saturation": { - "start": 0.75, - "end": 1, - "rate": 1, - "curve": "easeOutQuad" - }, - "brightness": { - "start": 1, - "end": 0.2, - "curve": "linear" - } - }, - "options": { - "minorSteps": [0, 1], - "name": "Error", - "rotation": "clockwise" - } - }, - { - "properties": { - "steps": 8, - "hue": { - "start": 60, - "end": 70, - "curve": "easeOutQuad" - }, - "saturation": { - "start": 0.75, - "end": 1, - "rate": 1, - "curve": "easeOutQuad" - }, - "brightness": { - "start": 1, - "end": 0.2, - "curve": "linear" - } - }, - "options": { - "minorSteps": [0, 1], - "name": "Warning", - "rotation": "clockwise" - } - }, - { - "properties": { - "steps": 8, - "hue": { - "start": 122, - "end": 146, - "curve": "easeOutQuad" - }, - "saturation": { - "start": 0.75, - "end": 1, - "rate": 1, - "curve": "easeOutQuad" - }, - "brightness": { - "start": 1, - "end": 0.2, - "curve": "linear" - } - }, - "options": { - "minorSteps": [0, 1], - "name": "Success", - "rotation": "clockwise" - } - } -] diff --git a/files/omp/colors/index.js b/files/omp/colors/index.js deleted file mode 100644 index 4c42678..0000000 --- a/files/omp/colors/index.js +++ /dev/null @@ -1,21 +0,0 @@ -import color from '@k-vyn/coloralgorithm' -import colors from './colors.json' assert { type: 'json' } -import fs from 'fs' -import yaml from 'yaml' - -const offset = 10 -const palette = {} -for (const { properties, options } of colors) { - const result = color.generate(properties, options) - const name = result[0].name - for (const color of result[0].colors) { - palette[`${name.toLowerCase()}-${color.step * offset}`] = color.hex - } -} - -const configFile = '../main.omp.yaml' -const config = fs.readFileSync(configFile, 'utf8') -// config.palette = palette -const output = yaml.stringify({ palette }) - -fs.writeFileSync(configFile, config.replace(/palette:(.|\s)*$/, output)) diff --git a/files/omp/colors/package.json b/files/omp/colors/package.json deleted file mode 100644 index d9c68fd..0000000 --- a/files/omp/colors/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "module", - "main": "index.js", - "dependencies": { - "@k-vyn/coloralgorithm": "^1.0.0", - "yaml": "^2.2.1" - } -} diff --git a/files/omp/config.yaml b/files/omp/config.yaml deleted file mode 100644 index 0f5296b..0000000 --- a/files/omp/config.yaml +++ /dev/null @@ -1,159 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json - -palette: - error-0: '#ff4040' - error-10: '#e23629' - error-15: '#d33220' - error-20: '#c52e18' - error-30: '#a8280d' - error-40: '#8a2106' - error-5: '#f03a34' - error-50: '#6d1b02' - error-60: '#501401' - error-70: '#330d00' - main-0: '#f7fbff' - main-10: '#b4cafd' - main-15: '#95a9fc' - main-20: '#7783fa' - main-30: '#5348f4' - main-40: '#4826e8' - main-5: '#d6e6fe' - main-50: '#3e10ca' - main-60: '#22036e' - main-70: '#020008' - success-0: '#40ff46' - success-10: '#29e243' - success-15: '#20d342' - success-20: '#18c541' - success-30: '#0da83d' - success-40: '#068a36' - success-5: '#34f044' - success-50: '#026d2d' - success-60: '#015022' - success-70: '#003316' - warning-0: '#ffff40' - warning-10: '#dae229' - warning-15: '#c8d320' - warning-20: '#b6c518' - warning-30: '#96a80d' - warning-40: '#788a06' - warning-5: '#ecf034' - warning-50: '#5d6d02' - warning-60: '#435001' - warning-70: '#2a3300' -blocks: - - type: prompt - alignment: left - segments: - - leading_diamond:  - foreground: p:main-70 - background: p:main-5 - type: os - style: diamond - - properties: - style: full - template: " \uf0e7 " - foreground: p:main-70 - powerline_symbol:  - background: p:error-15 - type: root - style: powerline - - properties: - style: full - template: ' {{ .Path }} ' - foreground: p:main-0 - powerline_symbol:  - background: p:main-40 - type: path - style: powerline - - template: ' {{ .HEAD }} ' - foreground: p:main-70 - powerline_symbol:  - background: p:warning-10 - type: git - style: powerline - - type: prompt - alignment: right - segments: - - leading_diamond:  - trailing_diamond:  - foreground: p:main-70 - background: p:main-10 - type: python - style: dynamic - - leading_diamond:  - trailing_diamond:  - foreground: p:main-70 - background: p:main-10 - type: go - style: dynamic - - leading_diamond:  - trailing_diamond:  - foreground: p:main-70 - background: p:main-10 - type: node - style: dynamic - - leading_diamond:  - trailing_diamond:  - template: '{{ .Context }}{{ if .Namespace }}::{{ .Namespace }}{{ end }}' - foreground: p:main-70 - background: p:main-10 - type: kubectl - style: dynamic - - leading_diamond:  - trailing_diamond:  - template: '{{ .Icon }} {{ .Server }}' - foreground: p:main-70 - background: p:main-10 - type: docker - style: dynamic - - leading_diamond:  - trailing_diamond:  - foreground: p:main-70 - background: p:main-10 - type: rust - style: dynamic - - leading_diamond:  - trailing_diamond:  - foreground: p:main-70 - background: p:main-10 - type: battery - style: dynamic - - properties: - always_enabled: true - leading_diamond:  - template: "{{ if gt .Code 0 }}\uf00d {{ .Code }} {{ .Meaning }}{{ else }}\uf42e{{ end }}" - foreground: p:main-70 - type: status - style: diamond - background_templates: - - '{{ if gt .Code 0 }}p:error-0{{ else }}p:main-10{{ end }}' - - properties: - always_enabled: true - style: round - foreground: p:main-70 - powerline_symbol:  - background: p:main-5 - type: executiontime - style: powerline - - properties: - time_format: '15:04:05' - template: ' {{ .CurrentDate | date .Format }} ' - foreground: p:main-70 - powerline_symbol:  - background: p:main-0 - type: time - style: powerline - - type: prompt - alignment: left - segments: - - properties: - always_enabled: true - template: '❯ ' - foreground: p:main-15 - type: status - style: plain - foreground_templates: - - '{{ if gt .Code 0 }}p:error-15{{ end }}' - newline: true -version: 3 diff --git a/home/home.nix b/home/home.nix index 147a7f0..6cb2905 100644 --- a/home/home.nix +++ b/home/home.nix @@ -25,7 +25,6 @@ }; file = { - ".config/omp/config.yaml".source = ../files/omp/config.yaml; ".config/ghostty/config".source = ../files/ghostty/config; ".gitconfig".source = ../files/git/gitconfig; ".gitignore_global".source = ../files/git/gitignore_global; @@ -39,18 +38,22 @@ }; shellAliases = { + # Rust re-maps l = "eza -a1lh"; ls = "eza"; + cat = "bat"; + + # QOL dc = "docker compose"; rsync = "rsync -az --info=progress2"; t = "tmux new-session -A -s main"; e = "nvim"; g = "lazygit"; d = "lazydocker"; - vai = "sudo darwin-rebuild switch --flake ~/.config/nix-macos#${host.hostName}"; - p = "pnpm"; px = "pnpm -s dlx"; + + vai = "sudo darwin-rebuild switch --flake ~/.config/nix-macos#${host.hostName}"; }; }; @@ -61,9 +64,6 @@ fish = { enable = true; interactiveShellInit = '' - # if type -q oh-my-posh - # oh-my-posh init fish --config ~/.config/omp/config.yaml | source - # end if type -q starship starship init fish | source end diff --git a/home/pkgs.nix b/home/pkgs.nix index b0023d2..f7137c1 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -3,7 +3,6 @@ with pkgs; [ # Base tmux - oh-my-posh git git-lfs git-crypt diff --git a/hosts/ordio.nix b/hosts/ordio.nix index 10eea65..0e266dc 100644 --- a/hosts/ordio.nix +++ b/hosts/ordio.nix @@ -9,6 +9,7 @@ "tableplus" "http-toolkit" "phpstorm" + "notion" ]; pkgs = pkgs: with pkgs; [ diff --git a/secrets/git/config.ordio b/secrets/git/config.ordio index 384cf83..878c023 100644 Binary files a/secrets/git/config.ordio and b/secrets/git/config.ordio differ