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
|
## semi-modularised config
|
||||||
./packages.nix
|
./packages.nix
|
||||||
|
./fonts.nix
|
||||||
./misc.nix
|
./misc.nix
|
||||||
../home/users
|
../home/users
|
||||||
|
|
||||||
|
|
@ -28,11 +29,11 @@
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
jack.enable = true;
|
#jack.enable = false;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
alsa.support32Bit = true;
|
#alsa.support32Bit = false;
|
||||||
# lowLatency.enable = true;
|
#lowLatency.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
## genuinely dunno what these do hey, like isnt sudo
|
## 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, ... }:
|
{ inputs, outputs, lib, config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
|
|
||||||
## find a better home for these please <3
|
imports = [
|
||||||
fonts = {
|
#file.nix
|
||||||
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"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
|
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
||||||
|
|
@ -76,26 +55,30 @@
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
||||||
## temporary/desktop
|
## filsesystems
|
||||||
waybar
|
zfs
|
||||||
# gnome.gnome-keyring
|
|
||||||
|
|
||||||
## filsesystem
|
|
||||||
ntfs3g
|
ntfs3g
|
||||||
xfsprogs
|
xfsprogs
|
||||||
|
exfatprogs
|
||||||
|
btrfs-progs
|
||||||
|
ntfs2btrfs
|
||||||
udiskie
|
udiskie
|
||||||
gparted
|
gparted
|
||||||
|
|
||||||
## tools
|
## tools
|
||||||
fd
|
fd
|
||||||
bc
|
bc
|
||||||
|
zip
|
||||||
tldr
|
tldr
|
||||||
wget
|
wget
|
||||||
curl
|
curl
|
||||||
file
|
file
|
||||||
zip
|
tree
|
||||||
|
btop
|
||||||
|
micro
|
||||||
unzip
|
unzip
|
||||||
gnupg
|
gnupg
|
||||||
|
s-tui
|
||||||
blueman
|
blueman
|
||||||
busybox
|
busybox
|
||||||
ripgrep
|
ripgrep
|
||||||
|
|
@ -110,15 +93,20 @@
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
|
||||||
## nixos
|
## nixos
|
||||||
# nix-tree
|
nix-tree
|
||||||
# nix-init
|
#nix-init
|
||||||
# nix-index
|
#nix-index
|
||||||
# nixpkgs-review
|
#nixpkgs-review
|
||||||
# nix-output-monitor
|
#nix-output-monitor
|
||||||
|
|
||||||
## languages and libraries
|
## languages and libraries
|
||||||
rustup
|
#rustup
|
||||||
python313
|
#python313
|
||||||
|
|
||||||
|
## temporary/desktop
|
||||||
|
waybar
|
||||||
|
# gnome.gnome-keyring
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,15 +32,17 @@
|
||||||
# qt5-wayland
|
# qt5-wayland
|
||||||
# qt6-wayland
|
# qt6-wayland
|
||||||
# gnome-clocks
|
# gnome-clocks
|
||||||
|
pavucontrol
|
||||||
image-roll
|
image-roll
|
||||||
gnome.eog
|
gnome.eog
|
||||||
peaclock
|
peaclock
|
||||||
hyfetch
|
|
||||||
cmatrix
|
cmatrix
|
||||||
|
hyfetch
|
||||||
kitty
|
kitty
|
||||||
micro
|
micro
|
||||||
btop
|
btop
|
||||||
|
|
||||||
|
|
||||||
## multimedia & games
|
## multimedia & games
|
||||||
neural-amp-modeler-lv2
|
neural-amp-modeler-lv2
|
||||||
transmission-gtk
|
transmission-gtk
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
imports = [
|
imports = [
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
||||||
./disko-config.nix
|
# ./disko-config.nix
|
||||||
# ./network-configuration.nix
|
# ./network-configuration.nix
|
||||||
../../core/configuration.nix
|
../../core/configuration.nix
|
||||||
|
|
||||||
|
|
@ -18,30 +18,31 @@
|
||||||
canTouchEfiVariables = true;
|
canTouchEfiVariables = true;
|
||||||
efiSysMountPoint = "/boot/efi";
|
efiSysMountPoint = "/boot/efi";
|
||||||
};
|
};
|
||||||
systemd-boot = {
|
#systemd-boot = {
|
||||||
enable = false;
|
#enable = false;
|
||||||
configurationLimit = 10;
|
#configurationLimit = 10;
|
||||||
};
|
#};
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
efiSupport = true;
|
efiSupport = true;
|
||||||
#efiInstallAsRemovable = true;
|
#efiInstallAsRemovable = true;
|
||||||
device = "/dev/sda1";
|
device = "/dev/sdd";
|
||||||
|
useOSProber = true;
|
||||||
|
enableCryptodisk = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
initrd = {
|
initrd = {
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
secrets = {
|
secrets = {
|
||||||
"crypto_keyfile.bin" = null;
|
"/boot/crypto_keyfile.bin" = null;
|
||||||
};
|
};
|
||||||
luks = {
|
luks = {
|
||||||
# devices."luks-DISK_UUID" = {
|
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".keyFile = "/boot/crypto_keyfile.bin";
|
||||||
# device = "/dev/disk/by-uuid/DISK_UUID";
|
# device = "/dev/disk/by-uuid/DISK_UUID";
|
||||||
# keyfile = "/crypto_keyfile.bin";
|
# keyfile = "/crypto_keyfile.bin";
|
||||||
# };
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
services.fstrim.enable = true;
|
services.fstrim.enable = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,21 @@
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(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.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
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
|
# 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
|
# (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
|
# 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