update commit

add sign key
Merge pull request #1 from ordionary/main
2025-09-05 18:30:39 +00:00 · 2025-07-02 18:43:32 +02:00 · 2025-07-02 18:37:41 +02:00 · 2025-07-02 18:34:34 +02:00 · 2025-07-02 18:26:27 +02:00 · 2025-07-02 18:26:18 +02:00
14 changed files with 21 additions and 312 deletions
--- a/darwin.nix
+++ b/darwin.nix
@@ -6,7 +6,7 @@
  ...
 }:
 {
-  nix.enable = false;
+  # nix.enable = false;
  nix.settings.experimental-features = "nix-command flakes";

  # Set Git commit hash for darwin-version.
--- 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
--- a/files/omp/colors/.gitignore
+++ b/files/omp/colors/.gitignore
@@ -1 +0,0 @@
-node_modules
--- a/files/omp/colors/bun.lockb
+++ b/files/omp/colors/bun.lockb
--- a/files/omp/colors/colors.json
+++ b/files/omp/colors/colors.json
@@ -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"
-    }
-  }
-]
--- a/files/omp/colors/index.js
+++ b/files/omp/colors/index.js
@@ -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))
--- a/files/omp/colors/package.json
+++ b/files/omp/colors/package.json
@@ -1,8 +0,0 @@
-{
-  "type": "module",
-  "main": "index.js",
-  "dependencies": {
-    "@k-vyn/coloralgorithm": "^1.0.0",
-    "yaml": "^2.2.1"
-  }
-}
--- a/files/omp/config.yaml
+++ b/files/omp/config.yaml
@@ -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
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750304462,
-        "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
+        "lastModified": 1751473516,
+        "narHash": "sha256-nJFR4f4hh879Mm7ne4SaUihxQAwu1FdnRCaA/8pHc1k=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
+        "rev": "bafcf336870c9daca80df1c4a09ef926fc497016",
        "type": "github"
      },
      "original": {
@@ -27,11 +27,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750325256,
-        "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=",
+        "lastModified": 1751313918,
+        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9",
+        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
        "type": "github"
      },
      "original": {
@@ -42,11 +42,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1750386251,
-        "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
+        "lastModified": 1751382304,
+        "narHash": "sha256-p+UruOjULI5lV16FkBqkzqgFasLqfx0bihLBeFHiZAs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
+        "rev": "d31a91c9b3bee464d054633d5f8b84e17a637862",
        "type": "github"
      },
      "original": {
--- 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
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -3,7 +3,6 @@ with pkgs;
 [
  # Base
  tmux
-  oh-my-posh
  git
  git-lfs
  git-crypt
--- a/hosts/ordio.nix
+++ b/hosts/ordio.nix
@@ -9,6 +9,7 @@
      "tableplus"
      "http-toolkit"
      "phpstorm"
+      "notion"
    ];
    pkgs =
      pkgs: with pkgs; [
--- a/secrets/git/config.mac14
+++ b/secrets/git/config.mac14
--- a/secrets/git/config.ordio
+++ b/secrets/git/config.ordio
Author	SHA1	Message	Date
cupcakearmy	ed7696d7a3	update commit	2025-07-02 18:43:32 +02:00
cupcakearmy	89d8728118	add sign key	2025-07-02 18:37:41 +02:00
Nicco	c001acbb04	Merge pull request #1 from ordionary/main Ordio stuff	2025-07-02 18:34:34 +02:00
nicco	35e8d233b0	signing	2025-07-02 18:26:27 +02:00
nicco	a92e8912e7	remove omp	2025-07-02 18:26:18 +02:00
nicco	225846e2e2	add notion	2025-07-02 18:23:36 +02:00