cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

wezterm fixes

Browse Source
This commit is contained in:
cnst
2024-07-26 18:53:50 +02:00
parent 29da8ca94a
commit b614f69039
9 changed files with 241 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

354
flake.lock generated
View File

@@ -1,24 +1,5 @@
{
"nodes": {
"ags": {
"inputs": {
"nixpkgs": "nixpkgs",
"systems": "systems"
},
"locked": {
"lastModified": 1721306136,
"narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
"owner": "Aylur",
"repo": "ags",
"rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
"type": "github"
},
"original": {
"owner": "Aylur",
"repo": "ags",
"type": "github"
}
},
"cachix": {
"locked": {
"lastModified": 1635350005,
@@ -58,18 +39,22 @@
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"lastModified": 1721902368,
"narHash": "sha256-noQ5SghRPe0jzQEbFQb3fYbV6LZEzr7lIRQoxlU7fyI=",
"owner": "numtide",
"repo": "devshell",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"rev": "cf8c7405479cfde7ea4dc815e195391d2328df10",
"type": "github"
},
"original": {
@@ -89,11 +74,11 @@
]
},
"locked": {
"lastModified": 1721869586,
"narHash": "sha256-q1UcW2tORsyev+oFFNFVUnV1Ah5BAkmEKgbiQkFGeHM=",
"lastModified": 1722003330,
"narHash": "sha256-PaHG6to4NcCFvzOdmHGUs20QXe7roaHf3k3heaPCt/I=",
"owner": "nix-community",
"repo": "flake-firefox-nightly",
"rev": "f815559dedafdb4a813dcac757085fc8d6491267",
"rev": "0a2d58c778d58d43e308f0a68fd07591068fdd32",
"type": "github"
},
"original": {
@@ -191,7 +176,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
@@ -229,7 +214,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
@@ -247,25 +232,7 @@
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_6"
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
@@ -281,6 +248,41 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1687587065,
"narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=",
"owner": "wez",
"repo": "freetype2",
"rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"type": "github"
},
"original": {
"owner": "wez",
"repo": "freetype2",
"rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
@@ -357,11 +359,11 @@
},
"hardware": {
"locked": {
"lastModified": 1721839713,
"narHash": "sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo=",
"lastModified": 1721911538,
"narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "a7432ebaefc9a400dcda399d48b949230378d784",
"rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f",
"type": "github"
},
"original": {
@@ -370,12 +372,50 @@
"type": "github"
}
},
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1711722720,
"narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"ref": "8.4.0",
"repo": "harfbuzz",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1721996913,
"narHash": "sha256-eqbhEBObarS6WsI0J1PVACQ8fXeq9OmSS0+iXBegoOI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "bc2b96acda50229bc99925dde5c8e561e90b0b00",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721852138,
"narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
@@ -390,34 +430,13 @@
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721534365,
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay"
},
@@ -455,6 +474,23 @@
"type": "github"
}
},
"libpng": {
"flake": false,
"locked": {
"lastModified": 1549245649,
"narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
},
"original": {
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
}
},
"mozilla": {
"flake": false,
"locked": {
@@ -479,11 +515,11 @@
]
},
"locked": {
"lastModified": 1721655289,
"narHash": "sha256-eJQQwXOKWjom9gtb7HvHd3+Wj5Sp+WrYR44r0EnaO5w=",
"lastModified": 1721719500,
"narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "2ae24bcafdb88fdf70b061cc8b18d070dbd9013a",
"rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec",
"type": "github"
},
"original": {
@@ -494,16 +530,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718714799,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"lastModified": 1717794163,
"narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
@@ -541,11 +577,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1721686456,
"narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
"lastModified": 1721949857,
"narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b",
"rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
"type": "github"
},
"original": {
@@ -557,27 +593,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1717794163,
"narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1721562059,
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
"lastModified": 1721924956,
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
"rev": "5ad6a14c6bf098e98800b091668718c336effc95",
"type": "github"
},
"original": {
@@ -587,13 +607,13 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1716097317,
"narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=",
"lastModified": 1721466660,
"narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41",
"rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
"type": "github"
},
"original": {
@@ -614,14 +634,15 @@
"nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721854976,
"narHash": "sha256-iWTGRfYoq0ppT3P4D2bRDVkLuTZAzuud/gsxVzPTHDg=",
"lastModified": 1721946885,
"narHash": "sha256-b90iLj3d9tLz5/M8dDnhD5j9vAWjpoNn5WhCLnIwK/g=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "216d64c158da5523d5b3db0895e1345175c21502",
"rev": "47b6c4804f69556dc22aa2a2e64721f216b69090",
"type": "github"
},
"original": {
@@ -630,6 +651,28 @@
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721548975,
"narHash": "sha256-agCbztdk1f7nCUz03R6xdbivuBRuqubP2RHW+MNuRTg=",
"owner": "NuschtOS",
"repo": "search",
"rev": "551b031e2bc0bcc9584347a8da6312e57169661d",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
@@ -659,17 +702,16 @@
},
"root": {
"inputs": {
"ags": "ags",
"firefox-nightly": "firefox-nightly",
"flake-utils": "flake-utils_2",
"hardware": "hardware",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim",
"systems": "systems_5",
"yazi": "yazi"
"systems": "systems_4",
"wezterm": "wezterm"
}
},
"rust-overlay": {
@@ -699,21 +741,17 @@
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"yazi",
"flake-utils"
],
"nixpkgs": [
"yazi",
"wezterm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716085073,
"narHash": "sha256-3+9gI93XxszWA2+9S2xZfws1QArPX/MC6nahOGpcMB4=",
"lastModified": 1721441897,
"narHash": "sha256-gYGX9/22tPNeF7dR6bWN5rsrpU4d06GnQNNgZ6ZiXz0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "cfc8776011bd83508324115d353222475e1601c0",
"rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd",
"type": "github"
},
"original": {
@@ -724,16 +762,16 @@
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"repo": "default",
"type": "github"
}
},
@@ -768,21 +806,6 @@
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -797,7 +820,7 @@
"type": "github"
}
},
"systems_6": {
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -820,11 +843,11 @@
]
},
"locked": {
"lastModified": 1721458737,
"narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=",
"lastModified": 1721769617,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
"type": "github"
},
"original": {
@@ -833,23 +856,46 @@
"type": "github"
}
},
"yazi": {
"wezterm": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay_2"
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay_2",
"zlib": "zlib"
},
"locked": {
"lastModified": 1721865264,
"narHash": "sha256-/VFP+pvWWQRj6FBHfZUkaLuC66e2drD87kzBZrbuaZc=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "152b9ea75e12409bbe679be8a712624d1e60eb9f",
"dir": "nix",
"lastModified": 1721660996,
"narHash": "sha256-einWGKcn7zLSCYChDXN1aKrw1nz3P89dF/gK+OPD0Qw=",
"owner": "wez",
"repo": "wezterm",
"rev": "7e8fdc118d2d7ceb51c720a966090f6cb65089b7",
"type": "github"
},
"original": {
"owner": "sxyazi",
"repo": "yazi",
"dir": "nix",
"owner": "wez",
"repo": "wezterm",
"type": "github"
}
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1484501380,
"narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
},
"original": {
"owner": "madler",
"ref": "v1.2.11",
"repo": "zlib",
"type": "github"
}
}

