s0me1newithhand7s/reNixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: upstreaming changes

Browse source 
Signed-off-by: s0me1newithhand7s <117505144+s0me1newithhand7s@users.noreply.github.com>
This commit is contained in:
s0me1newithhand7s 2025-10-24 20:48:35 +03:00
parent d159232b37
commit e4e1b03c7e
No known key found for this signature in database
160 changed files with 3408 additions and 5474 deletions
Download patch file Download diff file Expand all files Collapse all files

2
s0melapt0p-nix/boot/kernel.nix
View file

@ -80,6 +80,6 @@
zfs = lib.mkForce false;
};
consoleLogLevel = 0;
# consoleLogLevel = 0;
};
}

8
s0melapt0p-nix/default.nix
View file

@ -1,5 +1,8 @@
{
{self, ...}: {
imports = [
./disko/disk.nix
./disko/lvm_vg.nix
./boot/loader/systemd-boot.nix
./boot/lanzaboote.nix
./boot/initrd.nix
@ -80,9 +83,6 @@
./system/stateVersion.nix
./systemd/oomd.nix
./systemd/slices/system-slice.nix
./systemd/slices/user-slice.nix
./systemd/slices/root-slice.nix
./time/timeZone.nix

47
s0melapt0p-nix/disko/disk.nix Normal file
View file

@ -0,0 +1,47 @@
{...}: {
disko = {
devices = {
disk = {
main = {
device = "/dev/disk/by-id/ata-ST92503010AS_5YH0CJFL";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "1024M";
name = "boot";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"fmask=0022"
"dmask=0022"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "lvm-crypted";
settings = {
allowDiscards = true;
};
content = {
type = "lvm_pv";
vg = "pool";
};
};
};
};
};
};
};
};
};
}

44
s0melapt0p-nix/disko.nix → s0melapt0p-nix/disko/lvm_vg.nix
View file

@ -1,48 +1,6 @@
{
{...}: {
disko = {
devices = {
disk = {
main = {
device = "/dev/disk/by-id/ata-CT480BX500SSD1_1935E1973FA4";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "1024M";
name = "boot";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"fmask=0022"
"dmask=0022"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "lvm-crypted";
settings = {
allowDiscards = true;
};
content = {
type = "lvm_pv";
vg = "pool";
};
};
};
};
};
};
};
lvm_vg = {
pool = {
type = "lvm_vg";

2
s0melapt0p-nix/environment/systemPackages.nix
View file

@ -6,7 +6,9 @@
environment = {
systemPackages = with pkgs; [
(lib.hiPrio uutils-coreutils-noprefix)
xdg-desktop-portal-wlr
xdg-desktop-portal-gtk
xdg-desktop-portal
uutils-findutils
uutils-diffutils
home-manager

3
s0melapt0p-nix/environment/variables.nix
View file

@ -6,9 +6,6 @@
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
GDK_BACKEND = "wayland";
XDG_SESSION_TYPE = "wayland";
XDG_CURRENT_DESKTOP = "wayland";
XDG_SESSION_DESKTOP = "wayland";
NIXPKGS_ALLOW_UNFREE = "1";
NIXPKGS_ALLOW_INSECURE = "1";
NIXOS_OZONE_WL = "1";

2
s0melapt0p-nix/home-manager/users.nix
View file

@ -13,7 +13,7 @@
inputs.chaotic.homeManagerModules.default
inputs.sops-nix.homeManagerModules.sops
inputs.noctalia.homeModules.default
inputs.nix-index-database.homeModules.nix-index
];
};
};

59
s0melapt0p-nix/networking/hosts.nix
View file

@ -1,7 +1,64 @@
{...}: {
networking = {
hosts = {
# Nope
# EVA00
"100.109.169.141" = [
"eva00-nix.netbird.cloud"
"eva00-nix"
];
"90.156.226.152" = [
"eva00-nix.lan"
"eva00-nix"
];
"200:deb2:ed25:a9e5:e30:4900:f88f:cb87" = [
"eva00-nix.ygg"
"eva00-nix"
];
# EVA01
"100.109.107.176" = [
"eva01-nix.netbird.cloud"
"eva01-nix"
];
"37.114.50.235" = [
"eva01-nix.lan"
"eva01-nix"
];
"200:6ef:a61f:2f01:71d4:196:ab70:2103" = [
"eva01-nix.ygg"
"eva01-nix"
];
# EVA02
"100.109.178.135" = [
"eva02-nix.netbird.cloud"
"eva02-nix"
];
"51.195.222.85" = [
"eva02-nix.lan"
"eva02-nix"
];
"201:52d6:c753:c1fd:f8b6:5897:cc6a:e1be" = [
"eva02-nix.ygg"
"eva02-nix"
];
# nerv-nix
"100.109.7.114" = [
"nerv-nix.netbird.cloud"
"nerv-nix"
];
"200:7abc:53c9:be8a:9941:96d:221b:cc76" = [
"nerv-nix.ygg"
"nerv-nix"
];
};
};
}

17
s0melapt0p-nix/networking/nameservers.nix
View file

@ -1,14 +1,27 @@
{...}: {
networking = {
nameservers = [
# cf dns
"1.1.1.1"
"1.0.0.1"
"8.8.8.8"
"8.8.4.4"
"2606:4700:4700::1111"
"2606:4700:4700::1001"
# google dns
"8.8.8.8"
"8.8.4.4"
"2001:4860:4860::8888"
"2001:4860:4860::8844"
# q9 dns
"9.9.9.9"
"149.112.112.112"
"2620:fe::fe"
"2620:fe::9"
# open dns
"208.67.222.222"
"208.67.220.220"
"2620:119:35::35"
"2620:119:53::53"
];

2
s0melapt0p-nix/nix/settings/substituters.nix
View file

@ -3,7 +3,6 @@
settings = {
substituters = [
# cache.nixos.org
"https://nixos-cache-proxy.cofob.dev"
"https://cache.nixos.org"
# cache.garnix.org
"https://cache.garnix.io"
@ -13,6 +12,7 @@
"https://ags.cachix.org"
"https://hyprland.cachix.org"
"https://chaotic-nyx.cachix.org/"
"https://colmena.cachix.org"
];
};
};

1
s0melapt0p-nix/nix/settings/trusted-public-keys.nix
View file

@ -12,6 +12,7 @@
"ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
];
};
};

