mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting

Browse Source 
Signed-off-by: Michael Thomson <michael@michaelthomson.dev>
This commit is contained in:
Michael Thomson
2024-11-17 21:07:58 -05:00
parent f3e9f9e031
commit 5a9eafc05c
33 changed files with 310 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
hosts/dell/configuration.nix
View File

@@ -1,23 +1,25 @@
{ config, pkgs, inputs, ... }:
{
imports =
[
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.dell-xps-15-9560
../../modules/nixos/bootloader.nix
../../modules/nixos/user.nix
../../modules/nixos/i3.nix
../../modules/nixos/nvidia.nix
../../modules/nixos/nm.nix
../../modules/nixos/sound.nix
../../modules/nixos/env.nix
../../modules/nixos/1password.nix
];
config,
pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.dell-xps-15-9560
../../modules/nixos/bootloader.nix
../../modules/nixos/user.nix
../../modules/nixos/i3.nix
../../modules/nixos/nvidia.nix
../../modules/nixos/nm.nix
../../modules/nixos/sound.nix
../../modules/nixos/env.nix
../../modules/nixos/1password.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ];
boot.kernelParams = ["psmouse.synaptics_intertouch=0"];
networking.hostName = "dell";
@@ -27,7 +29,7 @@
nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [
wget
@@ -36,7 +38,7 @@
];
home-manager = {
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true;
useUserPackages = true;
users = {
@@ -45,5 +47,4 @@
};
system.stateVersion = "23.11";
}

44
hosts/dell/hardware-configuration.nix
View File

@@ -1,31 +1,35 @@
# 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" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/32F4-C54C";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/32F4-C54C";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b";}
];
# 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

8
hosts/dell/home.nix
View File

@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [
../../modules/home-manager/i3
../../modules/home-manager/ssh
@@ -34,7 +36,7 @@
lutris
pavucontrol
pasystray
networkmanagerapplet
networkmanagerapplet
upower
acpi
];

47
hosts/desktop/configuration.nix
View File

@@ -1,24 +1,26 @@
{ config, pkgs, inputs, ... }:
{
imports =
[
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/bootloader.nix
../../modules/nixos/user.nix
../../modules/nixos/ssh.nix
../../modules/nixos/bluetooth.nix
../../modules/nixos/nvidia.nix
../../modules/nixos/i3.nix
../../modules/nixos/nm.nix
../../modules/nixos/sound.nix
../../modules/nixos/steam.nix
../../modules/nixos/env.nix
../../modules/nixos/1password.nix
../../modules/nixos/postgres.nix
../../modules/nixos/docker.nix
];
config,
pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/bootloader.nix
../../modules/nixos/user.nix
../../modules/nixos/ssh.nix
../../modules/nixos/bluetooth.nix
../../modules/nixos/nvidia.nix
../../modules/nixos/i3.nix
../../modules/nixos/nm.nix
../../modules/nixos/sound.nix
../../modules/nixos/steam.nix
../../modules/nixos/env.nix
../../modules/nixos/1password.nix
../../modules/nixos/postgres.nix
../../modules/nixos/docker.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -30,7 +32,7 @@
nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [
wget
@@ -40,7 +42,7 @@
];
home-manager = {
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true;
useUserPackages = true;
users = {
@@ -49,5 +51,4 @@
};
system.stateVersion = "23.11";
}

42
hosts/desktop/hardware-configuration.nix
View File

@@ -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" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/FDF5-4C02";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/FDF5-4C02";
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

6
hosts/desktop/home.nix
View File

@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [
../../modules/home-manager/i3
../../modules/home-manager/ssh

18
hosts/macbook/configuration.nix
View File

@@ -1,10 +1,12 @@
{ config, pkgs, inputs, ... }:
{
imports =
[
inputs.home-manager.darwinModules.default
];
config,
pkgs,
inputs,
...
}: {
imports = [
inputs.home-manager.darwinModules.default
];
nixpkgs.hostPlatform = "aarch64-darwin";
nixpkgs.config.allowUnfree = true;
@@ -29,7 +31,7 @@
home = "/Users/mthomson";
};
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [
man-pages
@@ -46,7 +48,7 @@
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true;
useUserPackages = true;
users = {

6
hosts/macbook/home.nix
View File

@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [
../../modules/home-manager/git
../../modules/home-manager/nixvim

36
hosts/thinkpad/configuration.nix
View File

@@ -1,22 +1,24 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, inputs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220
../../modules/nixos/user.nix
../../modules/nixos/i3.nix
../../modules/nixos/nm.nix
../../modules/nixos/sound.nix
../../modules/nixos/env.nix
../../modules/nixos/1password.nix
];
config,
pkgs,
inputs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220
../../modules/nixos/user.nix
../../modules/nixos/i3.nix
../../modules/nixos/nm.nix
../../modules/nixos/sound.nix
../../modules/nixos/env.nix
../../modules/nixos/1password.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -32,7 +34,7 @@
nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [
wget
@@ -41,7 +43,7 @@
];
home-manager = {
extraSpecialArgs = { inherit inputs; };
extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true;
useUserPackages = true;
users = {

36
hosts/thinkpad/hardware-configuration.nix
View File

@@ -1,26 +1,30 @@
# 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 = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06";}
];
# 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
hosts/thinkpad/home.nix
View File

@@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [
../../modules/home-manager/i3
../../modules/home-manager/ssh