6
flake.nix
View File

@@ -39,8 +39,10 @@
# url = "github:nix-community/fenix";
# inputs.nixpkgs.follows = "nixpkgs";
#};
ags.url = "github:Aylur/ags";
yazi.url = "github:sxyazi/yazi";
# ags.url = "github:Aylur/ags";
wezterm = {
url = "github:wez/wezterm?dir=nix";
};
};
outputs = {
self,

4
home/core/tui/foot/default.nix
View File

@@ -44,9 +44,9 @@
# utmp-helper=/usr/libexec/ulog-helper # When utmp backend is ‘ulog’ (FreeBSD)
main = {
font = "Input Mono Compressed:size=10";
font = "Input Mono Compressed:size=12";
box-drawings-uses-font-glyphs = "yes";
dpi-aware = "yes";
dpi-aware = "no";
pad = "3x1";
};

2
home/core/tui/neovim/keymappings.nix
View File

@@ -87,7 +87,7 @@
"<C-v>" = "<esc>p";
};
in
config.nixvim.helpers.keymaps.mkKeymaps
config.lib.nixvim.keymaps.mkKeymaps
{options.silent = true;}
(normal ++ visual ++ insert);
};

23
home/core/tui/wezterm/default.nix
View File

@@ -1,9 +1,24 @@
{
pkgs,
inputs,
...
}: {
programs.wezterm = {
enable = true;
enableZshIntegration = true;
# extraConfig = ''
# config.color_scheme = "Gruvbox Material (Gogh)"
# '';
package = inputs.wezterm.packages.${pkgs.system}.default;
extraConfig = ''
return {
font = wezterm.font("Input Mono Compressed"),
font_size = 12,
check_for_updates = false,
color_scheme = 'Gruvbox Material (Gogh)',
default_cursor_style = 'SteadyBar',
enable_scroll_bar = true,
hide_tab_bar_if_only_one_tab = true,
scrollback_lines = 10000,
window_background_opacity = 0.9,
}
'';
};
}

3
home/core/tui/yazi/default.nix
View File

@@ -1,7 +1,6 @@
{
config,
pkgs,
inputs,
...
}: {
imports = [
@@ -18,7 +17,7 @@
programs.yazi = {
enable = true;
package = inputs.yazi.packages.${pkgs.system}.default;
package = pkgs.yazi;
enableBashIntegration = config.programs.bash.enable;
enableZshIntegration = config.programs.zsh.enable;

1
home/users/cnst/imports.nix
View File

@@ -14,6 +14,7 @@
../../core/tui/shell/cnst.nix
../../core/tui/foot
../../core/tui/alacritty
../../core/tui/wezterm
../../core/tui/neovim
../../core/tui/yazi
# core.services

2
nixos/hosts/adampad/default.nix
View File

@@ -9,7 +9,7 @@
}: let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
users.users.cnst = {
users.users.adam = {
isNormalUser = true;
shell = pkgs.zsh;
# openssh.authorizedKeys.keys = [];

23
nixos/hosts/toothpc/imports.nix
View File

@@ -12,17 +12,18 @@
../../locale
# services
#../../services/blueman.nix
../../services/dbus.nix
../../services/gnome-keyring.nix
../../services/greetd.nix
../../services/gvfs.nix
../../services/mullvad.nix
../../services/openssh.nix
../../services/pipewire.nix
../../services/udisks.nix
../../services/xserver-toothpc.nix
../../services/locate.nix
#../../services/blueman
../../services/dbus
../../services/gnome-keyring
../../services/greetd
../../services/gvfs
../../services/mullvad
../../services/openssh
../../services/audio
../../services/udisks
../../services/xserver/toothpc.nix
../../services/locate
../../services/samba
# extra
../../extra/gaming.nix