diff --git a/flake.lock b/flake.lock index ebe16d1..7157b37 100644 --- a/flake.lock +++ b/flake.lock @@ -455,30 +455,6 @@ "type": "github" } }, - "jj": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1741300145, - "narHash": "sha256-OhHuNazHHgfDHOeqfITvBwRrtU246JJZYdx7NkIKoTc=", - "owner": "jj-vcs", - "repo": "jj", - "rev": "9aeb13488c10f9e4f599ee76391c2b5956ac6ae8", - "type": "github" - }, - "original": { - "owner": "jj-vcs", - "repo": "jj", - "type": "github" - } - }, "lix": { "flake": false, "locked": { @@ -773,7 +749,6 @@ "ghostty": "ghostty", "helix": "helix", "home-manager": "home-manager", - "jj": "jj", "lix-module": "lix-module", "niri-flake": "niri-flake", "nixos-cosmic": "nixos-cosmic", @@ -810,27 +785,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "jj", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737685583, - "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 331c4f3..1e07a85 100644 --- a/flake.nix +++ b/flake.nix @@ -156,16 +156,6 @@ utils.follows = "flake-utils"; }; }; - - jj = { - type = "github"; - owner = "jj-vcs"; - repo = "jj"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; }; outputs = { diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 3b9fae7..5fc0522 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -21,12 +21,6 @@ fuzzel.enable = true; helix.enable = true; gpg.enable = true; - jujutsu = { - enable = true; - email = "ulic.youthlic@gmail.com"; - name = "ulic-youthlic"; - signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; - }; git = { email = "ulic.youthlic@gmail.com"; name = "ulic-youthlic"; diff --git a/home/modules/programs/default.nix b/home/modules/programs/default.nix index 509d445..3b19bf9 100644 --- a/home/modules/programs/default.nix +++ b/home/modules/programs/default.nix @@ -24,6 +24,5 @@ ./swaync.nix ./helix ./waybar.nix - ./jujutsu.nix ]; } diff --git a/home/modules/programs/foot/foot.ini b/home/modules/programs/foot/foot.ini index 48d4dbb..f09e4e6 100644 --- a/home/modules/programs/foot/foot.ini +++ b/home/modules/programs/foot/foot.ini @@ -8,7 +8,7 @@ term=foot # title=foot # locked-title=no -# font=FiraCode Nerd Font:size=15:lang=en-US +font=FiraCode Nerd Font:size=15:lang=en-US # font-bold= # font-italic= # font-bold-italic= diff --git a/home/modules/programs/ghostty.nix b/home/modules/programs/ghostty.nix index ed3dab9..1dc6d74 100644 --- a/home/modules/programs/ghostty.nix +++ b/home/modules/programs/ghostty.nix @@ -21,35 +21,22 @@ package = pkgs.ghostty; settings = { # font-family = "FiraCode Nerd Font"; - # font-feature = [ - # "calt=1" - # "clig=1" - # "liga=1" - # "cv01" - # "cv02" - # "cv06" - # "zero" - # "onum" - # "cv17" - # "ss05" - # "ss03" - # "cv16" - # "cv31" - # "cv29" - # "cv30" - # ]; - - # font-family = "Maple Mono SC NF"; font-feature = [ - "calt" - "zero" + "calt=1" + "clig=1" + "liga=1" "cv01" - "cv96" - "cv97" - "cv98" - "cv99" + "cv02" + "cv06" + "zero" + "onum" + "cv17" "ss05" - "ss08" + "ss03" + "cv16" + "cv31" + "cv29" + "cv30" ]; font-size = lib.mkForce 17; # theme = "ayu"; diff --git a/home/modules/programs/jujutsu.nix b/home/modules/programs/jujutsu.nix deleted file mode 100644 index 8bbd7b5..0000000 --- a/home/modules/programs/jujutsu.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -let - cfg = config.youthlic.programs.jujutsu; -in -{ - options = { - youthlic.programs.jujutsu = { - enable = lib.mkEnableOption "jujutsu"; - email = lib.mkOption { - type = lib.types.str; - description = '' - jujutsu email - ''; - }; - signKey = lib.mkOption { - type = lib.types.addCheck (lib.types.nullOr lib.types.str) ( - x: (x == null || config.youthlic.programs.gpg.enable) - ); - default = null; - description = '' - key fingerprint for sign commit - ''; - }; - name = lib.mkOption { - type = lib.types.str; - example = ''youthlic''; - description = '' - jujutsu name - ''; - }; - }; - }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { - home.packages = with pkgs; [ - delta - watchman - ]; - programs.jujutsu = { - enable = true; - settings = { - "$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json"; - snapshot = { - auto-track = "true"; - max-new-file-size = 0; - }; - core = { - fsmonitor = "watchman"; - watchman.register-snapshot-trigger = true; - }; - user = { - name = cfg.name; - email = cfg.email; - }; - ui = { - color = "auto"; - movement.edit = true; - graph.style = "square"; - show-cryptographic-signatures = true; - pager = "delta"; - diff = { - tool = "delta"; - format = "git"; - }; - }; - templates = { - log = '' - builtin_log_compact_full_description - ''; - }; - template-aliases = { - "format_short_signature(signature)" = "signature"; - }; - revset-aliases = { - "immutable_heads()" = '' - builtin_immutable_heads() | (trunk().. & ~mine()) - ''; - }; - git = { - abandon-unreachable-commits = false; - }; - }; - }; - }) - (lib.mkIf (cfg.enable && (cfg.signKey != null)) { - programs.jujutsu.settings = { - git = { - sign-on-push = true; - }; - signing = { - behavior = "drop"; - backend = "gpg"; - key = cfg.signKey; - }; - }; - }) - ]; -} diff --git a/home/modules/programs/waybar.nix b/home/modules/programs/waybar.nix index fd0f8d7..aa636c4 100644 --- a/home/modules/programs/waybar.nix +++ b/home/modules/programs/waybar.nix @@ -141,7 +141,7 @@ in ]; style = '' * { - font-family: LXGW Wenkai, Maple Mono SC NF; + font-family: LXGW Wenkai, FiraCode Nerd Font; font-weight: bold; font-size: 14px; } diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index c43cc23..9bff339 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -15,8 +15,8 @@ name = "Noto Serif CJK SC"; }; monospace = { - package = pkgs.maple-mono-SC-NF; - name = "Maple Mono SC NF"; + package = pkgs.nerd-fonts.fira-code; + name = "FiraCode Nerd Font"; }; emoji = { package = pkgs.noto-fonts-emoji; diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 0dc59fd..70b023c 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -38,7 +38,6 @@ in enableDefaultPackages = false; packages = with pkgs; [ nerd-fonts.fira-code - maple-mono-SC-NF noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif @@ -56,7 +55,7 @@ in "Noto Serif" ]; monospace = [ - "Maple Mono SC NF" + "FiraCode Nerd Font" ]; emoji = [ "Noto Color Emoji" ]; }; diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 222b9b6..fb5af78 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -8,7 +8,6 @@ let ./ghostty.nix ./juicity.nix ./dae.nix - ./jujutsu.nix ]; overlay-list = map (file: import file args) overlay-files; in