mirror of
https://codeberg.org/leana8959/.files.git
synced 2026-02-01 14:39:39 +00:00
Compare commits
8 commits
d2617493e8
...
a3c02415f8
| Author | SHA1 | Date | |
|---|---|---|---|
| a3c02415f8 | |||
| 5a296c6e97 | |||
| 810a395610 | |||
| 3d91894fbb | |||
| 23ec902deb | |||
| a8e5776854 | |||
| daf4d2901e | |||
| 085442e442 |
11 changed files with 30 additions and 78 deletions
|
|
@ -40,7 +40,6 @@ in
|
||||||
|
|
||||||
# use lix everywhere and wrap it with nom
|
# use lix everywhere and wrap it with nom
|
||||||
../overlays/lix.nix
|
../overlays/lix.nix
|
||||||
../overlays/nix-monitored.nix
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,4 @@
|
||||||
MemoryMax = "90%";
|
MemoryMax = "90%";
|
||||||
OOMScoreAdjust = 500;
|
OOMScoreAdjust = 500;
|
||||||
};
|
};
|
||||||
|
|
||||||
# 12 Cores, 64 GB RAM
|
|
||||||
# split into 4 jobs with 3C/16G
|
|
||||||
nix.settings = {
|
|
||||||
cores = 3;
|
|
||||||
max-jobs = 4;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ in
|
||||||
|
|
||||||
# use lix everywhere and wrap it with nom
|
# use lix everywhere and wrap it with nom
|
||||||
../overlays/lix.nix
|
../overlays/lix.nix
|
||||||
../overlays/nix-monitored.nix
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,19 +54,15 @@ in
|
||||||
../overlays/wired-notify.nix
|
../overlays/wired-notify.nix
|
||||||
../overlays/wallpapers.nix
|
../overlays/wallpapers.nix
|
||||||
../overlays/nil.nix
|
../overlays/nil.nix
|
||||||
../overlays/fcitx5-table-extra-taiwanese.nix
|
|
||||||
../overlays/ghostty-dev.nix
|
../overlays/ghostty-dev.nix
|
||||||
../overlays/npins.nix
|
../overlays/npins.nix
|
||||||
|
|
||||||
../overlays/iosevka.nix
|
../overlays/iosevka-term.nix
|
||||||
../packages/overlay.nix
|
../packages/overlay.nix
|
||||||
|
|
||||||
./vanadium/overlay.nix
|
./vanadium/overlay.nix
|
||||||
./vanadium/kernel-overlay.nix
|
./vanadium/kernel-overlay.nix
|
||||||
|
|
||||||
# removed, but I need it for PLFA!
|
|
||||||
../overlays/pin-emacs28.nix
|
|
||||||
|
|
||||||
# use lix everywhere and wrap it with nom
|
# use lix everywhere and wrap it with nom
|
||||||
../overlays/lix.nix
|
../overlays/lix.nix
|
||||||
../overlays/nix-monitored.nix
|
../overlays/nix-monitored.nix
|
||||||
|
|
|
||||||
|
|
@ -118,10 +118,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
};
|
};
|
||||||
emacs = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.unsafe-emacs28;
|
|
||||||
};
|
|
||||||
lazygit.enable = true;
|
lazygit.enable = true;
|
||||||
fish = {
|
fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,4 @@
|
||||||
MemoryMax = "90%";
|
MemoryMax = "90%";
|
||||||
OOMScoreAdjust = 500;
|
OOMScoreAdjust = 500;
|
||||||
};
|
};
|
||||||
|
|
||||||
# 16 Cores, 32 GB RAM
|
|
||||||
# split into 4 jobs with 4C/8G
|
|
||||||
nix.settings = {
|
|
||||||
cores = 2;
|
|
||||||
max-jobs = 4;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,18 +16,6 @@ infuse {
|
||||||
./patches/helix/W-as-write.patch
|
./patches/helix/W-as-write.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO:
|
|
||||||
# pinned branch of https://github.com/astrand/xclip/tree/xerror
|
|
||||||
# use this until #43 gets resolved properly
|
|
||||||
xclip.__output.src =
|
|
||||||
_:
|
|
||||||
final.fetchFromGitHub {
|
|
||||||
owner = "astrand";
|
|
||||||
repo = "xclip";
|
|
||||||
rev = "2c3b811002b35d3be7f39cc1145dd06bdb32e31c";
|
|
||||||
hash = "sha256-hHbq97GTKiRw8LZa/LY4LUOFOd/5H4+S+NR0BJfcu6M=";
|
|
||||||
};
|
|
||||||
|
|
||||||
fcitx5.__output.cmakeFlags.__append = [
|
fcitx5.__output.cmakeFlags.__append = [
|
||||||
(lib.cmakeFeature "ENABLE_EMOJI" "Off")
|
(lib.cmakeFeature "ENABLE_EMOJI" "Off")
|
||||||
(lib.cmakeFeature "ENABLE_WAYLAND" "Off")
|
(lib.cmakeFeature "ENABLE_WAYLAND" "Off")
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,19 @@
|
||||||
final: prev: rec {
|
final: prev:
|
||||||
nerd-fonts =
|
|
||||||
let
|
let
|
||||||
mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { };
|
iosevka-term = prev.iosevka.override {
|
||||||
in
|
# This changes pname which changes what the outputted buildPlan name is.
|
||||||
prev.nerd-fonts
|
# Stupid API
|
||||||
// {
|
|
||||||
iosevka = mkNerdFont {
|
|
||||||
font = iosevka;
|
|
||||||
patcherArgs = [
|
|
||||||
"--complete"
|
|
||||||
"--careful"
|
|
||||||
"--name {/.}-NFM"
|
|
||||||
"--mono"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
iosevka = prev.iosevka.override {
|
|
||||||
set = "";
|
set = "";
|
||||||
|
|
||||||
# Guide: https://github.com/be5invis/Iosevka/blob/main/doc/custom-build.md
|
# Guide: https://github.com/be5invis/Iosevka/blob/main/doc/custom-build.md
|
||||||
privateBuildPlan = {
|
privateBuildPlan = {
|
||||||
family = "Iosevka";
|
family = "Iosevka";
|
||||||
serifs = "sans";
|
serifs = "sans";
|
||||||
spacing = "normal";
|
|
||||||
|
# Iosevka + Ghostty makes "…" display in a odd way.
|
||||||
|
# We use "term" width to avoid this.
|
||||||
|
# https://github.com/ghostty-org/ghostty/discussions/10335
|
||||||
|
spacing = "term";
|
||||||
|
|
||||||
# Otherwise kitty behaves funny with ligature
|
# Otherwise kitty behaves funny with ligature
|
||||||
# noLigation = true;
|
# noLigation = true;
|
||||||
|
|
@ -171,4 +161,23 @@ final: prev: rec {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { };
|
||||||
|
iosevka-term-nerd = mkNerdFont {
|
||||||
|
font = iosevka-term;
|
||||||
|
patcherArgs = [
|
||||||
|
"--complete"
|
||||||
|
"--careful"
|
||||||
|
"--name {/.}-NFM"
|
||||||
|
"--mono"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit iosevka-term;
|
||||||
|
|
||||||
|
nerd-fonts = prev.nerd-fonts // {
|
||||||
|
iosevka = iosevka-term-nerd;
|
||||||
|
iosevka-term = iosevka-term-nerd;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
let
|
|
||||||
sources = import ../../npins;
|
|
||||||
in
|
|
||||||
_: _: {
|
|
||||||
unsafe-emacs28 = (import sources.pin-emacs28 { }).emacs;
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
let
|
|
||||||
sources = import ../../npins;
|
|
||||||
in
|
|
||||||
_: _: {
|
|
||||||
# Isabelle version 2023
|
|
||||||
isabelle-2023 = (import sources.pin-isabelle { }).isabelle;
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
let
|
|
||||||
sources = import ../../npins;
|
|
||||||
in
|
|
||||||
_: _: {
|
|
||||||
# Wireshark bug
|
|
||||||
# https://gitlab.com/wireshark/wireshark/-/issues/19574
|
|
||||||
inherit (import sources.pin-wireshark { }) wireshark;
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue