Formatted everything using nixfmt.

This commit is contained in:
James Patrick 2021-11-28 17:20:10 -05:00
parent caaeb92c4a
commit f6553b9b0c
7 changed files with 30 additions and 54 deletions

View File

@ -5,8 +5,7 @@ let
url = "https://github.com/jamesepatrick.keys"; url = "https://github.com/jamesepatrick.keys";
sha256 = "sha256-6NGBLNPcvsvCTa7UC3H3r9n8dKAHobINK5pxxm94nTM="; sha256 = "sha256-6NGBLNPcvsvCTa7UC3H3r9n8dKAHobINK5pxxm94nTM=";
}; };
in in {
{
# Allow Cleanup, nix, & flakes # Allow Cleanup, nix, & flakes
nix = { nix = {
autoOptimiseStore = true; autoOptimiseStore = true;
@ -39,7 +38,7 @@ in
}; };
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users ={ users.users = {
root.initialPassword = "nixos"; root.initialPassword = "nixos";
james = { james = {
description = "James Patrick"; description = "James Patrick";
@ -52,12 +51,7 @@ in
}; };
# These are the most basic tools I need. # These are the most basic tools I need.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ nixfmt git gnumake vim zsh ];
git
gnumake
vim
zsh
];
networking = { networking = {
firewall = { firewall = {

View File

@ -26,7 +26,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = {allowUnfree = true;}; config = { allowUnfree = true; };
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {

View File

@ -11,15 +11,7 @@
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [ emacs wofi i3 zsh kitty tmux ];
emacs
firefox
wofi
i3
zsh
kitty
tmux
];
# This value determines the Home Manager release that your # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # configuration is compatible with. This helps avoid breakage

View File

@ -34,38 +34,34 @@
"cryptd" "cryptd"
]; ];
hardware.firmware = [ hardware.firmware = [ pkgs.rtw89-firmware ];
pkgs.rtw89-firmware
];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ config.boot.kernelPackages.rtw89 ]; boot.extraModulePackages = [ config.boot.kernelPackages.rtw89 ];
boot.supportedFilesystems = ["zfs"]; boot.supportedFilesystems = [ "zfs" ];
boot.initrd.luks.devices."crypt" = boot.initrd.luks.devices."crypt" = {
{ device = "/dev/disk/by-partlabel/crypt"; device = "/dev/disk/by-partlabel/crypt";
preLVM = true; preLVM = true;
}; };
fileSystems."/" = fileSystems."/" = {
{ device = "rpool/root/nixos"; device = "rpool/root/nixos";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "rpool/home"; device = "rpool/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-partlabel/boot"; device = "/dev/disk/by-partlabel/boot";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [{ device = "/dev/partitions/swap"; }];
[ { device = "/dev/partitions/swap"; }
];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

View File

@ -1,5 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }: {
{
programs.sway = { programs.sway = {
enable = true; enable = true;
wrapperFeatures.gtk = true; # so that gtk works properly wrapperFeatures.gtk = true; # so that gtk works properly

View File

@ -1,8 +1,5 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }: {
{ imports = [ ./graphical.nix ];
imports = [
./graphical.nix
];
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
users.users.james.extraGroups = [ "networkmanager" ]; users.users.james.extraGroups = [ "networkmanager" ];

View File

@ -1,6 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }: {
{
boot = { boot = {
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
zfs = { zfs = {