uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
This commit is contained in:
parent
860254fde3
commit
57f28539b9
6 changed files with 83 additions and 55 deletions
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
## semi-modularised config
|
||||
./packages.nix
|
||||
./fonts.nix
|
||||
./misc.nix
|
||||
../home/users
|
||||
|
||||
|
|
@ -28,11 +29,11 @@
|
|||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
jack.enable = true;
|
||||
#jack.enable = false;
|
||||
pulse.enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
# lowLatency.enable = true;
|
||||
#alsa.support32Bit = false;
|
||||
#lowLatency.enable = true;
|
||||
};
|
||||
|
||||
## genuinely dunno what these do hey, like isnt sudo
|
||||
|
|
|
|||
26
core/fonts.nix
Normal file
26
core/fonts.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ inputs, outputs, lib, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
fonts = {
|
||||
|
||||
packages = with pkgs; [
|
||||
spleen
|
||||
terminus_font
|
||||
terminus_font_ttf
|
||||
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
|
||||
];
|
||||
|
||||
fontDir.enable = true;
|
||||
fontconfig = {
|
||||
|
||||
defaultFonts = {
|
||||
serif = [ "spleen-32x64" ];
|
||||
sansSerif = [ "spleen-32x64" ];
|
||||
monospace = [ "TerminusTTF" ];
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,31 +1,10 @@
|
|||
{ inputs, outputs, lib, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
|
||||
## find a better home for these please <3
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
spleen
|
||||
terminus_font
|
||||
terminus_font_ttf
|
||||
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
|
||||
];
|
||||
fontDir.enable = true;
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
monospace = [
|
||||
"TerminusTTF"
|
||||
];
|
||||
serif = [
|
||||
"spleen-32x64"
|
||||
];
|
||||
sansSerif = [
|
||||
"spleen-32x64"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
|
||||
|
||||
imports = [
|
||||
#file.nix
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
|
||||
|
|
@ -76,26 +55,30 @@
|
|||
services.flatpak.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
||||
## temporary/desktop
|
||||
waybar
|
||||
# gnome.gnome-keyring
|
||||
|
||||
## filsesystem
|
||||
## filsesystems
|
||||
zfs
|
||||
ntfs3g
|
||||
xfsprogs
|
||||
exfatprogs
|
||||
btrfs-progs
|
||||
ntfs2btrfs
|
||||
udiskie
|
||||
gparted
|
||||
|
||||
|
||||
## tools
|
||||
fd
|
||||
bc
|
||||
zip
|
||||
tldr
|
||||
wget
|
||||
curl
|
||||
file
|
||||
zip
|
||||
tree
|
||||
btop
|
||||
micro
|
||||
unzip
|
||||
gnupg
|
||||
s-tui
|
||||
blueman
|
||||
busybox
|
||||
ripgrep
|
||||
|
|
@ -110,15 +93,20 @@
|
|||
pavucontrol
|
||||
|
||||
## nixos
|
||||
# nix-tree
|
||||
# nix-init
|
||||
# nix-index
|
||||
# nixpkgs-review
|
||||
# nix-output-monitor
|
||||
nix-tree
|
||||
#nix-init
|
||||
#nix-index
|
||||
#nixpkgs-review
|
||||
#nix-output-monitor
|
||||
|
||||
## languages and libraries
|
||||
rustup
|
||||
python313
|
||||
#rustup
|
||||
#python313
|
||||
|
||||
## temporary/desktop
|
||||
waybar
|
||||
# gnome.gnome-keyring
|
||||
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,14 +32,16 @@
|
|||
# qt5-wayland
|
||||
# qt6-wayland
|
||||
# gnome-clocks
|
||||
pavucontrol
|
||||
image-roll
|
||||
gnome.eog
|
||||
peaclock
|
||||
hyfetch
|
||||
cmatrix
|
||||
hyfetch
|
||||
kitty
|
||||
micro
|
||||
btop
|
||||
|
||||
|
||||
## multimedia & games
|
||||
neural-amp-modeler-lv2
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
||||
./disko-config.nix
|
||||
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
||||
# ./disko-config.nix
|
||||
# ./network-configuration.nix
|
||||
../../core/configuration.nix
|
||||
|
||||
|
|
@ -18,30 +18,31 @@
|
|||
canTouchEfiVariables = true;
|
||||
efiSysMountPoint = "/boot/efi";
|
||||
};
|
||||
systemd-boot = {
|
||||
enable = false;
|
||||
configurationLimit = 10;
|
||||
};
|
||||
#systemd-boot = {
|
||||
#enable = false;
|
||||
#configurationLimit = 10;
|
||||
#};
|
||||
grub = {
|
||||
enable = true;
|
||||
efiSupport = true;
|
||||
#efiInstallAsRemovable = true;
|
||||
device = "/dev/sda1";
|
||||
device = "/dev/sdd";
|
||||
useOSProber = true;
|
||||
enableCryptodisk = true;
|
||||
};
|
||||
};
|
||||
initrd = {
|
||||
systemd.enable = true;
|
||||
secrets = {
|
||||
"crypto_keyfile.bin" = null;
|
||||
"/boot/crypto_keyfile.bin" = null;
|
||||
};
|
||||
luks = {
|
||||
# devices."luks-DISK_UUID" = {
|
||||
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".keyFile = "/boot/crypto_keyfile.bin";
|
||||
# device = "/dev/disk/by-uuid/DISK_UUID";
|
||||
# keyfile = "/crypto_keyfile.bin";
|
||||
# };
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.fstrim.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,21 @@
|
|||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue