Compare commits

...

8 commits

14 changed files with 80 additions and 32 deletions

View file

@ -7,6 +7,7 @@
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"cornelis": { "branch": "master", "commit": "deda7eb399efe94cc49c645da7b6f94780fe0c19" },
"fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "130beacf8a51f00aede9c31064c749136679a321" },
@ -21,6 +22,7 @@
"nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
"nvim-colorizer.lua": { "branch": "master", "commit": "81e676d3203c9eb6e4c0ccf1eba1679296ef923f" },
"nvim-dap": { "branch": "master", "commit": "818cd8787a77a97703eb1d9090543a374f79a9ac" },
"nvim-hs.vim": { "branch": "develop", "commit": "d4a6b7278ae6a1fdc64e300c3ebc1e24719af342" },
"nvim-jdtls": { "branch": "master", "commit": "f73731b543f5971e0da9665eb1d7ceffe1fde71f" },
"nvim-lspconfig": { "branch": "master", "commit": "41ceb6bba3a40128b7841f5b7f5a9dae7201e823" },
"nvim-metals": { "branch": "main", "commit": "90dadd67bb1069ce1ba2a4dabf4e45da2807ba80" },
@ -39,5 +41,6 @@
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" },
"vimtex": { "branch": "master", "commit": "2e1bbabeb2c34bb17d7bc8cfdf8f95b16dd0db0c" }
}

View file

