Compare commits
6 commits
ceecc82aae
...
6a3473813d
| Author | SHA1 | Date | |
|---|---|---|---|
6a3473813d
|
|||
|
da2860fa15
|
|||
|
915256aa94
|
|||
|
11e14b01f9
|
|||
|
e46a086ab3
|
|||
|
dfe7d58c30
|
25 changed files with 229 additions and 254 deletions
102
flake.lock
generated
102
flake.lock
generated
|
|
@ -141,11 +141,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749147380,
|
||||
"narHash": "sha256-UvCI5f1qD9l1fCQkoG/kJI0yNjDQIiJaN7gkve8fmII=",
|
||||
"lastModified": 1749436314,
|
||||
"narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d74db625a5cf3f46cf8fa545d6ef10bd3463ea07",
|
||||
"rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -222,11 +222,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748821116,
|
||||
"narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
|
||||
"lastModified": 1749398372,
|
||||
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
|
||||
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -357,11 +357,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748959729,
|
||||
"narHash": "sha256-wYUaAhGSetByNQrwUhppxNwubtP8BK3zfhOIllm5mEE=",
|
||||
"lastModified": 1749432877,
|
||||
"narHash": "sha256-z3fWdIANU38HVqgqAhBM0lHq7OTa3Ncxs4Hh/dejEk8=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "f6878f62f74430cff188e7978d06c5ed143179e9",
|
||||
"rev": "2b26d27416b4b0fb2286bf05aae173ec23dd6592",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -378,11 +378,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749160002,
|
||||
"narHash": "sha256-IM3xKjsKxhu7Y1WdgTltrLKiOJS8nW7D4SUDEMNr7CI=",
|
||||
"lastModified": 1749400020,
|
||||
"narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "68cc9eeb3875ae9682c04629f20738e1e79d72aa",
|
||||
"rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -443,11 +443,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749144707,
|
||||
"narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=",
|
||||
"lastModified": 1749396815,
|
||||
"narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "32d49ef427be377c82d32ce74ff3082c2c992199",
|
||||
"rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -476,11 +476,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1749112952,
|
||||
"narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=",
|
||||
"lastModified": 1749327170,
|
||||
"narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a",
|
||||
"rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -497,11 +497,11 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749121763,
|
||||
"narHash": "sha256-TVFiyMBs+3KEzZVwf/n1zedUWzPrMPzud/2Jiho8dcE=",
|
||||
"lastModified": 1749424580,
|
||||
"narHash": "sha256-mt45T2JVYPLwJs3Gi0Hr6Eo5TE+sPyWUDq/H6Qg66ek=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "c89df80b72b4e1802fd91a35f4857868c953c1c0",
|
||||
"rev": "fae5ebd4d5da1db8323a673728ebecc06b9dc653",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -512,11 +512,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1749056381,
|
||||
"narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=",
|
||||
"lastModified": 1749195551,
|
||||
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "029bd66faa180e11262dd1bc2732254c33415f52",
|
||||
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -528,11 +528,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1748929857,
|
||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
||||
"lastModified": 1749143949,
|
||||
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
||||
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -559,11 +559,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1749086602,
|
||||
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
|
||||
"lastModified": 1749237914,
|
||||
"narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4792576cb003c994bd7cc1edada3129def20b27d",
|
||||
"rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -575,11 +575,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1748995628,
|
||||
"narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
|
||||
"lastModified": 1749173751,
|
||||
"narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
|
||||
"rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -591,11 +591,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1748929857,
|
||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
||||
"lastModified": 1749285348,
|
||||
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
||||
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -650,11 +650,11 @@
|
|||
"nur-rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1749143092,
|
||||
"narHash": "sha256-IrVT37SUU8/B3X53rwEzDrx3djGLIfa8tmsyqVJxpR4=",
|
||||
"lastModified": 1749269004,
|
||||
"narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "d62d10f250ca6a37cbbe05a35a0e1e7ae3b4b5c2",
|
||||
"rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -714,11 +714,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749091064,
|
||||
"narHash": "sha256-TGtYjzRX0sueFhwYsnNNFF5TTKnpnloznpIghLzxeXo=",
|
||||
"lastModified": 1749350575,
|
||||
"narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "12419593ce78f2e8e1e89a373c6515885e218acb",
|
||||
"rev": "24d5806474b0779d373f381f00d75ad51fd45099",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -775,11 +775,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749165619,
|
||||
"narHash": "sha256-E1KgTswgmzBGv+8WijQRghlyIP6k+LPzj9j8bq9BlLU=",
|
||||
"lastModified": 1749398498,
|
||||
"narHash": "sha256-Usx6sGnT/D8ZnWiZg+J1OY3dp4ZssMQiN1XeXcsL/cs=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "8456dfa7f60e6b4499b0498fc88e9b8b57d4d7d7",
|
||||
"rev": "5869510e48e64d916dc6905dc664a02b0f85f1bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -926,11 +926,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748243702,
|
||||
"narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
|
||||
"lastModified": 1749194973,
|
||||
"narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
|
||||
"rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -959,11 +959,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748488455,
|
||||
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
|
||||
"lastModified": 1749315541,
|
||||
"narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
|
||||
"rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
in {
|
||||
firefox.enable = true;
|
||||
fuzzel.enable = true;
|
||||
helix.enable = true;
|
||||
gpg.enable = true;
|
||||
git = {
|
||||
inherit name signKey;
|
||||
|
|
@ -48,6 +47,7 @@
|
|||
wallpaper.enable = true;
|
||||
accounts.email.enable = true;
|
||||
programs = {
|
||||
helix.enable = true;
|
||||
openssh.enable = true;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
|
||||
in {
|
||||
david.programs.niri = {
|
||||
DISPLAY = ":1";
|
||||
extraConfig = let
|
||||
output = node "output";
|
||||
in [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
rustypaste-cli.enable = true;
|
||||
firefox.enable = true;
|
||||
fuzzel.enable = true;
|
||||
helix.enable = true;
|
||||
gpg.enable = true;
|
||||
jujutsu = {
|
||||
enable = true;
|
||||
|
|
@ -45,6 +44,7 @@
|
|||
obs.enable = true;
|
||||
chromium.enable = true;
|
||||
espanso.enable = true;
|
||||
ion.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -53,6 +53,7 @@
|
|||
accounts.email.enable = true;
|
||||
programs = {
|
||||
openssh.enable = true;
|
||||
helix.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
|
||||
in {
|
||||
david.programs.niri = {
|
||||
DISPLAY = ":1";
|
||||
extraConfig = let
|
||||
output = node "output";
|
||||
in [
|
||||
|
|
@ -36,33 +35,5 @@ in {
|
|||
(leaf "transform" "normal")
|
||||
])
|
||||
];
|
||||
# settings = {
|
||||
# outputs = {
|
||||
# DP-1 = {
|
||||
# mode = {
|
||||
# width = 2560;
|
||||
# height = 1440;
|
||||
# refresh = 169.900;
|
||||
# };
|
||||
# scale = 1;
|
||||
# position = {
|
||||
# x = 0;
|
||||
# y = 0;
|
||||
# };
|
||||
# };
|
||||
# eDP-1 = {
|
||||
# mode = {
|
||||
# width = 2560;
|
||||
# height = 1440;
|
||||
# refresh = 165.003;
|
||||
# };
|
||||
# scale = 1.5;
|
||||
# position = {
|
||||
# x = 2560;
|
||||
# y = 0;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,5 +3,6 @@
|
|||
./openssh.nix
|
||||
./niri
|
||||
./wluma
|
||||
./helix.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
22
home/david/modules/programs/helix.nix
Normal file
22
home/david/modules/programs/helix.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.david.programs.helix;
|
||||
in {
|
||||
options = {
|
||||
david.programs.helix = {
|
||||
enable = lib.mkEnableOption "helix";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
youthlic.programs.helix = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
editor-runtime
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
lib,
|
||||
inputs,
|
||||
osConfig ? null,
|
||||
DISPLAY,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) getExe getExe';
|
||||
|
|
@ -33,7 +32,6 @@
|
|||
waybar = getExe config.programs.waybar.package;
|
||||
swaync = getExe config.services.swaync.package;
|
||||
fcitx5 = lib.getExe' osConfig.i18n.inputMethod.package "fcitx5";
|
||||
xwayland-satellite = lib.getExe pkgs.xwayland-satellite;
|
||||
sleep = lib.getExe' pkgs.coreutils "sleep";
|
||||
|
||||
polkit-kde-agent = getExe' pkgs.kdePackages.polkit-kde-agent-1 "polkit-kde-agent";
|
||||
|
|
@ -392,7 +390,6 @@ in
|
|||
(spawn-at-startup [swaybg "-i" "${config.home.homeDirectory}/wallpaper/01.png"])
|
||||
(spawn-at-startup [polkit-kde-agent])
|
||||
(spawn-at-startup [wl-paste "--watch" cliphist "store"])
|
||||
(spawn-at-startup [xwayland-satellite "${DISPLAY}"])
|
||||
(spawn-at-startup [sh "-c" "${sleep} 10; ${fcitx5} --replace"])
|
||||
(plain "input" [
|
||||
(plain "touchpad" [
|
||||
|
|
@ -447,9 +444,6 @@ in
|
|||
})
|
||||
])
|
||||
])
|
||||
(plain "environment" [
|
||||
(leaf "DISPLAY" DISPLAY)
|
||||
])
|
||||
(plain "overview" [
|
||||
])
|
||||
] # others
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@ in {
|
|||
extraConfig = lib.mkOption {
|
||||
type = inputs.niri-flake.lib.kdl.types.kdl-document;
|
||||
};
|
||||
DISPLAY = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkMerge [
|
||||
|
|
@ -24,16 +21,9 @@ in {
|
|||
}
|
||||
(
|
||||
lib.mkIf cfg.enable {
|
||||
home.sessionVariables = {
|
||||
inherit (cfg) DISPLAY;
|
||||
};
|
||||
youthlic.programs.niri = {
|
||||
# settings = lib.mkMerge [(import ./settings.nix args) cfg.settings];
|
||||
config =
|
||||
(lib.toList (import ./config.nix (args
|
||||
// {
|
||||
inherit (cfg) DISPLAY;
|
||||
})))
|
||||
(lib.toList (import ./config.nix args))
|
||||
++ (lib.toList cfg.extraConfig);
|
||||
};
|
||||
david.programs.wluma.enable = true;
|
||||
|
|
|
|||
|
|
@ -30,5 +30,6 @@
|
|||
./zoxide.nix
|
||||
./fzf.nix
|
||||
./eza.nix
|
||||
./ion.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,14 +28,9 @@
|
|||
stylix.targets.helix.enable = false;
|
||||
programs.helix = lib.mkIf cfg.enable {
|
||||
enable = true;
|
||||
package = outputs.packages."${pkgs.system}".helix;
|
||||
defaultEditor = true;
|
||||
extraPackages = cfg.extraPackages;
|
||||
settings = let
|
||||
config-file = builtins.readFile ./config.toml;
|
||||
config = builtins.fromTOML config-file;
|
||||
in
|
||||
config;
|
||||
settings = ./config.toml |> builtins.readFile |> builtins.fromTOML;
|
||||
languages = {
|
||||
language-server = {
|
||||
neocmakelsp = {
|
||||
|
|
|
|||
18
home/modules/programs/ion.nix
Normal file
18
home/modules/programs/ion.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.youthlic.programs.ion;
|
||||
in {
|
||||
options = {
|
||||
youthlic.programs.ion = {
|
||||
enable = lib.mkEnableOption "ion";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.ion = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -12,9 +12,6 @@ in {
|
|||
options = {
|
||||
youthlic.programs.niri = {
|
||||
enable = lib.mkEnableOption "niri";
|
||||
# settings = lib.mkOption {
|
||||
# type = lib.types.attrs;
|
||||
# };
|
||||
config = lib.mkOption {
|
||||
type = inputs.niri-flake.lib.kdl.types.kdl-document;
|
||||
};
|
||||
|
|
@ -30,7 +27,6 @@ in {
|
|||
(with pkgs; [
|
||||
swaynotificationcenter
|
||||
swaybg
|
||||
xwayland-satellite
|
||||
kdePackages.polkit-kde-agent-1
|
||||
wl-clipboard
|
||||
cliphist
|
||||
|
|
@ -71,7 +67,6 @@ in {
|
|||
swaylock.enable = true;
|
||||
};
|
||||
programs.niri = {
|
||||
# settings = cfg.settings;
|
||||
config = cfg.config;
|
||||
package = niri;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
cfg = config.youthlic.programs.starship;
|
||||
fish-cfg = config.youthlic.programs.fish;
|
||||
bash-cfg = config.youthlic.programs.bash;
|
||||
ion-cfg = config.youthlic.programs.ion;
|
||||
in {
|
||||
options = {
|
||||
youthlic.programs.starship = {
|
||||
|
|
@ -43,5 +44,8 @@ in {
|
|||
bleopt prompt_rps1_final='$(starship module time)'
|
||||
'';
|
||||
})
|
||||
(lib.mkIf (cfg.enable && ion-cfg.enable) {
|
||||
programs.starship.enableIonIntegration = true;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,41 +48,7 @@ in {
|
|||
"zig"
|
||||
];
|
||||
extraPackages = with pkgs; [
|
||||
idris2Packages.idris2Lsp
|
||||
lua-language-server
|
||||
bash-language-server
|
||||
shfmt
|
||||
hurl
|
||||
cmake-language-server
|
||||
kdlfmt
|
||||
rustfmt
|
||||
clang-tools
|
||||
libxml2
|
||||
typstyle
|
||||
pyright
|
||||
ruff
|
||||
gotools
|
||||
yaml-language-server
|
||||
taplo
|
||||
markdown-oxide
|
||||
marksman
|
||||
nixd
|
||||
deno
|
||||
alejandra
|
||||
vscode-langservers-extracted
|
||||
fish-lsp
|
||||
tailwindcss-language-server
|
||||
gopls
|
||||
golangci-lint-langserver
|
||||
tinymist
|
||||
delve
|
||||
lldb
|
||||
rust-analyzer
|
||||
# nil
|
||||
haskell-language-server
|
||||
neocmakelsp
|
||||
jdt-language-server
|
||||
zls
|
||||
editor-runtime
|
||||
];
|
||||
userSettings = {
|
||||
languages = {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ in {
|
|||
cosmic-files
|
||||
kdePackages.qt6ct
|
||||
libsForQt5.qt5ct
|
||||
xwayland-satellite-unstable
|
||||
];
|
||||
xdg = {
|
||||
terminal-exec = {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ in
|
|||
./rime-ice.nix
|
||||
./TrackersListCollection.nix
|
||||
./OuterWildsTextAdventure.nix
|
||||
./editor-runtime.nix
|
||||
]
|
||||
|> map (file: import file args)
|
||||
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||
|
|
|
|||
5
overlays/additions/editor-runtime.nix
Normal file
5
overlays/additions/editor-runtime.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{outputs, ...}: final: prev: let
|
||||
inherit (prev.stdenv.hostPlatform) system;
|
||||
in {
|
||||
inherit (outputs.packages.${system}) editor-runtime;
|
||||
}
|
||||
|
|
@ -9,6 +9,7 @@ in
|
|||
./radicle-explorer.nix
|
||||
./wshowkeys.nix
|
||||
./QQ.nix
|
||||
./helix.nix
|
||||
]
|
||||
|> map (file: import file args)
|
||||
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||
|
|
|
|||
5
overlays/modifications/helix.nix
Normal file
5
overlays/modifications/helix.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{outputs, ...}: final: prev: let
|
||||
inherit (prev.stdenv.hostPlatform) system;
|
||||
in {
|
||||
helix = outputs.packages."${system}".helix;
|
||||
}
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
},
|
||||
"TrackersListCollection": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-31",
|
||||
"date": "2025-06-09",
|
||||
"extract": null,
|
||||
"name": "TrackersListCollection",
|
||||
"passthru": null,
|
||||
|
|
@ -34,14 +34,14 @@
|
|||
"name": null,
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"rev": "313c18fc1ae756ea99ae6275e4454ccff95d9b5d",
|
||||
"sha256": "sha256-yCcWx/tnz7JjHs6wniuy6owqIMjZrOS13HBz4MgtiAg=",
|
||||
"rev": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c",
|
||||
"sha256": "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=",
|
||||
"sparseCheckout": [
|
||||
"all.txt"
|
||||
],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "313c18fc1ae756ea99ae6275e4454ccff95d9b5d"
|
||||
"version": "ee6c8a19de97a244cf33f618678fe89bd0d3e38c"
|
||||
},
|
||||
"dioxionary": {
|
||||
"cargoLocks": {
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
},
|
||||
"rime-ice": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-29",
|
||||
"date": "2025-06-06",
|
||||
"extract": null,
|
||||
"name": "rime-ice",
|
||||
"passthru": null,
|
||||
|
|
@ -148,16 +148,16 @@
|
|||
"name": null,
|
||||
"owner": "iDvel",
|
||||
"repo": "rime-ice",
|
||||
"rev": "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca",
|
||||
"sha256": "sha256-v+j2Bp7+OEbiWImf0/6YbZTTHlaORvtK2foXTfjZW9s=",
|
||||
"rev": "b86e6147d68c229b45bb1f2a593f8b76155e964d",
|
||||
"sha256": "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca"
|
||||
"version": "b86e6147d68c229b45bb1f2a593f8b76155e964d"
|
||||
},
|
||||
"spotx": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-24",
|
||||
"date": "2025-05-31",
|
||||
"extract": null,
|
||||
"name": "spotx",
|
||||
"passthru": null,
|
||||
|
|
@ -169,12 +169,12 @@
|
|||
"name": null,
|
||||
"owner": "SpotX-Official",
|
||||
"repo": "SpotX-Bash",
|
||||
"rev": "5e9b08f91e55c210bbc64715b4ad698186b3c06b",
|
||||
"sha256": "sha256-34lqV5p44Iqn2v6UJtVTrxwkHY7JXJueItBu/AhXo6A=",
|
||||
"rev": "b1de24ec4c23c45da373dcb64a44e372253a0c16",
|
||||
"sha256": "sha256-bIfqqZLMboA5GKxz9EVv8GZQRVejheHw2nLTBS6AKyE=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "5e9b08f91e55c210bbc64715b4ad698186b3c06b"
|
||||
"version": "b1de24ec4c23c45da373dcb64a44e372253a0c16"
|
||||
},
|
||||
"tree-sitter-idris": {
|
||||
"cargoLocks": null,
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
},
|
||||
"wshowkeys-mao": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-02-03",
|
||||
"date": "2025-06-04",
|
||||
"extract": null,
|
||||
"name": "wshowkeys-mao",
|
||||
"passthru": null,
|
||||
|
|
@ -212,11 +212,11 @@
|
|||
"name": null,
|
||||
"owner": "DreamMaoMao",
|
||||
"repo": "wshowkeys",
|
||||
"rev": "24364e5f40b7ccbed728fe88757f559d84fae234",
|
||||
"sha256": "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=",
|
||||
"rev": "bf18fba01eafd7659e242066abca0fd4938bf417",
|
||||
"sha256": "sha256-KTtrmICFXXYBcPcGfZ32/UjQAEHSXF79PvSLCKbuCPw=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "24364e5f40b7ccbed728fe88757f559d84fae234"
|
||||
"version": "bf18fba01eafd7659e242066abca0fd4938bf417"
|
||||
}
|
||||
}
|
||||
|
|
@ -15,18 +15,18 @@
|
|||
};
|
||||
TrackersListCollection = {
|
||||
pname = "TrackersListCollection";
|
||||
version = "313c18fc1ae756ea99ae6275e4454ccff95d9b5d";
|
||||
version = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "XIU2";
|
||||
repo = "TrackersListCollection";
|
||||
rev = "313c18fc1ae756ea99ae6275e4454ccff95d9b5d";
|
||||
rev = "ee6c8a19de97a244cf33f618678fe89bd0d3e38c";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ "all.txt" ];
|
||||
sha256 = "sha256-yCcWx/tnz7JjHs6wniuy6owqIMjZrOS13HBz4MgtiAg=";
|
||||
sha256 = "sha256-KaVR91W/2XbYIxFrE8aKvpJTE10Mfb25ZlMOR2dRL5M=";
|
||||
};
|
||||
date = "2025-05-31";
|
||||
date = "2025-06-09";
|
||||
};
|
||||
dioxionary = {
|
||||
pname = "dioxionary";
|
||||
|
|
@ -92,27 +92,27 @@
|
|||
};
|
||||
rime-ice = {
|
||||
pname = "rime-ice";
|
||||
version = "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca";
|
||||
version = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iDvel";
|
||||
repo = "rime-ice";
|
||||
rev = "2e0d8d9a3ba292ecca3f6dccb5719a06764917ca";
|
||||
rev = "b86e6147d68c229b45bb1f2a593f8b76155e964d";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-v+j2Bp7+OEbiWImf0/6YbZTTHlaORvtK2foXTfjZW9s=";
|
||||
sha256 = "sha256-ttGHvxv6ZImn6xBifsL4bc+7Q/RvarwPwegx9pT+Hsg=";
|
||||
};
|
||||
date = "2025-05-29";
|
||||
date = "2025-06-06";
|
||||
};
|
||||
spotx = {
|
||||
pname = "spotx";
|
||||
version = "5e9b08f91e55c210bbc64715b4ad698186b3c06b";
|
||||
version = "b1de24ec4c23c45da373dcb64a44e372253a0c16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpotX-Official";
|
||||
repo = "SpotX-Bash";
|
||||
rev = "5e9b08f91e55c210bbc64715b4ad698186b3c06b";
|
||||
rev = "b1de24ec4c23c45da373dcb64a44e372253a0c16";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-34lqV5p44Iqn2v6UJtVTrxwkHY7JXJueItBu/AhXo6A=";
|
||||
sha256 = "sha256-bIfqqZLMboA5GKxz9EVv8GZQRVejheHw2nLTBS6AKyE=";
|
||||
};
|
||||
date = "2025-05-24";
|
||||
date = "2025-05-31";
|
||||
};
|
||||
tree-sitter-idris = {
|
||||
pname = "tree-sitter-idris";
|
||||
|
|
@ -131,14 +131,14 @@
|
|||
};
|
||||
wshowkeys-mao = {
|
||||
pname = "wshowkeys-mao";
|
||||
version = "24364e5f40b7ccbed728fe88757f559d84fae234";
|
||||
version = "bf18fba01eafd7659e242066abca0fd4938bf417";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DreamMaoMao";
|
||||
repo = "wshowkeys";
|
||||
rev = "24364e5f40b7ccbed728fe88757f559d84fae234";
|
||||
rev = "bf18fba01eafd7659e242066abca0fd4938bf417";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-I1nnwaE1Wr1b5EzQ4CP5sDCY8ZBaxP2FYZdIsKcVXL4=";
|
||||
sha256 = "sha256-KTtrmICFXXYBcPcGfZ32/UjQAEHSXF79PvSLCKbuCPw=";
|
||||
};
|
||||
date = "2025-02-03";
|
||||
date = "2025-06-04";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ in
|
|||
wshowkeys-mao = callPackage ./wshowkeys-mao.nix {};
|
||||
OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {};
|
||||
QQ = callPackage ./QQ.nix {};
|
||||
editor-runtime = callPackage ./editor-runtime.nix {};
|
||||
|
||||
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
|
||||
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
|
||||
|
|
|
|||
80
pkgs/editor-runtime.nix
Normal file
80
pkgs/editor-runtime.nix
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{
|
||||
symlinkJoin,
|
||||
nixfmt-rfc-style,
|
||||
idris2Packages,
|
||||
lua-language-server,
|
||||
bash-language-server,
|
||||
shfmt,
|
||||
hurl,
|
||||
cmake-language-server,
|
||||
kdlfmt,
|
||||
rustfmt,
|
||||
clang-tools,
|
||||
libxml2,
|
||||
typstyle,
|
||||
pyright,
|
||||
ruff,
|
||||
gotools,
|
||||
yaml-language-server,
|
||||
taplo,
|
||||
markdown-oxide,
|
||||
marksman,
|
||||
nixd,
|
||||
deno,
|
||||
alejandra,
|
||||
vscode-langservers-extracted,
|
||||
fish-lsp,
|
||||
tailwindcss-language-server,
|
||||
gopls,
|
||||
golangci-lint-langserver,
|
||||
tinymist,
|
||||
delve,
|
||||
lldb,
|
||||
rust-analyzer,
|
||||
# nil,
|
||||
haskell-language-server,
|
||||
neocmakelsp,
|
||||
jdt-language-server,
|
||||
zls,
|
||||
}:
|
||||
symlinkJoin {
|
||||
name = "editor-runtime";
|
||||
paths = [
|
||||
nixfmt-rfc-style
|
||||
idris2Packages.idris2Lsp
|
||||
lua-language-server
|
||||
bash-language-server
|
||||
shfmt
|
||||
hurl
|
||||
cmake-language-server
|
||||
kdlfmt
|
||||
rustfmt
|
||||
clang-tools
|
||||
libxml2
|
||||
typstyle
|
||||
pyright
|
||||
ruff
|
||||
gotools
|
||||
yaml-language-server
|
||||
taplo
|
||||
markdown-oxide
|
||||
marksman
|
||||
nixd
|
||||
deno
|
||||
alejandra
|
||||
vscode-langservers-extracted
|
||||
fish-lsp
|
||||
tailwindcss-language-server
|
||||
gopls
|
||||
golangci-lint-langserver
|
||||
tinymist
|
||||
delve
|
||||
lldb
|
||||
rust-analyzer
|
||||
# nil
|
||||
haskell-language-server
|
||||
neocmakelsp
|
||||
jdt-language-server
|
||||
zls
|
||||
];
|
||||
}
|
||||
|
|
@ -1,87 +1,12 @@
|
|||
{
|
||||
lib,
|
||||
inputs,
|
||||
system,
|
||||
callPackage,
|
||||
symlinkJoin,
|
||||
makeWrapper,
|
||||
nixfmt-rfc-style,
|
||||
idris2Packages,
|
||||
lua-language-server,
|
||||
bash-language-server,
|
||||
shfmt,
|
||||
hurl,
|
||||
cmake-language-server,
|
||||
kdlfmt,
|
||||
rustfmt,
|
||||
clang-tools,
|
||||
libxml2,
|
||||
typstyle,
|
||||
pyright,
|
||||
ruff,
|
||||
gotools,
|
||||
yaml-language-server,
|
||||
taplo,
|
||||
markdown-oxide,
|
||||
marksman,
|
||||
nixd,
|
||||
deno,
|
||||
alejandra,
|
||||
vscode-langservers-extracted,
|
||||
fish-lsp,
|
||||
tailwindcss-language-server,
|
||||
gopls,
|
||||
golangci-lint-langserver,
|
||||
tinymist,
|
||||
delve,
|
||||
lldb,
|
||||
rust-analyzer,
|
||||
# nil,
|
||||
haskell-language-server,
|
||||
neocmakelsp,
|
||||
jdt-language-server,
|
||||
zls,
|
||||
}: let
|
||||
inherit (inputs.helix.packages."${system}") helix;
|
||||
runtime = callPackage ./runtime.nix {};
|
||||
runtimeInputs = [
|
||||
nixfmt-rfc-style
|
||||
idris2Packages.idris2Lsp
|
||||
lua-language-server
|
||||
bash-language-server
|
||||
shfmt
|
||||
hurl
|
||||
cmake-language-server
|
||||
kdlfmt
|
||||
rustfmt
|
||||
clang-tools
|
||||
libxml2
|
||||
typstyle
|
||||
pyright
|
||||
ruff
|
||||
gotools
|
||||
yaml-language-server
|
||||
taplo
|
||||
markdown-oxide
|
||||
marksman
|
||||
nixd
|
||||
deno
|
||||
alejandra
|
||||
vscode-langservers-extracted
|
||||
fish-lsp
|
||||
tailwindcss-language-server
|
||||
gopls
|
||||
golangci-lint-langserver
|
||||
tinymist
|
||||
delve
|
||||
lldb
|
||||
rust-analyzer
|
||||
# nil
|
||||
haskell-language-server
|
||||
neocmakelsp
|
||||
jdt-language-server
|
||||
zls
|
||||
];
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "helix-wrapped";
|
||||
|
|
@ -92,7 +17,6 @@ in
|
|||
];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/hx \
|
||||
--suffix PATH : ${lib.makeBinPath runtimeInputs} \
|
||||
--set HELIX_RUNTIME ${runtime}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue