mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
Compare commits
5 commits
17acf4b2d8
...
cc566fed4f
| Author | SHA1 | Date | |
|---|---|---|---|
| cc566fed4f | |||
| fe43e44718 | |||
| 29839e9f5b | |||
| c0cab9eb1d | |||
| 9b3ab6acf3 |
6 changed files with 123 additions and 157 deletions
|
|
@ -8,7 +8,7 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
# ./disko.nix
|
||||
./disko.nix
|
||||
./../../modules/core/default.server.nix
|
||||
# ./../../modules/services/hazel.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,17 +9,12 @@
|
|||
device = "/dev/sda";
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "mbr";
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
type = "EF00";
|
||||
size = "500M";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [ "umask=0077" ];
|
||||
};
|
||||
boot = {
|
||||
size = "1M";
|
||||
type = "EF02";
|
||||
priority = 1;
|
||||
};
|
||||
root = {
|
||||
size = "100%";
|
||||
|
|
|
|||
|
|
@ -24,21 +24,21 @@
|
|||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/864dfbec-81f0-460f-b970-27693a0ad0e6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
# fileSystems."/" = {
|
||||
# device = "/dev/disk/by-uuid/864dfbec-81f0-460f-b970-27693a0ad0e6";
|
||||
# fsType = "ext4";
|
||||
# };
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/E141-F5CE";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
# fileSystems."/boot" = {
|
||||
# device = "/dev/disk/by-uuid/E141-F5CE";
|
||||
# fsType = "vfat";
|
||||
# options = [
|
||||
# "fmask=0077"
|
||||
# "dmask=0077"
|
||||
# ];
|
||||
# };
|
||||
|
||||
swapDevices = [ ];
|
||||
# swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
|
|
@ -5,124 +5,87 @@
|
|||
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 =
|
||||
with pkgs;
|
||||
[
|
||||
# Environment shit
|
||||
tesseract
|
||||
yubikey-touch-detector
|
||||
wireguard-tools
|
||||
openresolv
|
||||
xdg-utils
|
||||
killall
|
||||
libnotify
|
||||
openssl
|
||||
pamixer
|
||||
playerctl
|
||||
wl-clipboard
|
||||
cliphist
|
||||
poweralertd
|
||||
ffmpeg
|
||||
zip
|
||||
unzip
|
||||
wget
|
||||
xxd
|
||||
gcc
|
||||
gnumake
|
||||
python3
|
||||
home.packages = with pkgs; [
|
||||
# Environment shit
|
||||
tesseract
|
||||
yubikey-touch-detector
|
||||
wireguard-tools
|
||||
openresolv
|
||||
xdg-utils
|
||||
killall
|
||||
libnotify
|
||||
openssl
|
||||
pamixer
|
||||
playerctl
|
||||
wl-clipboard
|
||||
cliphist
|
||||
poweralertd
|
||||
ffmpeg
|
||||
zip
|
||||
unzip
|
||||
wget
|
||||
xxd
|
||||
gcc
|
||||
gnumake
|
||||
python3
|
||||
|
||||
# CLI shit
|
||||
termpdfpy
|
||||
vimv
|
||||
iamb
|
||||
pass
|
||||
lm_sensors
|
||||
neofetch
|
||||
hyfetch
|
||||
glow
|
||||
eva
|
||||
exiftool
|
||||
translate-shell
|
||||
progress
|
||||
pwgen
|
||||
jq
|
||||
tmux
|
||||
htop
|
||||
eza
|
||||
file
|
||||
fzf
|
||||
lazygit
|
||||
gitleaks
|
||||
ripgrep
|
||||
yt-dlp
|
||||
nodejs_22
|
||||
yarn
|
||||
cargo
|
||||
rustc
|
||||
wikit
|
||||
reader
|
||||
nmap
|
||||
speedtest-go
|
||||
delta
|
||||
powertop
|
||||
android-tools
|
||||
sshpass
|
||||
net-tools
|
||||
nmap
|
||||
# CLI shit
|
||||
termpdfpy
|
||||
vimv
|
||||
iamb
|
||||
pass
|
||||
lm_sensors
|
||||
neofetch
|
||||
hyfetch
|
||||
glow
|
||||
eva
|
||||
exiftool
|
||||
translate-shell
|
||||
progress
|
||||
pwgen
|
||||
jq
|
||||
tmux
|
||||
htop
|
||||
eza
|
||||
file
|
||||
fzf
|
||||
lazygit
|
||||
gitleaks
|
||||
ripgrep
|
||||
yt-dlp
|
||||
nodejs_22
|
||||
yarn
|
||||
cargo
|
||||
rustc
|
||||
wikit
|
||||
reader
|
||||
nmap
|
||||
speedtest-go
|
||||
delta
|
||||
powertop
|
||||
android-tools
|
||||
sshpass
|
||||
net-tools
|
||||
nmap
|
||||
|
||||
# Install pip packages
|
||||
# python3
|
||||
# python3Packages.pip
|
||||
# (writeShellScriptBin "install-pip-packages" '' # This script does not run, yet.
|
||||
# pip install --user --break-system-packages <package>
|
||||
# '')
|
||||
# Install pip packages
|
||||
# python3
|
||||
# python3Packages.pip
|
||||
# (writeShellScriptBin "install-pip-packages" '' # This script does not run, yet.
|
||||
# pip install --user --break-system-packages <package>
|
||||
# '')
|
||||
|
||||
inputs.alejandra.defaultPackage.${system}
|
||||
inputs.nixvim.packages.${pkgs.system}.default
|
||||
mermaid-cli
|
||||
gnuplot
|
||||
inputs.alejandra.defaultPackage.${system}
|
||||
inputs.nixvim.packages.${pkgs.system}.default
|
||||
mermaid-cli
|
||||
gnuplot
|
||||
|
||||
# Email/calendar/etc
|
||||
neomutt
|
||||
w3m
|
||||
khard
|
||||
khal
|
||||
vdirsyncer
|
||||
]
|
||||
++ guiPkgs;
|
||||
# Email/calendar/etc
|
||||
neomutt
|
||||
w3m
|
||||
khard
|
||||
khal
|
||||
vdirsyncer
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,24 +37,6 @@
|
|||
recommendedProxySettings = true;
|
||||
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
|
||||
appendHttpConfig = ''
|
||||
# Proxying
|
||||
|
|
|
|||
|
|
@ -21,5 +21,31 @@ in
|
|||
gnome.gnome-keyring.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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue