This commit is contained in:
2024-11-27 13:46:39 +01:00
parent 434aae4ac5
commit a69bbcbf6a
6 changed files with 238 additions and 80 deletions
@@ -1,15 +1,44 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
let
mainMirror = "https://ftp.icm.edu.pl/pub/Linux/dist/archlinux";
extraMirrors = [ ];
getty = [ 6 7 ];
ttys = [ 6 7 8 ] ++ getty;
getty = [
6
7
];
ttys = [
6
7
8
] ++ getty;
startPkgs = lib.strings.concatStringsSep " " [ "base" "base-devel" "dbus" "less" "nano" "bash-completion" ];
startPkgs = lib.strings.concatStringsSep " " [
"base"
"base-devel"
"dbus"
"less"
"nano"
"bash-completion"
];
scripts = {
preStart = pkgs.writeShellScript "arch-pre-start" ''
if [ ! -d "/var/lib/machines/archlinux" ]; then
export PATH=''${PATH:+''${PATH}:}${lib.strings.makeBinPath (with pkgs; [ wget coreutils-full gnutar zstd ]) }
export PATH=''${PATH:+''${PATH}:}${
lib.strings.makeBinPath (
with pkgs;
[
wget
coreutils-full
gnutar
zstd
]
)
}
ARCH_IMAGE=$(mktemp)
trap 'rm $ARCH_IMAGE' EXIT
@@ -35,7 +64,11 @@ let
pacman -Syu --noconfirm
systemctl disable getty@tty1.service
${lib.strings.concatStringsSep "\n" (lib.lists.forEach getty (x: "systemctl enable getty@tty${builtins.toString x}.service"))}
${
lib.strings.concatStringsSep "\n" (
lib.lists.forEach getty (x: "systemctl enable getty@tty${builtins.toString x}.service")
)
}
"
@@ -51,13 +84,12 @@ in
SystemCallFilter = [ "@known" ];
Timezone = "bind";
Capability = "all";
PrivateUsers="no";
PrivateUsers = "no";
ResolvConf = "copy-host";
};
filesConfig = {
BindReadOnly = [
"/etc/resolv.conf:/etc/resolv.conf"
"/nix"
"/run/current-system"
@@ -93,7 +125,11 @@ in
preStart = "${scripts.preStart}";
overrideStrategy = "asDropin";
serviceConfig = {
DeviceAllow = [ "char-tty rwm" "char-input rwm" "char-drm rwm" ];
DeviceAllow = [
"char-tty rwm"
"char-input rwm"
"char-drm rwm"
];
};
};
}
@@ -41,9 +41,7 @@ let
which-key
iedit
hideshowvis
evil
perspective
treemacs-evil
treemacs
treemacs-perspective
treemacs-nerd-icons
@@ -81,7 +79,7 @@ let
org-roam-ui
org-review
org-present
org-superstar
org-modern
org-auto-tangle
visual-fill-column
csharp-mode
@@ -100,6 +98,7 @@ let
bash-completion
eldoc-box
yasnippet
yasnippet-capf
async
request
markdown-ts-mode
@@ -128,14 +127,15 @@ let
scroll-restore
highlight-indent-guides
diff-hl
transient
embark
embark-consult
ef-themes
# Completions & Minibuffer
corfu
corfu-terminal
kind-icon
cape
embark
embark-consult
orderless
vertico
marginalia
@@ -167,7 +167,9 @@ let
jdk
gradle
fpc
nodejs
omnisharp-roslyn
texlive.combined.scheme-basic
];
};
@@ -175,6 +177,7 @@ let
setNixInit = ''
(defvar lsp-java-configuration-runtimes nil)
(setq dap-lldb-debug-program '("${pkgs.llvmPackages.lldb}/bin/lldb-vscode"))
(setq lsp-java-configuration-runtimes '[(:name "JavaSE-1.8"
:path "${pkgs.jdk8}/lib/openjdk/")
(:name "JavaSE-17"
@@ -158,6 +158,9 @@ in
bindkey "^[[1;5A" history-substring-search-up-prefixed
bindkey "^[[1;5B" history-substring-search-down-prefixed
bindkey '^[[3~' delete-char
bindkey '^[[3;2~' delete-word
zsh-private() {
__MATERUS_HM_ZSH_PRIVATE=1 ${lib.getExe config.programs.zsh.package}
}