mira/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(common) formatting

Browse source
This commit is contained in:
Mira 2024-07-31 23:27:16 -04:00
parent 5e8895dc4d
commit 17e08d3a3b
7 changed files with 171 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common.nix
View file

@ -30,7 +30,7 @@ in {
};
nixpkgs = {
config = {
allowUnfree = true;
allowUnfree = true;
};
};
@ -101,7 +101,7 @@ in {
mira = {
isNormalUser = true;
group = "mira";
uid = 1000;
uid = 1000;
extraGroups = ["wheel" "docker" "dockremap" "audio"];
packages = with pkgs; [
firefox

36
flake.nix
View file

@ -74,26 +74,26 @@
];
};
orexin = nixos-unstable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
meta = {hostname = "orexin";};
};
modules = [
./common.nix
./orexin/configuration.nix
./orexin/hardware-configuration.nix
];
system = "x86_64-linux";
specialArgs = {
meta = {hostname = "orexin";};
};
modules = [
./common.nix
./orexin/configuration.nix
./orexin/hardware-configuration.nix
];
};
galanin = nixos-unstable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
meta = {hostname = "galanin";};
};
modules = [
./common.nix
./galanin/configuration.nix
./galanin/hardware-configuration.nix
];
system = "x86_64-linux";
specialArgs = {
meta = {hostname = "galanin";};
};
modules = [
./common.nix
./galanin/configuration.nix
./galanin/hardware-configuration.nix
];
};
gastrin = nixos-unstable.lib.nixosSystem {
system = "x86_64-linux";

78
galanin/configuration.nix
View file

@ -1,16 +1,18 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
# ./hardware-configuration.nix
];
config,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
# ./hardware-configuration.nix
];
# Use the systemd-boot EFI boot loader.
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -23,13 +25,12 @@
defaultGateway.address = "192.168.1.1";
};
# List packages installed in system profile. To search, run:
# $ nix search wget
# environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# ];
# List packages installed in system profile. To search, run:
# $ nix search wget
# environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# ];
users = {
users = {
@ -52,22 +53,22 @@
};
};
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.
programs = {
gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/etc/nixos/";
};
nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/etc/nixos/";
};
zsh.enable = true;
neovim = {
@ -75,7 +76,7 @@
configure = {
customRC = ''
set number relativenumber
'';
'';
};
defaultEditor = true;
@ -89,26 +90,25 @@
extraOptions = "--userns-remap=default";
liveRestore = false; # NOTE: Incompatible with swarm
};
# List services that you want to enable:
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
services.logind.lidSwitch = "ignore";
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
services.logind.lidSwitch = "ignore";
systemd.targets.sleep.enable = false;
systemd.targets.suspend.enable = false;
systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false;
system.stateVersion = "24.05"; # Did you read the comment?
}

64
galanin/hardware-configuration.nix
View file

@ -1,43 +1,47 @@
# 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 = [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81";
fsType = "btrfs";
options = [ "subvol=@" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81";
fsType = "btrfs";
options = ["subvol=@"];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81";
fsType = "btrfs";
options = [ "subvol=@home" ];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81";
fsType = "btrfs";
options = ["subvol=@home"];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81";
fsType = "btrfs";
options = [ "subvol=@nix" ];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/d857aa86-e441-4b4b-84d7-f718099c9d81";
fsType = "btrfs";
options = ["subvol=@nix"];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
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

1
gastrin/configuration.nix
View file

@ -122,7 +122,6 @@
liveRestore = false; # NOTE: Incompatible with swarm
};
programs = {
nh = {
enable = true;
clean.enable = true;

80
orexin/configuration.nix
View file

@ -1,16 +1,18 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
# ./hardware-configuration.nix
];
config,
lib,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
# ./hardware-configuration.nix
];
# Use the systemd-boot EFI boot loader.
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -23,13 +25,12 @@
defaultGateway.address = "192.168.1.1";
};
# List packages installed in system profile. To search, run:
# $ nix search wget
# environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# ];
# List packages installed in system profile. To search, run:
# $ nix search wget
# environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# ];
users = {
users = {
@ -52,22 +53,22 @@
};
};
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.
programs = {
gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/etc/nixos/";
};
nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/etc/nixos/";
};
zsh.enable = true;
neovim = {
@ -75,7 +76,7 @@
configure = {
customRC = ''
set number relativenumber
'';
'';
};
defaultEditor = true;
@ -89,25 +90,24 @@
extraOptions = "--userns-remap=default";
liveRestore = false; # NOTE: Incompatible with swarm
};
# List services that you want to enable:
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
services.logind.lidSwitch = "ignore";
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
services.logind.lidSwitch = "ignore";
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
systemd.targets.sleep.enable = false;
systemd.targets.suspend.enable = false;
systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
system.stateVersion = "24.05"; # Did you read the comment?
}

72
orexin/hardware-configuration.nix
View file

@ -1,49 +1,53 @@
# 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 = [ "xhci_pci" "ahci" "sd_mod" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/8fe40009-64b9-4f75-8cfe-d73560e3c7d0";
fsType = "btrfs";
options = [ "subvol=@" "noatime" "space_cache=v2" "compress=zstd"];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/8fe40009-64b9-4f75-8cfe-d73560e3c7d0";
fsType = "btrfs";
options = ["subvol=@" "noatime" "space_cache=v2" "compress=zstd"];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/8fe40009-64b9-4f75-8cfe-d73560e3c7d0";
fsType = "btrfs";
options = [ "subvol=@home" "noatime" "space_cache=v2" "compress=zstd"];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/8fe40009-64b9-4f75-8cfe-d73560e3c7d0";
fsType = "btrfs";
options = ["subvol=@home" "noatime" "space_cache=v2" "compress=zstd"];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/8fe40009-64b9-4f75-8cfe-d73560e3c7d0";
fsType = "btrfs";
options = [ "subvol=@nix" "noatime" "space_cache=v2" "compress=zstd"];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/8fe40009-64b9-4f75-8cfe-d73560e3c7d0";
fsType = "btrfs";
options = ["subvol=@nix" "noatime" "space_cache=v2" "compress=zstd"];
};
fileSystems."/data" =
{ device = "/dev/disk/by-uuid/d57652b7-5506-4cdd-8694-90bcd4810d7b";
fsType = "btrfs";
fileSystems."/data" = {
device = "/dev/disk/by-uuid/d57652b7-5506-4cdd-8694-90bcd4810d7b";
fsType = "btrfs";
options = ["noatime" "space_cache=v2" "compress=zstd"];
};
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8BA9-84E8";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/8BA9-84E8";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
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