refactor: clean up
This commit is contained in:
parent
45c4e136c4
commit
630b3ce27b
25 changed files with 195 additions and 210 deletions
|
@ -1,30 +1,34 @@
|
|||
# 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, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/e5005ea6-6c5a-4ab3-9767-ce7772582024";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/e5005ea6-6c5a-4ab3-9767-ce7772582024";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/6BBE-0E70";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/6BBE-0E70";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
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
|
||||
|
|
6
systems/modules/bootloaders/extlinux.nix
Normal file
6
systems/modules/bootloaders/extlinux.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
|
||||
boot.loader.grub.enable = false;
|
||||
# Enables the generation of /boot/extlinux/extlinux.conf
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
}
|
|
@ -5,12 +5,11 @@
|
|||
extraGroups = ["networkmanager" "wheel"];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILv8HqazE294YdyGaXK6q2EniDlTpGaUL071kk9+W0GJ rafiq@nemesis"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICbZfOYt6zydLyO4f9JAsxb1i6kHAjYzqa0SOqef6MKM rafiq@orpheus"
|
||||
];
|
||||
};
|
||||
|
||||
security.sudo = {
|
||||
wheelNeedsPassword = false;
|
||||
};
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
# Enable basic fonts for reasonable Unicode coverage
|
||||
fonts.enableDefaultPackages = true;
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
{ pkgs, config, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
fonts.packages = with pkgs; [
|
||||
nerd-fonts.terminess-ttf
|
||||
nerd-fonts.terminess-ttf
|
||||
];
|
||||
stylix.fonts = {
|
||||
serif = config.stylix.fonts.monospace;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ pkgs, ... }: {
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
{pkgs, ...}: {
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
|
|
|
@ -6,17 +6,15 @@
|
|||
imports = [
|
||||
./programs/tailscale.nix
|
||||
];
|
||||
|
||||
|
||||
networking = {
|
||||
# Enable networkManager
|
||||
# TODO: Look into the networkManager options.
|
||||
networkmanager.enable = true;
|
||||
|
||||
# Configures a simple stateful firewall.
|
||||
# By default, it doesn't allow any incoming connections.
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
22 # SSH
|
||||
];
|
||||
allowedUDPPorts = [];
|
||||
|
@ -26,17 +24,16 @@
|
|||
# Add binary caches to avoid having to compile them
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://hyprland.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://hyprland.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
|
||||
# TODO: look into openssh and tailscale settings.
|
||||
services.openssh.enable = true;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
{ inputs, pkgs, ... }: {
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.uwsm = {
|
||||
enable = false;
|
||||
};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ inputs, ... }: {
|
||||
imports = [
|
||||
{inputs, ...}: {
|
||||
imports = [
|
||||
inputs.stylix.nixosModules.stylix
|
||||
./themes/catppuccin.nix
|
||||
./fonts/terminess.nix
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
|
||||
}
|
||||
|
|
|
@ -3,15 +3,13 @@
|
|||
./hw-nemesis.nix
|
||||
./modules/bootloaders/systemd-boot.nix
|
||||
./modules/common.nix
|
||||
./modules/desktop.nix
|
||||
./modules/hardware/nvidia.nix
|
||||
./modules/networking.nix
|
||||
./modules/desktop.nix
|
||||
./modules/stylix.nix
|
||||
];
|
||||
|
||||
networking.hostName = "nemesis";
|
||||
|
||||
boot.binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows" "aarch64-linux"];
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
boot.binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows" "aarch64-linux"];
|
||||
}
|
||||
|
|
|
@ -1,25 +1,14 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{inputs, ...}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hw-orpheus.nix
|
||||
./modules/bootloaders/extlinux.nix
|
||||
./modules/common.nix
|
||||
./modules/networking.nix
|
||||
./modules/stylix.nix
|
||||
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||
"${inputs.nixpkgs}/nixos/modules/profiles/minimal.nix"
|
||||
];
|
||||
|
||||
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
|
||||
boot.loader.grub.enable = false;
|
||||
# Enables the generation of /boot/extlinux/extlinux.conf
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
|
||||
networking.hostName = "orpheus"; # Define your hostname.
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
|
||||
services.openssh.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
networking.hostName = "orpheus";
|
||||
system.stateVersion = "25.05";
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue