mirror of
https://github.com/materusPL/nixos-config
synced 2026-07-02 12:46:42 +00:00
Lot of changes, ignoring previous commits format
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
let
|
||||
mainMirror = "https://ftp.icm.edu.pl/pub/Linux/dist/archlinux";
|
||||
extraMirrors = [ ];
|
||||
getty = [ 5 6 ];
|
||||
ttys = [ 5 6 7 8 ] ++ getty;
|
||||
getty = [ 6 7 ];
|
||||
ttys = [ 6 7 8 ] ++ getty;
|
||||
|
||||
startPkgs = lib.strings.concatStringsSep " " [ "base" "base-devel" "dbus" "less" "nano" "bash-completion" ];
|
||||
scripts = {
|
||||
@@ -28,6 +28,7 @@ let
|
||||
systemd-machine-id-setup --root="/var/lib/machines/archlinux"
|
||||
systemd-nspawn -q --settings=false --system-call-filter=@sandbox -D "/var/lib/machines/archlinux" /bin/sh -c "
|
||||
export PATH=/bin
|
||||
touch /etc/systemd/do-not-udevadm-trigger-on-update
|
||||
pacman-key --init && pacman-key --populate
|
||||
pacman -Rs --noconfirm arch-install-scripts
|
||||
pacman -Sy --noconfirm --needed ${startPkgs}
|
||||
|
||||
@@ -53,6 +53,8 @@
|
||||
lua
|
||||
gtk4.dev
|
||||
gtk4
|
||||
glib
|
||||
glib.dev
|
||||
miniaudio
|
||||
SDL2.dev
|
||||
SDL2
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
|
||||
binutils
|
||||
|
||||
qbittorrent
|
||||
materusArg.unstable.qbittorrent
|
||||
mkvtoolnix
|
||||
nicotine-plus
|
||||
picard
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
};
|
||||
|
||||
environment.variables = {
|
||||
JAVA_8_HOME = pkgs.jdk8;
|
||||
JAVA_17_HOME = pkgs.jdk17;
|
||||
JAVA_21_HOME = pkgs.jdk21;
|
||||
JAVA_8_HOME = "${pkgs.jdk8}/lib/openjdk/";
|
||||
JAVA_17_HOME = "${pkgs.jdk17}/lib/openjdk/";
|
||||
JAVA_21_HOME = "${pkgs.jdk21}/lib/openjdk/";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,6 +22,6 @@ users.users.materus = {
|
||||
shell = pkgs.zsh;
|
||||
description = "Mateusz Słodkowicz";
|
||||
openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/materus.pub") ];
|
||||
hashedPasswordFile = config.sops.secrets."users/materus".path;
|
||||
#hashedPasswordFile = config.sops.secrets."users/materus".path;
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
sops.gnupg.sshKeyPaths = [ ];
|
||||
sops.age.sshKeyPaths = [ "/materus/root/ssh_host_ed25519_key" ];
|
||||
sops.defaultSopsFile = materusCfg.hostPath + "/secrets/secrets.yaml";
|
||||
sops.secrets."users/materus" = { neededForUsers = true; };
|
||||
#sops.secrets."users/materus" = { neededForUsers = true; };
|
||||
sops.secrets.wireguard = { };
|
||||
|
||||
services.openssh.hostKeys = [
|
||||
|
||||
Reference in New Issue
Block a user