3
s0melapt0p-nix/nixpkgs/overlays.nix
View file

@ -1,7 +1,6 @@
{inputs, ...}: {
{...}: {
nixpkgs = {
overlays = [
inputs.hyprpanel.overlay
];
};
}

1
s0melapt0p-nix/programs/ssh.nix
View file

@ -2,7 +2,6 @@
programs = {
ssh = {
startAgent = true;
agentTimeout = "12h";
};
};
}

1
s0melapt0p-nix/services/fprintd.nix
View file

@ -4,6 +4,7 @@
enable = true;
tod = {
enable = false;
# driver = pkgs.
};
};
};

8
s0melapt0p-nix/services/greetd.nix
View file

@ -1,11 +1,15 @@
{pkgs, ...}: {
{
pkgs,
lib,
...
}: {
services = {
greetd = {
enable = true;
restart = false;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r -t -c sway --greet-align center";
command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.sway}";
user = "greeter";
};
};

2
s0melapt0p-nix/services/openssh.nix
View file

@ -5,7 +5,7 @@
allowSFTP = true;
openFirewall = true;
ports = [
49560
6969
];
settings = {

1
s0melapt0p-nix/services/xserver.nix
View file

@ -18,6 +18,7 @@
xkb = {
layout = "us, ru";
variant = "";
options = "grp:caps_toggle";
};
};

4
s0melapt0p-nix/services/yggdrasil.nix
View file

@ -1,10 +1,10 @@
{...}: {
{config, ...}: {
services = {
yggdrasil = {
enable = true;
persistentKeys = false;
settings = {
# PrivateKey = ""; it's won't work as i thought :D
PrivateKey = config.sops.secrets.yggKeyLT.path;
Peers = [
# only 1W+ peers (some exeptions are possible)

3
s0melapt0p-nix/services/yubikey-agent.nix
View file

@ -1,6 +1,7 @@
{...}: {
{pkgs, ...}: {
services = {
yubikey-agent = {
package = pkgs.yubikey-agent;
enable = true;
};
};

3
s0melapt0p-nix/services/zerotier.nix
View file

@ -2,6 +2,9 @@
services = {
zerotierone = {
enable = true;
joinNetworks = [
# nope
];
};
};
}

14
s0melapt0p-nix/systemd/slices/root-slice.nix
View file

@ -1,14 +0,0 @@
{...}: {
systemd = {
slices = {
root = {
sliceConfig = {
ManagedOOMSwap = "kill";
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "40%";
ManagedOOMMemoryPressureDurationSec = 0;
};
};
};
};
}

14
s0melapt0p-nix/systemd/slices/system-slice.nix
View file

@ -1,14 +0,0 @@
{...}: {
systemd = {
slices = {
system = {
sliceConfig = {
ManagedOOMSwap = "kill";
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "40%";
ManagedOOMMemoryPressureDurationSec = 0;
};
};
};
};
}

14
s0melapt0p-nix/systemd/slices/user-slice.nix
View file

@ -1,14 +0,0 @@
{...}: {
systemd = {
slices = {
user = {
sliceConfig = {
ManagedOOMSwap = "kill";
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "40%";
ManagedOOMMemoryPressureDurationSec = 0;
};
};
};
};
}

11
s0melapt0p-nix/users/users/hand7s.nix
View file

@ -5,21 +5,12 @@
description = "me";
isSystemUser = false;
isNormalUser = true;
initialHashedPassword = "$6$vNggR38kZoLNZglM$QM5Qc8Ck1ko9YgME4RpV7KGLb1.UBynKmmWwABDI1GrMl54my7r7sXHiQ3VgqpMwaUtHeifJh5Zv.QR8lGXd50";
initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/";
extraGroups = [
"wheel"
"networkmanager"
"docker"
"openrazer"
];
openssh = {
authorizedKeys = {
keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDp2IIdR5jV1HyG4aiRX7SfTNrXDhCx5rTiFU40qkOKq litvinovb0@gmail.com"
];
};
};
};
};
};

2
s0melapt0p-nix/users/users/root.nix
View file

@ -2,7 +2,7 @@
users = {
users = {
root = {
initialHashedPassword = "$6$vNggR38kZoLNZglM$QM5Qc8Ck1ko9YgME4RpV7KGLb1.UBynKmmWwABDI1GrMl54my7r7sXHiQ3VgqpMwaUtHeifJh5Zv.QR8lGXd50";
initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0";
};
};
};

7
s0melapt0p-nix/xdg/portal.nix
View file

@ -7,20 +7,21 @@
common = {
default = [
"gtk"
"wlr"
];
};
hyprland = {
sway = {
preferred = [
"gtk"
"hyprland"
"wlr"
];
};
};
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-desktop-portal-wlr
];
};
};