diff --git a/flake.lock b/flake.lock index 815d609..398d504 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -71,13 +71,29 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1725762081, + "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1731961335, - "narHash": "sha256-pyis0r60VfoQ6geK/i8OFdv4XRgPl9o5Fmnw1yKdkCI=", + "lastModified": 1725115514, + "narHash": "sha256-llfa5ShJmYH4dYAwBf8B1c1lCv1GRq385VBfq4QztLw=", "owner": "nix-community", "repo": "NUR", - "rev": "2a71ed37a1dbd0ad80a33d52620ecea222ff99e2", + "rev": "2a8d5d58e80863bff01f9800f8f6f8bf9c207d0a", "type": "github" }, "original": { @@ -99,14 +115,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731954233, - "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { diff --git a/modules/home-manager/cli/utils/default.nix b/modules/home-manager/cli/utils/default.nix index 3532416..58dc031 100644 --- a/modules/home-manager/cli/utils/default.nix +++ b/modules/home-manager/cli/utils/default.nix @@ -17,7 +17,7 @@ in }; programs.eza = { enable = true; - icons = "auto"; + icons = true; }; programs.fd = { enable = true; diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index 7eb2a08..bf4ceeb 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -28,30 +28,27 @@ in enable = true; highlighters = [ "brackets" "main" "pattern" ]; styles = { - assign = "fg=#7cafc2"; - back-double-quoted-argument = "fg=#7cafc2"; + builtin = "fg=#7cafc2,bold"; + single-hyphen-option = "fg=#86c1b9"; + double-hyphen-option = "fg=#86c1b9"; back-quoted-argument-delimiter = "fg=ba8baf,bold"; - bracket-error = "fg=#ab4642,bold"; + single-quoted-argument = "fg=f7ca88"; + function = "fg=blue"; + reserved-word = "fg=#ba8baf,bold"; + assign = "fg=#a1b56c"; bracket-level-1 = "fg=7cafc2"; bracket-level-2 = "fg=ba8baf"; bracket-level-3 = "fg=#a1b56c"; - builtin = "fg=#7cafc2,bold"; - commandseparator = "fg=#f7ca88,bold"; + bracket-error = "fg=#ab4642,bold"; cursor-matchingbracket = "fg=ba8baf,bold"; - dollar-double-quoted-argument = "fg=#86c1b9"; - double-hyphen-option = "fg=#86c1b9"; - double-quoted-argument-unclosed = "fg=#ab4642,bold"; - function = "fg=blue"; - globbing = "fg=#ba8baf"; - path = "fg=#f7ca88"; - path_prefix = "fg=#ba8baf"; redirection = "fg=#f7ca88,bold"; - reserved-word = "fg=#ba8baf,bold"; - single-hyphen-option = "fg=#86c1b9"; - single-quoted-argument = "fg=#f7ca88"; - single-quoted-argument-unclosed = "fg=#ab4642,bold"; + back-double-quoted-argument = "fg=#7cafc2"; + dollar-double-quoted-argument = "fg=#86c1b9"; }; patterns = { + "\\|" = "fg=#f7ca88,bold"; + " \\|\\| " = "fg=ba8baf,bold"; + " \\&\\& " = "fg=ba8baf,bold"; "\\n" = "fg=#7cafc2"; }; }; diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index 52137ed..e45a78c 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -97,7 +97,7 @@ in ]; }) noto-fonts-emoji - noto-fonts-cjk-sans + noto-fonts-cjk slurp wl-clipboard xdg-utils