@ -120,6 +120,14 @@ local plugins = {
lazy = false,
version = "^2",
},
{
"agda/cornelis",
name = "cornelis",
ft = "agda",
init = function() vim.g.cornelis_use_global_binary = 1 end,
dependencies = { "neovimhaskell/nvim-hs.vim", "kana/vim-textobj-user" },
version = "*",
},
{
"nvim-telescope/telescope.nvim",
branch = "0.1.x",

View file

@ -56,6 +56,7 @@ in
../overlays/nil.nix
../overlays/ghostty-dev.nix
../overlays/npins.nix
../overlays/cornelis.nix
../overlays/iosevka
../packages/overlay.nix

View file

@ -27,6 +27,7 @@
pkgs.taplo # toml
pkgs.vscode-langservers-extracted # JSON etc
pkgs.yaml-language-server # yaml
pkgs.cornelis # agda
# bash
pkgs.shfmt

View file

@ -14,7 +14,7 @@
"Noto Sans CJK TC"
];
serif = [ "Noto Serif CJK TC" ];
monospace = [ "IosevkaUbuntuMono" ];
monospace = [ "Iosevka" ];
emoji = [ "Noto Color Emoji" ];
};
@ -66,7 +66,7 @@
pkgs.noto-fonts-color-emoji
pkgs.noto-fonts-emoji-blob-bin
pkgs.ubuntu-classic
pkgs.IosevkaUbuntuMono
pkgs.Iosevka
];
home.file = {

View file

@ -54,7 +54,7 @@ config =
-- For framework 13
, dpi = 150
, font = "IosevkaUbuntuMono 8"
, font = "Iosevka 8"
, fgColor = "#FFFFFF"
, bgColor = "#000000"
, position = BottomH 24

View file

@ -351,7 +351,7 @@ keybinds =
-- Launcher
++ (let launchFirefox = "zen"
launchDmenu = "dmenu_run -i -fn \"IosevkaUbuntuMono-18\" -nb \"#36363a\" -nf \"#e2e2e4\" -sb \"#f7f7f8\" -sf \"#36363a\" -l 10"
launchDmenu = "dmenu_run -i -fn \"Iosevka-18\" -nb \"#36363a\" -nf \"#e2e2e4\" -sb \"#f7f7f8\" -sf \"#36363a\" -l 10"
lock = "xscreensaver-command -lock"
in [ ((controlMask .|. altMask, xK_m), namedScratchpadAction myScratchpads "cmus" )
, ((controlMask .|. altMask, xK_t), namedScratchpadAction myScratchpads "btop" )

View file

@ -10,7 +10,7 @@ in
{
config = lib.mkIf cfg.enable {
home.packages = [
pkgs.nerd-fonts.IosevkaTermUbuntuMono
pkgs.nerd-fonts.IosevkaTerm
];
programs.ghostty.settings = {
@ -21,7 +21,7 @@ in
resize-overlay = "never";
# Fonts
font-family = "IosevkaTermUbuntuMono NFM";
font-family = "IosevkaTerm NFM";
adjust-cursor-thickness = 2;
keybind = [
"ctrl+shift+==increase_font_size:1"

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.IosevkaUbuntuMono ];
home.packages = [ pkgs.Iosevka ];
services.wired = {
config = "${./wired.ron}";
};

View file

@ -122,7 +122,7 @@
offset: Vec2(x: 0.0, y: 0.0),
params: ScrollingTextBlock((
text: "%s",
font: "IosevkaUbuntuMono 24",
font: "Iosevka 24",
color: Color(hex: "#fafafa"),
padding: Padding(left: 7.0, right: 7.0, top: 1.0, bottom: 0.0),
width: (min: 400, max: 400),
@ -140,7 +140,7 @@
offset: Vec2(x: 0.0, y: -3.0),
params: ScrollingTextBlock((
text: "%b",
font: "IosevkaUbuntuMono 18",
font: "Iosevka 18",
color: Color(hex: "#fafafa"),
padding: Padding(left: 7.0, right: 7.0, top: 3.0, bottom: 7.0),
width: (min: 400, max: 400),

View file

@ -0,0 +1,5 @@
# The Agda support for Vim
let
sources = import ../../npins;
in
sources.cornelis.asFlake.overlays.cornelis

View file

@ -1,7 +1,20 @@
let
sources = import ../../npins;
in
final: prev: {
final: prev:
let
inherit (final) lib;
in
{
# Dev version of ghostty, "tip"
ghostty = sources.ghostty-dev.asFlake.packages.${final.stdenv.hostPlatform.system}.default;
ghostty =
let
shortRev = lib.substring 0 8 sources.ghostty-dev.revision;
in
# NOTE:
# ghostty-dev internally builds a derivation used as a cache.
# Overriding the pname would cause cash mismatch.
sources.ghostty-dev.asFlake.packages.${final.stdenv.hostPlatform.system}.default.override {
revision = shortRev;
};
}

View file

@ -26,10 +26,10 @@
};
weights = {
Regular.shape = 400;
Regular.shape = 420;
Regular.menu = 400;
Regular.css = 400;
Medium.shape = 500;
Medium.shape = 550;
Medium.menu = 500;
Medium.css = 500;
Bold.shape = 700;
@ -105,7 +105,7 @@
"ltgt-diamond" # Enable ligation for <> as diamond
# "ltgt-diamond-tag" # Enable ligation for <> as diamond-shaped empty HTML/XML tag
# "ltgt-slash-tag" # Enable ligation for </, /> and </>
# "brst" # Center asterisk in (* and *)
"brst" # Center asterisk in (* and *)
"slash-asterisk" # Shift asterisk in /* and */
"kern-dotty" # Move connecting dotty punctuations closer, like for ::, :: # and ...
# "kern-bars" # Move consecutive bars closer, like for ||, ||| and //
@ -142,5 +142,6 @@
# "colon-greater-as-colon-arrow:" Transform :> into : and a narrow arrow
# "brace-bar" # Enable ligation for {| and |}
"brack-bar" # Enable ligation for [| and |]
"markdown-checkboxes" # Enable ligation for Markdown checkboxes like - [ ] and - [x]
];
}

View file

@ -16,6 +16,22 @@
"url": "https://api.github.com/repos/ryantm/agenix/tarball/0.15.0",
"hash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU="
},
"cornelis": {
"type": "GitRelease",
"repository": {
"type": "GitHub",
"owner": "agda",
"repo": "cornelis"
},
"pre_releases": false,
"version_upper_bound": null,
"release_prefix": null,
"submodules": false,
"version": "v2.8.0",
"revision": "67137c76fe0d4a8bb899eea46afaa370993d3556",
"url": "https://api.github.com/repos/agda/cornelis/tarball/refs/tags/v2.8.0",
"hash": "sha256-dGS6De3EtTirgEMDMSjA+iBNc670W7pG4eA02Nq7Azo="
},
"disko": {
"type": "GitRelease",
"repository": {
@ -70,9 +86,9 @@
},
"branch": "main",
"submodules": false,
"revision": "6730afe3120bf41d3927ed715979259bf42764e2",
"url": "https://github.com/ghostty-org/ghostty/archive/6730afe3120bf41d3927ed715979259bf42764e2.tar.gz",
"hash": "sha256-V66mbZ4wI1+TDhnHNPdxfZ0QFKnZXEKNFuMgZfTqdx0="
"revision": "34eaad6fc86e086f469e81769a793be20d1e169b",
"url": "https://github.com/ghostty-org/ghostty/archive/34eaad6fc86e086f469e81769a793be20d1e169b.tar.gz",
"hash": "sha256-628LfxEPA0tiCjh6syMupdrGvVb6twhoJTtUFKDbqBQ="
},
"hategroup-dnsbl": {
"type": "Git",
@ -97,9 +113,9 @@
},
"branch": "release-25.11",
"submodules": false,
"revision": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c",
"url": "https://github.com/nix-community/home-manager/archive/2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c.tar.gz",
"hash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo="
"revision": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
"url": "https://github.com/nix-community/home-manager/archive/75ed713570ca17427119e7e204ab3590cc3bf2a5.tar.gz",
"hash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg="
},
"infuse": {
"type": "GitRelease",
@ -154,9 +170,9 @@
},
"branch": "master",
"submodules": false,
"revision": "d447553bcbc6a178618d37e61648b19e744370df",
"url": "https://github.com/NixOS/nixos-hardware/archive/d447553bcbc6a178618d37e61648b19e744370df.tar.gz",
"hash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM="
"revision": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
"url": "https://github.com/NixOS/nixos-hardware/archive/9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca.tar.gz",
"hash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY="
},
"nixpkgs": {
"type": "Git",
@ -167,9 +183,9 @@
},
"branch": "nixos-25.11-small",
"submodules": false,
"revision": "43b2e61c9d09cf6c1c9c192fe6da08accc9bfb1d",
"url": "https://github.com/nixos/nixpkgs/archive/43b2e61c9d09cf6c1c9c192fe6da08accc9bfb1d.tar.gz",
"hash": "sha256-D+GLCmhxA9O69GViYl48lSvp/Dr/Ohy5/onXVPwY6rI="
"revision": "6c1fc6e4c93c084d0ae654ee85dc16cfe53b12b0",
"url": "https://github.com/nixos/nixpkgs/archive/6c1fc6e4c93c084d0ae654ee85dc16cfe53b12b0.tar.gz",
"hash": "sha256-3tAkeUYt7WBVgNfaXDW6HnrrGSuZooZ8nIAnbmKsY2A="
},
"npins": {
"type": "GitRelease",
@ -196,9 +212,9 @@
},
"branch": "main",
"submodules": false,
"revision": "d787c45d0224a5d8d245ad628352a192388d5357",
"url": "https://github.com/nix-community/nur/archive/d787c45d0224a5d8d245ad628352a192388d5357.tar.gz",
"hash": "sha256-GHL4HZfyIQRbDrzRJO3Xulb2SYlm+erTt/eKHmR00vs="
"revision": "bea55329cc806cfe3b826f7baab0503fd6b6892f",
"url": "https://github.com/nix-community/nur/archive/bea55329cc806cfe3b826f7baab0503fd6b6892f.tar.gz",
"hash": "sha256-B8+OiD8kYXtFc4vJc9+d7q8+MOic8VYR0G8wbSHjuSc="
},
"pin-emacs28": {
"type": "Git",
@ -361,9 +377,9 @@
},
"branch": "main",
"submodules": false,
"revision": "37149a5b77e8fd2b5332e8cec9edf39ca5b8e8bc",
"url": "https://github.com/0xc000022070/zen-browser-flake/archive/37149a5b77e8fd2b5332e8cec9edf39ca5b8e8bc.tar.gz",
"hash": "sha256-w10iy/aqd5LtD78NDWWG+eKGzkb+cGhAAo7PVciLbWE="
"revision": "0fac05e4b604c3304e7710a95572e78350fe9968",
"url": "https://github.com/0xc000022070/zen-browser-flake/archive/0fac05e4b604c3304e7710a95572e78350fe9968.tar.gz",
"hash": "sha256-jejW3u1bkqz0ObXZeiZqLQNwC7+MXb8/KMwf3VPQpRI="
}
},
"version": 7