refreshed

This commit is contained in:
serenity-F 2026-03-02 15:51:07 +10:00
parent 625aeb598b
commit 634500fc5c
No known key found for this signature in database
30 changed files with 84 additions and 172 deletions

0
core/bluetooth.nix Normal file → Executable file
View file

View file

@ -9,7 +9,6 @@
## Semi-modularised config
../home # user-level packages in ../home/programs/
../secrets # secrets :shh:
## Shared modules to import
./audio.nix
@ -28,8 +27,15 @@
enable = true;
#extraConfig = '' '';
};
## Increasing max open files - needed for my huge ass bloaty flake
pam.loginLimits = [{
domain = "*";
type = "soft";
item = "nofile";
value = "8192";
}];
};
systemd.settings.Manager = { DefaultLimitNOFILE = "8192:524288"; };
## test line
## Settings for the nix package manager and daemon

View file

@ -10,38 +10,38 @@
## Boot/GRUB options
boot = {
bootspec.enable = true;
consoleLogLevel = 0;
initrd = {
verbose = false;
#bootspec.enable = true;
#consoleLogLevel = 0;
#initrd = {
#verbose = false;
#systemd = {
#enable = true;
#};
};
kernelParams =
[ # grub kernel parameters, set to prevent excessive output on boot
"vga=current" # use current video adapater
"splash" # unsure ?
"quiet" # quiet log level
"loglevel=3" # minimal output on boot
"udev.log_priority=3" # more minimising of output on boot
"rd.systemd.show_status=false" # unsure ?
"rd.udev.log_level=0" # more minimising of output on boot
"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
#};
#kernelParams =
#[ # grub kernel parameters, set to prevent excessive output on boot
#"vga=current" # use current video adapater
#"splash" # unsure ?
#"quiet" # quiet log level
#"loglevel=3" # minimal output on boot
#"udev.log_priority=3" # more minimising of output on boot
#"rd.systemd.show_status=false" # unsure ?
#"rd.udev.log_level=0" # more minimising of output on boot
#"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
#"i915.fastboot=1" # unsure ?
"plymouth.debug" # I NEED ANSWERS
"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
"plymouth.ignore-serial-consoles" # unsure ?
];
#"plymouth.debug" # I NEED ANSWERS
#"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
#"plymouth.ignore-serial-consoles" # unsure ?
#];
loader = {
timeout = 5; # 5 second timeout to default selection
grub = {
splashImage = null; # hides splashimage
timeoutStyle = "hidden"; # hides timeout
};
#grub = {
#splashImage = null; # hides splashimage
#timeoutStyle = "hidden"; # hides timeout
#};
};
plymouth = { # enables plymouth boot animations
enable = true;
enable = false;
extraConfig = "ShowDelay=0";
theme = "circle";
themePackages = with pkgs; [
@ -70,7 +70,7 @@
#xorg.xhost # i actually dont remember what this does
xhost
## Themes
minimal-grub-theme
#minimal-grub-theme
#colloid-kde
colloid-gtk-theme
adapta-gtk-theme

View file

@ -28,26 +28,21 @@
supportedFilesystems =
[ "vfat" "ext4" ]; # adds fat32 and ext3 filesystems to defaults
## Specifies where GRUB is installed
loader = {
grub = {
enable = true;
device = "/dev/nvme0n1";
enableCryptodisk = true; # allows decrypting luks drive
efi.canTouchEfiVariables = true;
systemd-boot = {
enable = true;
};
};
initrd.luks.devices = { # luks options
root = { # Use https://nixos.wiki/wiki/Full_Disk_Encryption
device = "/dev/disk/by-uuid/5526aab7-b779-4fc8-95bd-9452bc3a9232";
preLVM = true;
};
initrd.luks.devices."luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d".device = "/dev/disk/by-uuid/55f7d546-fac9-4ea0-a21e-4c50ecc0d67d";
## Uhhhhhhh
#Asphodel = { # secondary partition on Tartarus drive
#device = "/dev/disk/by-uuid/45f5f6ad-a676-4bc1-ad4b-e3e26b5697f4";
#preLVM =false;
#};
};
#};
};

63
core/hosts/hades/hardware.nix Executable file → Normal file
View file

@ -1,57 +1,36 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, modulesPath, user, ... }:
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules =
[ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ "dm-snapshot" ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.blacklistedKernelModules = [ "ntfs3" ];
fileSystems."/" =
{ device = "/dev/mapper/luks-35440a88-293e-455b-a018-ee1086b07321";
fsType = "ext4";
};
kernelModules = [ "kvm-intel" ];
boot.initrd.luks.devices."luks-35440a88-293e-455b-a018-ee1086b07321".device = "/dev/disk/by-uuid/35440a88-293e-455b-a018-ee1086b07321";
extraModulePackages = [ ];
blacklistedKernelModules = [ "ntfs3" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/ad648423-7aa4-4f0f-b157-2f6b458130f7";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/552D-851F";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/run/media/${user}/Tartarus" = {
device = "/dev/disk/by-uuid/26d8d9d1-67d2-4d61-a092-10ed7368b9f6";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2C83-7F40";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[{ device = "/dev/disk/by-uuid/b7ccf8c3-3641-4035-b91f-f7e54c6dd380"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
[ { device = "/dev/mapper/luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -18,20 +18,20 @@
## Specific TCP ports to be opened
allowedTCPPorts = [
2234 # soulseek/nicotine-plus
8384 # syncthing
8096 # jellyfin http
8920 # jellyfin https
#8384 # syncthing
#8096 # jellyfin http
#8920 # jellyfin https
];
## Specific UDP ports to be opened
allowedUDPPorts = [
2234 # soulseek/nicotine-plus
8834 # syncthing
7359 # jellyfin - client discovery
#8834 # syncthing
#7359 # jellyfin - client discovery
];
## Ranges for TCP and UDP ports to be opened
## - disabled for now as network infrastructure is minimal
## - disabled for now, network infrastructure is minimal
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges;
@ -39,11 +39,11 @@
## Systemd service for the dnscrypt config declared below
#systemd.services.dnscrypt-proxy2.serviceConfig = {
#StateDirectory = "dnscrypt-proxy";
#StateDirectory = "dnscrypt-proxy";
#};
services.dnscrypt-proxy = {
enable = false;
enable = true;
settings = {
ipv6_servers = true;
require_dnssec = true;
@ -54,8 +54,7 @@
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
];
## key and cachefile to verify servers and authenticity
minisign_key =
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
};

0
core/python.nix Normal file → Executable file
View file

View file

@ -22,9 +22,9 @@ in {
supportedFilesystems = [ "zfs" ];
zfs = {
## uhhh
extraPools = [ "orcus" ];
#extraPools = [ "orcus" ];
## uhhh
forceImportRoot = false;
#forceImportRoot = false;
};
};
networking = { hostId = "603b0c8b"; }; # Unsure why this is here actually ?

0
flake.lock generated Normal file → Executable file
View file

0
home/desktop/niri/binds.nix Normal file → Executable file
View file

0
home/desktop/niri/default.nix Normal file → Executable file
View file

0
home/desktop/niri/window-rules.nix Normal file → Executable file
View file

0
home/desktop/noctalia.nix Normal file → Executable file
View file

9
home/multimedia/default.nix Normal file → Executable file
View file

@ -29,4 +29,13 @@
## Miscellaneous
themix-gui # for creating gtk themes
];
programs = {
obsidian = {
# note taking
enable = true;
#defaultSettings = { };
};
};
}

0
home/multimedia/music-production.nix Normal file → Executable file
View file

0
home/multimedia/music.nix Normal file → Executable file
View file

0
home/resources/theme/SerenityOS-GTK.nix Normal file → Executable file
View file

0
home/resources/theme/avatar.jpg Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

0
home/resources/theme/serenityos-base.nix Normal file → Executable file
View file

0
home/resources/theme/stylix.nix Normal file → Executable file
View file

0
home/resources/theme/themepkgs.nix Normal file → Executable file
View file

View file

Before

Width:  |  Height:  |  Size: 518 KiB

After

Width:  |  Height:  |  Size: 518 KiB

Before After
Before After

0
home/scripts/battery.nix Normal file → Executable file
View file

0
home/scripts/sync/postActivation.nix Normal file → Executable file
View file

0
home/terminal/default.nix Normal file → Executable file
View file

0
home/terminal/fastfetch.nix Normal file → Executable file
View file

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, config, user, homeDirectory, ... }:
{
programs.git = {
@ -8,6 +8,9 @@
extraConfig = {
init.defaultBranch = "main";
# Automatically track remote branch
gpg.format = "ssh";
commit.gpgSign = true;
user.signingKey = "/home/serenity/.ssh/id_ed25519.pub";
push.autoSetupRemote = true;
};
};

View file

@ -1,7 +0,0 @@
keys:
- &primary age1dv6qkra66er77cv6arcrn0lfuuelr54sq8fm9z5mwqj87wn2cqps9ce8d4
creation_rules:
- path_regex: secrets.yaml$
key_groups:
- age:
- *primary

View file

@ -1,33 +0,0 @@
{ pkgs, config, inputs, flakePath, user, homeDirectory, ... }:
{
imports = [ inputs.sops-nix.nixosModules.sops ];
## Packages used in sops-nix setup
environment = { systemPackages = with pkgs; [ age ssh-to-age sops ]; };
## Sops-nix config
sops = {
defaultSopsFile = ./secrets.yaml; # default secrets file
defaultSopsFormat = "yaml"; # .yaml format - ease of use
age = {
keyFile = "${homeDirectory}/.config/sops/age/keys.txt"; # keyfile location
generateKey = true; # generate a new key if the one above is missing
};
## List of secrets retrieved from secrets.yaml by sops-nix
secrets = {
"rootLuksPassword" = { };
"loginPassword" = { };
"asphodelLuksPassword" = { };
"privateKey" = { };
};
};
}

View file

@ -1,39 +0,0 @@
hello: ENC[AES256_GCM,data:2bUqUesUU8XtZUqGRW/G1ZZmvvj7LMAr8Eam/f/VORSREYtIrC3dgGtfFczg2Q==,iv:3LNWWyLgaEAfO49/68T2kRtrUkQyqBGiVLLNZHVnwFA=,tag:OkFMwVlm0FPmQeDlL9tvTg==,type:str]
example_key: ENC[AES256_GCM,data:sDmAeh07IoSKNG6y+w==,iv:QVKg5VSlGY9c5yLCikXkg4dw7W5TmcTS4FI6e8dAkrU=,tag:Jii8EbZ5pf8V9CCx2CJE0A==,type:str]
#ENC[AES256_GCM,data:XMvN1PPl1cVFTW0TCAD8nQ==,iv:nmmEZVxED9kDbCKB4487gaAoXWM+kkMyvwO+rU+XS+Y=,tag:zE4mJwB2aAd2w8khk6mJJA==,type:comment]
#ENC[AES256_GCM,data:8rZag+tdMu6n0Hbz9RKax+mzfjbd7/ZXNIljZLmOoTZ+vO3KTdCt/oVbDonVXz1P0pYfKhhs2Ro=,iv:qaHTjR/5foVnPXJm/tbEDqb4q45AvwiG06z2Zt3x9Qo=,tag:e2SjaiyWHRc0TjZ5DcJK0Q==,type:comment]
#ENC[AES256_GCM,data:Zh6PHNB/7y6os8HxATr9+RxrA0NE0q0P1mitLFU2j5jvcJXAVFPnEwfkkewL9/EBNQ56Lv7Pupl4xQfa2Mmv8BZaN/AtcIv7,iv:HdtevTXBbpAIELt37Xt9D9e7hbeB4ZZycE09Ur5B4ZQ=,tag:n9mIqLIuqmsxmmXgxMyYLg==,type:comment]
example_service:
example_subdir:
example_secret: ENC[AES256_GCM,data:lCbzmx4EFo4W,iv:4nz75J+IG8d8cdivgYmUyrwL4ep0Ek2yBR4Kd476QMc=,tag:hIBQL+OBr2jnhApJ8fvJ5A==,type:str]
example_array:
- ENC[AES256_GCM,data:lKYFdo7R10r38BVoCnc=,iv:QwFEHf5qZrVZ+lxRzZhp+pP88r0PzSJzHUnb6TJdbBQ=,tag:hcIXaT/VjYiCc3NmvtWlZg==,type:str]
- ENC[AES256_GCM,data:tLpgldPDt6j4oFJSEcw=,iv:FVZI17PTDXdaizx6t+fmVTdWMY3JBEQjc+SO3AElVlQ=,tag:maIvXcVsbnzq8GXXPxvBOg==,type:str]
example_number: ENC[AES256_GCM,data:gxzec/b+0cL9kQ==,iv:dV4rMTf2CzF1yRp66cplfJ7fgbsiz0rtBrwcZgcVhPQ=,tag:U0J9I37NZL43YFxwY/RMyw==,type:float]
example_booleans:
- ENC[AES256_GCM,data:6vp2cw==,iv:Wtu2qxbNGYVJ/p9TCWafupusHDpHB6ebI9ywdvG8gU4=,tag:pde0H3f32YPTyGyCfZ/pWA==,type:bool]
- ENC[AES256_GCM,data:c+gP21M=,iv:gK4Rv9aK7WhyQgfgFKQNZ5+XJGQZVog7Iw8riHr3j2E=,tag:AQdSIXrUrkmHwOqhzkTM3g==,type:bool]
asphodelLuksPassword: ENC[AES256_GCM,data:UAtVQY1WoCLb6T57TGAT,iv:unf3dnYb72bhXPDu9ccHwjhcxYXritDocq8dkQ3rtYU=,tag:zFFqir5l0pTvKG2UO35LBw==,type:str]
rootLuksPassword: ENC[AES256_GCM,data:HSejkZyLGhlo3R0=,iv:pmHvcKYt78NVfVfU1RZvc4YFHwg9sL8Vr2u6jNd5d54=,tag:8ub0W6hNM6SG6t4SAnDOBA==,type:str]
loginPassword: ENC[AES256_GCM,data:CRZJzt/euKNAz6R7xL/+8+kN+I5dgWGOUsm3owsEcN7bmWp9GkNDqEuwIESgM6ofONPNw5B2W28oZAb0vLjNwArG0HOLep5Whg==,iv:rj4qvlm9Dd032FTZQY8MWRtq08pKVS7siraoQyhbPO8=,tag:duiTteFqbZgLhUGSc/Cx2w==,type:str]
privateKey: ENC[AES256_GCM,data:RHPSwGjQlQBcc5h01MnjmcjPSLkktUuqeyuLKRGEUiQ9/mezCEFG3YewRIf3UXzSShMHG9v7arzkHIngmESxmZjUy7hj1ShDgwfVOpnF2yCx+v2A6yUL7tUzJUmst1sSKuBDjxhLfHlM/TRh+6lMgyu4kw8UUkk/FgMNVDNz5JTxMiuu1wqHR6tI79UDupxJIovK6cbz6nWeY34K6qpBElkpc//SYqoVc0kYf81iP1G/Qnv7oWQcUJt6Tkc8z1PmBxhZMcJMachWy84piEjEKLfRbpNkONM8NN/5WtUENOyMmykwjN7aP0XadX02/1nkjqF5HZQS9YsR/pvY3dFkXVcX5gVHYO8BkOII4RvdhAkGo/rQyN1c1PTJhJjb3sGt0nEE3gnZCKj3kD8ZE+o3yZP8Dm6Ov+1uaNirYSBQ+f4k1bQPZcNp0IHR4AXmXCzTMSpb+C7ugnoEP3HMXE30l+pe4aoXjSkzgFlydecDVd3IaajAJkZhvIW6mMe1AnNN8X1txhBG2ZpSuT7FCQi8LiIEfbBhSbmwLgmm,iv:h9i+Sfk0dlxWXpQ7xkXyELojyaf/66BRhZagk/dg2jg=,tag:d97EyMgiLqVy9YCiW/F9sg==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1dv6qkra66er77cv6arcrn0lfuuelr54sq8fm9z5mwqj87wn2cqps9ce8d4
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEeGpTK2dOT2IrUmJpbE1V
ZkVHVmViTnFSVTlWOHFteklSdlRaQldXWW1NCmEwcVVaTGU0dm9EQjdMTlViWVZZ
WndNNE1MZDVGbHJ3MVB1ZUQ3TVlBUUUKLS0tIDRaRzUwYnRNRW4zbTFSWFMvWENE
d1dydnhrYURjQzdGWmRneHNHTDRhUWcKKh9csHYkTTl+KQtWHJc9SqNpF590jd/A
nb1ANVrf7xz7kkPTWEQaCFrPuuZeTrteNti0WfXm6fXT/O8KFzJMaQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-03-25T12:01:59Z"
mac: ENC[AES256_GCM,data:/ridLE40zdSDTBaCLURfSYsrtar5h7yq8ctawlVljtelE0coNfGG03Y9NV/LjIeiWwcNbgixk03XzA4NIfTAwrV3C2ob52aDwoiKyp64NH+Cxa71aaCqTZf5OS5w9zcIDlMJEskAJQNBOoPC/MCroJN+HgO1uSEQAv5sBB21EFg=,iv:hSe2ZTt1LP56XiKDLkrHi0CE2xyaEZpxqMNsHF7O0pI=,tag:FVJZSGNM+RaOoIAbLhjCFA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.4