mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests 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
No known key found for this signature in database
GPG Key ID: 8EFECCD347C72F7D
33 changed files with 310 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hosts/dell/configuration.nix
View File

@ -1,8 +1,10 @@
{ config, pkgs, inputs, ... }:
{
imports =
[
config,
pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.dell-xps-15-9560
@ -17,7 +19,7 @@
];
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";
}

32
hosts/dell/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 = [ "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";
fileSystems."/" = {
device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/32F4-C54C";
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

6
hosts/dell/home.nix
View File

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

15
hosts/desktop/configuration.nix
View File

@ -1,8 +1,10 @@
{ config, pkgs, inputs, ... }:
{
imports =
[
config,
pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/bootloader.nix
@ -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";
}

32
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";
fileSystems."/" = {
device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/FDF5-4C02";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/FDF5-4C02";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
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

14
hosts/macbook/configuration.nix
View File

@ -1,8 +1,10 @@
{ config, pkgs, inputs, ... }:
{
imports =
[
config,
pkgs,
inputs,
...
}: {
imports = [
inputs.home-manager.darwinModules.default
];
@ -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

16
hosts/thinkpad/configuration.nix
View File

@ -1,12 +1,14 @@
# 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.
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
@ -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 = {

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

@ -1,25 +1,29 @@
# 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";
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

6
hosts/thinkpad/home.nix
View File

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

16
modules/home-manager/email/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
home.packages = with pkgs; [
w3m
];
@ -114,11 +116,11 @@
vdirsyncer = {
enable = true;
auth = "basic";
collections = [ "default" "shared" ];
collections = ["default" "shared"];
};
khal = {
enable = true;
addresses = [ "michael@michaelthomson.dev" ];
addresses = ["michael@michaelthomson.dev"];
type = "discover";
};
};
@ -142,12 +144,12 @@
vdirsyncer = {
enable = true;
auth = "basic";
collections = [ "default" ];
collections = ["default"];
};
khal = {
enable = true;
addresses = [ "michael@michaelthomson.dev" ];
collections = [ "default" ];
addresses = ["michael@michaelthomson.dev"];
collections = ["default"];
};
};
};

6
modules/home-manager/git/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.git = {
enable = true;
userName = "Michael Thomson";

6
modules/home-manager/i3/default.nix
View File

@ -1,5 +1,7 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
home.file.".config/i3/config".source = ./config;
}

6
modules/home-manager/kitty/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.kitty = {
enable = true;
font = {

9
modules/home-manager/nixvim/default.nix
View File

@ -1,6 +1,9 @@
{ inputs, pkgs, config, ... }:
{
inputs,
pkgs,
config,
...
}: {
imports = [
inputs.nixvim.homeManagerModules.nixvim
];
@ -234,7 +237,7 @@
enable = true;
settings = {
formatting = {
command = [ "alejandra" ];
command = ["alejandra"];
};
options = {
nix-darwin = {

0
modules/home-manager/nixvim/plugins/treesitter.nix
View File

8
modules/home-manager/password-store/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
home.packages = with pkgs; [
pinentry-curses
];
@ -11,7 +13,7 @@
};
password-store = {
enable = true;
package = pkgs.pass.withExtensions (exts: [ exts.pass-otp exts.pass-file exts.pass-import ]);
package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-file exts.pass-import]);
settings = {
PASSWORD_STORE_DIR = "\${HOME}/.password-store";
};

6
modules/home-manager/ssh/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.ssh = {
enable = true;
};

6
modules/home-manager/syncthing/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
services = {
syncthing = {
enable = true;

6
modules/home-manager/taskwarrior/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs = {
taskwarrior = {
enable = true;

8
modules/home-manager/tmux/default.nix
View File

@ -1,8 +1,10 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}:
# TODO: Remove the default shell and default-command once tmux sensibleOnTop fixes their shit
# ref: https://github.com/nix-community/home-manager/issues/5952
{
programs = {
tmux = {

6
modules/home-manager/wezterm/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.wezterm = {
enable = true;
extraConfig = ''

6
modules/home-manager/zathura/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs = {
zathura = {
enable = true;

6
modules/home-manager/zoxide/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs = {
zoxide = {
enable = true;

7
modules/home-manager/zsh/default.nix
View File

@ -1,7 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs = {
fzf = {
enable = true;

2
modules/nixos/1password.nix
View File

@ -3,7 +3,7 @@
_1password.enable = true;
_1password-gui = {
enable = true;
polkitPolicyOwners = [ "mthomson" ];
polkitPolicyOwners = ["mthomson"];
};
};
}

1
modules/nixos/bluetooth.nix
View File

@ -3,4 +3,3 @@
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
services.blueman.enable = true;
}

6
modules/nixos/i3.nix
View File

@ -1,7 +1,5 @@
{ pkgs, ... }:
{
environment.pathsToLink = [ "/libexec" ];
{pkgs, ...}: {
environment.pathsToLink = ["/libexec"];
services.xserver = {
enable = true;

4
modules/nixos/nix-ld.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [];
}

8
modules/nixos/nvidia.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
hardware.opengl = {
enable = true;
};
@ -10,5 +12,5 @@
hardware.nvidia.open = false;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.videoDrivers = ["nvidia"];
}

6
modules/nixos/postgres.nix
View File

@ -1,9 +1,7 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.postgresql = {
enable = true;
ensureDatabases = [ "mydatabase" ];
ensureDatabases = ["mydatabase"];
enableTCPIP = true;
port = 5432;
authentication = pkgs.lib.mkOverride 10 ''

7
modules/nixos/user.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.zsh.enable = true;
nix.settings = {
@ -16,12 +14,11 @@
];
};
users.users.mthomson = {
shell = pkgs.zsh;
isNormalUser = true;
description = "Michael Thomson";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [];
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqLd5MRSD5GdVmFOgKGRq8t/I8I9xjH2gRMmNHSqtSPYWFx8xT8uOfwyHx1um73tMg99jb4LCs+OpTaTdEyitFygxF/UdSYvAwzP+Lg4p7n6vLljmt0V1i5Zbct3oPM5CKXsUaRZkNyJxB5gJEXe/wKQ3+xj59HV3+m6uw9MO72sI5PKSFIKQFA2LTCYkA2NfO+/VtrLwopcZ+fvIutdUgmaltA3ESWCglocQ+EDXFsdO/h2KUFN6sereT+EBVPC0ePbxWpT9gHZlpeHyPPDnDuj1lUYQisTVKiaRnyFk6FyLYyxquqk+kHX0vSGD/+tBQ/+NoE/ckp2XvjrM48M3+LqtTcOi5RnTHZFuP9NgKxUQyCGOntocNVJ50puLWgr1joFUdHABo3Xjaik0np0FL5QsfYFbNxY6x94OWUxYFUu+/ZRLMWhA3qab6+FcYo4nYB+VszNYv0kE0Lo0jk9EjACoDc/omS0i5P38wvMekwkE2k54U8CkkE+zB3gXtCATE+kN9/ueOy5W4xHhvnoRmMpFza2xO3LPIVB8mVTUiBRfwgz2+psb/AHQwsmORS9BzfA8QdaM1kbbmZo1F1iw8+m1ZCatos2xkcWgMwKfiT2224hZ7DsM+DAZ4IYQzxT7OBYknh7lX3kQeeficqF3Dlg2QLuAlOdnDqb2xyCSDyQ== mthomson"