summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyren223 <Kyren223@proton.me>2025-01-01 19:38:47 +0200
committerKyren223 <Kyren223@proton.me>2025-01-01 19:38:47 +0200
commitce7651ed6eec70ec536461c95824cbe72b614269 (patch)
tree13574b24dfbe7156d7600814915575a8ec7c650e
parent723d7bd632f68b2f901d3d904ecafe079e5e5e8e (diff)
Revert "Updated flake.lock"
This reverts commit 55c738a2657d23d06c72887495afa3726053d16c.
-rw-r--r--.config/ohmyposh/tokyocat.omp.yml158
-rw-r--r--.config/ohmyposh/tokyocat.omp.yml.bak94
-rw-r--r--flake.lock37
-rw-r--r--hosts/kyren-laptop/configuration.nix8
-rw-r--r--hosts/kyren-laptop/home.nix4
5 files changed, 103 insertions, 198 deletions
diff --git a/.config/ohmyposh/tokyocat.omp.yml b/.config/ohmyposh/tokyocat.omp.yml
index 23ac0bf..18dc84e 100644
--- a/.config/ohmyposh/tokyocat.omp.yml
+++ b/.config/ohmyposh/tokyocat.omp.yml
@@ -1,78 +1,94 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+# Created by Kyren223 on GitHub https://github.com/Kyren223
+# File hosted on GitHub at https://github.com/Kyren223/dotfiles/blob/master/.config/ohmyposh/tokyocat.omp.yml
+
+version: 2
+final_space: true
+
+blocks:
+ - type: prompt
+ alignment: left
+ newline: true
+ segments:
+ - type: path
+ style: diamond
+ leading_diamond: "\ue0b6"
+ trailing_diamond: "\ue0b4"
+ template: "{{ .Path }}"
+ background: p:black
+ foreground: p:blue
+ properties:
+ style: full
+
+ - type: git
+ style: diamond
+ trailing_diamond: "\ue0b4"
+ background: p:black
+ foreground: p:blue
+ template: " {{ .HEAD }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if and (or (.Working.Changed) (.Staging.Changed)) (or (gt .Ahead 0) (gt .Behind 0)) }} | {{ else }} {{ end }}{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}"
+ properties:
+ fetch_status: true
+ branch_icon: " "
+ commit_icon: "@"
+
+ # - type: status
+ # style: diamond
+ # foreground: "p:white"
+ # background: "p:cyan"
+ # background_templates:
+ # - "{{ if .Error }}p:red2{{ end }}"
+ # trailing_diamond: 
+ # template: "<p:dark_blue2></>  "
+ # properties:
+ # always_enabled: false
+
+ - type: rprompt
+ overflow: hidden
+ segments:
+ - type: executiontime
+ style: plain
+ background: transparent
+ foreground: p:yellow
+ template: "{{ .FormattedMs }}"
+ properties:
+ threshold: 5000
+ display_style: austin
+
+ - type: prompt
+ alignment: left
+ newline: true
+ segments:
+ - type: text
+ style: powerline
+ powerline_symbol: 
+ background: transparent
+ foreground: p:magenta
+ foreground_templates:
+ - "{{ if gt .Code 0 }}p:red{{end}}"
+ - "{{ if eq .Code 0 }}p:magenta{{end}}"
+ template: "❯"
+
+
+transient_prompt:
+ background: transparent
+ foreground: p:magenta
+ template: "❯ "
+
+secondary_prompt:
+ background: transparent
+ foreground: p:magenta
+ template: "❯❯ "
palette:
+ blue: "blue"
black: "#262B44"
- blue: blue
- cyan: "#00897b"
- dark_blue: "#166e78"
- dark_blue2: "#193549"
- green: "#4caf50"
- light_blue: "#40c4ff"
magenta: "#F5C2E7"
red: "#D81E5B"
- red2: "#e91e63"
- white: "#ffffff"
+ green: "#4caf50"
yellow: "#ffeb3b"
-secondary_prompt:
- template: "❯❯ "
- foreground: p:magenta
- background: transparent
-transient_prompt:
- template: "❯ "
- foreground: p:magenta
- background: transparent
-blocks:
-- type: prompt
- alignment: left
- segments:
- - properties:
- cache_duration: none
- style: full
- leading_diamond: 
- trailing_diamond: 
- template: "{{ .Path }}"
- foreground: p:blue
- background: p:black
- type: path
- style: diamond
- - properties:
- branch_icon: "\ue725 "
- cache_duration: none
- commit_icon: "@"
- fetch_status: true
- trailing_diamond: 
- template: " {{ .HEAD }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if and (or (.Working.Changed) (.Staging.Changed)) (or (gt .Ahead 0) (gt .Behind 0)) }} | {{ else }} {{ end }}{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}"
- foreground: p:blue
- background: p:black
- type: git
- style: diamond
- newline: true
-- type: rprompt
- overflow: hidden
- segments:
- - properties:
- cache_duration: none
- display_style: austin
- threshold: 5000
- template: "{{ .FormattedMs }}"
- foreground: p:yellow
- background: transparent
- type: executiontime
- style: plain
-- type: prompt
- alignment: left
- segments:
- - properties:
- cache_duration: none
- template: ❯
- foreground: p:magenta
- powerline_symbol: 
- background: transparent
- type: text
- style: powerline
- foreground_templates:
- - "{{ if gt .Code 0 }}p:red{{end}}"
- - "{{ if eq .Code 0 }}p:magenta{{end}}"
- newline: true
-version: 3
-final_space: true
+ dark_blue: "#166e78"
+ light_blue: "#40c4ff"
+ white: "#ffffff"
+ cyan: "#00897b"
+ red2: "#e91e63"
+ dark_blue2: "#193549"
diff --git a/.config/ohmyposh/tokyocat.omp.yml.bak b/.config/ohmyposh/tokyocat.omp.yml.bak
deleted file mode 100644
index 18dc84e..0000000
--- a/.config/ohmyposh/tokyocat.omp.yml.bak
+++ /dev/null
@@ -1,94 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
-# Created by Kyren223 on GitHub https://github.com/Kyren223
-# File hosted on GitHub at https://github.com/Kyren223/dotfiles/blob/master/.config/ohmyposh/tokyocat.omp.yml
-
-version: 2
-final_space: true
-
-blocks:
- - type: prompt
- alignment: left
- newline: true
- segments:
- - type: path
- style: diamond
- leading_diamond: "\ue0b6"
- trailing_diamond: "\ue0b4"
- template: "{{ .Path }}"
- background: p:black
- foreground: p:blue
- properties:
- style: full
-
- - type: git
- style: diamond
- trailing_diamond: "\ue0b4"
- background: p:black
- foreground: p:blue
- template: " {{ .HEAD }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if and (or (.Working.Changed) (.Staging.Changed)) (or (gt .Ahead 0) (gt .Behind 0)) }} | {{ else }} {{ end }}{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}"
- properties:
- fetch_status: true
- branch_icon: " "
- commit_icon: "@"
-
- # - type: status
- # style: diamond
- # foreground: "p:white"
- # background: "p:cyan"
- # background_templates:
- # - "{{ if .Error }}p:red2{{ end }}"
- # trailing_diamond: 
- # template: "<p:dark_blue2></>  "
- # properties:
- # always_enabled: false
-
- - type: rprompt
- overflow: hidden
- segments:
- - type: executiontime
- style: plain
- background: transparent
- foreground: p:yellow
- template: "{{ .FormattedMs }}"
- properties:
- threshold: 5000
- display_style: austin
-
- - type: prompt
- alignment: left
- newline: true
- segments:
- - type: text
- style: powerline
- powerline_symbol: 
- background: transparent
- foreground: p:magenta
- foreground_templates:
- - "{{ if gt .Code 0 }}p:red{{end}}"
- - "{{ if eq .Code 0 }}p:magenta{{end}}"
- template: "❯"
-
-
-transient_prompt:
- background: transparent
- foreground: p:magenta
- template: "❯ "
-
-secondary_prompt:
- background: transparent
- foreground: p:magenta
- template: "❯❯ "
-
-palette:
- blue: "blue"
- black: "#262B44"
- magenta: "#F5C2E7"
- red: "#D81E5B"
- green: "#4caf50"
- yellow: "#ffeb3b"
- dark_blue: "#166e78"
- light_blue: "#40c4ff"
- white: "#ffffff"
- cyan: "#00897b"
- red2: "#e91e63"
- dark_blue2: "#193549"
diff --git a/flake.lock b/flake.lock
index 65b1533..b4b3b39 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
{
"nodes": {
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -36,7 +20,6 @@
},
"ghostty": {
"inputs": {
- "flake-compat": "flake-compat",
"nixpkgs-stable": [
"nixpkgs"
],
@@ -46,11 +29,11 @@
"zig": "zig"
},
"locked": {
- "lastModified": 1735689283,
- "narHash": "sha256-LOZRScnB8Q9ylmlXnt2j2v4Aj1b5JZTdSeKYaFL1RDw=",
+ "lastModified": 1733436494,
+ "narHash": "sha256-/h5pK2ysUhBNyqsD6w0ii3W4zhuAOQNIpd99Vac5nBY=",
"ref": "refs/heads/main",
- "rev": "60611b8a4a1d5b3c1097cce85eb0311de0696cfa",
- "revCount": 8700,
+ "rev": "2fb92dd4aa75214c3bc58220fa7638b698dcace3",
+ "revCount": 8178,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
@@ -66,11 +49,11 @@
]
},
"locked": {
- "lastModified": 1735724774,
- "narHash": "sha256-j4RK1GVa0fqcsut5ZV0hRYNMYcMoNP7mULwXnHQ6BkM=",
+ "lastModified": 1731887066,
+ "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2ac770c007cc5dc26e6fe472956e6a23134dd124",
+ "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
"type": "github"
},
"original": {
@@ -81,11 +64,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1735471104,
- "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+ "lastModified": 1731676054,
+ "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+ "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github"
},
"original": {
diff --git a/hosts/kyren-laptop/configuration.nix b/hosts/kyren-laptop/configuration.nix
index 003f9a8..875ceac 100644
--- a/hosts/kyren-laptop/configuration.nix
+++ b/hosts/kyren-laptop/configuration.nix
@@ -181,10 +181,10 @@
};
# Enable KVM/QEMU virtualization
- # programs.virt-manager.enable = true;
- # users.groups.libvirtd.members = ["kyren"];
- # virtualisation.libvirtd.enable = true;
- # virtualisation.spiceUSBRedirection.enable = true;
+ programs.virt-manager.enable = true;
+ users.groups.libvirtd.members = ["kyren"];
+ virtualisation.libvirtd.enable = true;
+ virtualisation.spiceUSBRedirection.enable = true;
services.syncthing.enable = true;
services.syncthing = {
diff --git a/hosts/kyren-laptop/home.nix b/hosts/kyren-laptop/home.nix
index c8fdf0d..6707ae1 100644
--- a/hosts/kyren-laptop/home.nix
+++ b/hosts/kyren-laptop/home.nix
@@ -12,7 +12,7 @@
home.stateVersion = "24.05"; # Please read the comment before changing.
home.packages = with pkgs; [
- nerd-fonts.jetbrains-mono
+ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
keepassxc
discord
git
@@ -55,7 +55,7 @@
piper
goose
sqlc
- jetbrains.idea-community-bin
+ jetbrains.idea-community
jdk
maven
gradle