formatting

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

View File

@ -1,8 +1,10 @@
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.dell-xps-15-9560 inputs.nixos-hardware.nixosModules.dell-xps-15-9560
@ -45,5 +47,4 @@
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View File

@ -1,11 +1,15 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") 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.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
@ -13,18 +17,18 @@
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7"; device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/32F4-C54C"; device = "/dev/disk/by-uuid/32F4-C54C";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b"; } {device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b";}
]; ];
# 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

View File

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

View File

@ -1,8 +1,10 @@
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
../../modules/nixos/bootloader.nix ../../modules/nixos/bootloader.nix
@ -49,5 +51,4 @@
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View File

@ -1,11 +1,15 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod"];
@ -13,13 +17,13 @@
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c"; device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/FDF5-4C02"; device = "/dev/disk/by-uuid/FDF5-4C02";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
}; };

View File

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

View File

@ -1,8 +1,10 @@
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ pkgs,
inputs,
...
}: {
imports = [
inputs.home-manager.darwinModules.default inputs.home-manager.darwinModules.default
]; ];

View File

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

View File

@ -1,12 +1,14 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. pkgs,
inputs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220 inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220

View File

@ -1,11 +1,15 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"];
@ -13,13 +17,13 @@
boot.kernelModules = []; boot.kernelModules = [];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc"; device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06"; } {device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06";}
]; ];
# 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

View File

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

View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
w3m w3m
]; ];

View File

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

View File

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

View File

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

View File

@ -1,6 +1,9 @@
{ inputs, pkgs, config, ... }:
{ {
inputs,
pkgs,
config,
...
}: {
imports = [ imports = [
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
]; ];

View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
pinentry-curses pinentry-curses
]; ];

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = ["mydatabase"]; ensureDatabases = ["mydatabase"];

View File

@ -1,6 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.zsh.enable = true; programs.zsh.enable = true;
nix.settings = { nix.settings = {
@ -16,7 +14,6 @@
]; ];
}; };
users.users.mthomson = { users.users.mthomson = {
shell = pkgs.zsh; shell = pkgs.zsh;
isNormalUser = true; isNormalUser = true;