liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: liv:17acf4b2d8527e204e9ca567d63051503622e0da
Branches Tags
liv:master
...
compare: liv:cc566fed4f4e8ecf6498aa3029d416bd38f38695
Branches Tags
liv:master

5 commits
17acf4b2d8 ... cc566fed4f

Author SHA1 Message Date
Ahwx
cc566fed4f chore: cleanup old code 2025-08-01 13:18:45 +02:00
Ahwx
fe43e44718 feat: move guiPkgs to gui.nix 2025-08-01 13:18:32 +02:00
Ahwx
29839e9f5b chore: comment out things from hardware-configuration.nix as those are no longer valid 2025-08-01 13:18:13 +02:00
Ahwx
c0cab9eb1d feat: make gpt but properly now 2025-08-01 13:17:48 +02:00
Ahwx
9b3ab6acf3 feat: import disko again 2025-08-01 13:17:40 +02:00
6 changed files with 123 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/hazel/default.nix
View file

@ -8,7 +8,7 @@
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
# ./disko.nix ./disko.nix
./../../modules/core/default.server.nix ./../../modules/core/default.server.nix
# ./../../modules/services/hazel.nix # ./../../modules/services/hazel.nix
]; ];

15
hosts/hazel/disko.nix
View file

@ -9,17 +9,12 @@
device = "/dev/sda"; device = "/dev/sda";
type = "disk"; type = "disk";
content = { content = {
type = "mbr"; type = "gpt";
partitions = { partitions = {
ESP = { boot = {
type = "EF00"; size = "1M";
size = "500M"; type = "EF02";
content = { priority = 1;
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
}; };
root = { root = {
size = "100%"; size = "100%";

26
hosts/hazel/hardware-configuration.nix
View file

@ -24,21 +24,21 @@
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { # fileSystems."/" = {
device = "/dev/disk/by-uuid/864dfbec-81f0-460f-b970-27693a0ad0e6"; # device = "/dev/disk/by-uuid/864dfbec-81f0-460f-b970-27693a0ad0e6";
fsType = "ext4"; # fsType = "ext4";
}; # };
fileSystems."/boot" = { # fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E141-F5CE"; # device = "/dev/disk/by-uuid/E141-F5CE";
fsType = "vfat"; # fsType = "vfat";
options = [ # options = [
"fmask=0077" # "fmask=0077"
"dmask=0077" # "dmask=0077"
]; # ];
}; # };
swapDevices = [ ]; # swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

193
modules/home/packages.nix
View file

@ -5,124 +5,87 @@
config, config,
... ...
}: }:
with lib;
let
guiPkgs =
if (config.liv.gui == true) then
[
element-desktop
gajim
signal-desktop
anki-bin
obs-studio
wdisplays
librewolf # main
ungoogled-chromium # for things that don't work with librewolf
nsxiv
imv
libreoffice
xfce.thunar
spotify
spotify-player
thunderbird
lxqt.pavucontrol-qt
mpv
plasma5Packages.kdeconnect-kde
winbox
# onthespot-overlay
# Gaming
lunar-client
]
else
[
killall
];
in
{ {
home.packages = home.packages = with pkgs; [
with pkgs; # Environment shit
[ tesseract
# Environment shit yubikey-touch-detector
tesseract wireguard-tools
yubikey-touch-detector openresolv
wireguard-tools xdg-utils
openresolv killall
xdg-utils libnotify
killall openssl
libnotify pamixer
openssl playerctl
pamixer wl-clipboard
playerctl cliphist
wl-clipboard poweralertd
cliphist ffmpeg
poweralertd zip
ffmpeg unzip
zip wget
unzip xxd
wget gcc
xxd gnumake
gcc python3
gnumake
python3
# CLI shit # CLI shit
termpdfpy termpdfpy
vimv vimv
iamb iamb
pass pass
lm_sensors lm_sensors
neofetch neofetch
hyfetch hyfetch
glow glow
eva eva
exiftool exiftool
translate-shell translate-shell
progress progress
pwgen pwgen
jq jq
tmux tmux
htop htop
eza eza
file file
fzf fzf
lazygit lazygit
gitleaks gitleaks
ripgrep ripgrep
yt-dlp yt-dlp
nodejs_22 nodejs_22
yarn yarn
cargo cargo
rustc rustc
wikit wikit
reader reader
nmap nmap
speedtest-go speedtest-go
delta delta
powertop powertop
android-tools android-tools
sshpass sshpass
net-tools net-tools
nmap nmap
# Install pip packages # Install pip packages
# python3 # python3
# python3Packages.pip # python3Packages.pip
# (writeShellScriptBin "install-pip-packages" '' # This script does not run, yet. # (writeShellScriptBin "install-pip-packages" '' # This script does not run, yet.
# pip install --user --break-system-packages <package> # pip install --user --break-system-packages <package>
# '') # '')
inputs.alejandra.defaultPackage.${system} inputs.alejandra.defaultPackage.${system}
inputs.nixvim.packages.${pkgs.system}.default inputs.nixvim.packages.${pkgs.system}.default
mermaid-cli mermaid-cli
gnuplot gnuplot
# Email/calendar/etc # Email/calendar/etc
neomutt neomutt
w3m w3m
khard khard
khal khal
vdirsyncer vdirsyncer
] ];
++ guiPkgs;
} }

18
modules/services/nginx.nix
View file

@ -37,24 +37,6 @@
recommendedProxySettings = true; recommendedProxySettings = true;
clientMaxBodySize = lib.mkDefault "10G"; clientMaxBodySize = lib.mkDefault "10G";
#defaultListen =
# let
# listen = [
# {
# addr = "[::]";
# port = 80;
# extraParameters = [ "proxy_protocol" ];
# }
# {
# addr = "[::]";
# port = 443;
# ssl = true;
# extraParameters = [ "proxy_protocol" ];
# }
# ];
# in
# map (x: (x // { addr = "0.0.0.0"; })) listen ++ listen;
# Hardened TLS and HSTS preloading # Hardened TLS and HSTS preloading
appendHttpConfig = '' appendHttpConfig = ''
# Proxying # Proxying

26
roles/gui.nix
View file

@ -21,5 +21,31 @@ in
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
dbus.enable = true; dbus.enable = true;
}; };
home-manager.users.${username}.home.packages = with pkgs; [
element-desktop
gajim
signal-desktop
anki-bin
obs-studio
wdisplays
librewolf # main
ungoogled-chromium # for things that don't work with librewolf
nsxiv
imv
libreoffice
xfce.thunar
spotify
spotify-player
thunderbird
lxqt.pavucontrol-qt
mpv
plasma5Packages.kdeconnect-kde
winbox
# onthespot-overlay
# Gaming
lunar-client
];
}; };
} }