From 20387cd34a8519da4f4195d6581e8e973351dc45 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Mon, 25 Mar 2024 00:11:55 -0500 Subject: [PATCH] formattting --- hosts/archlaptop/hardware-configuration.nix | 44 ++++++++++--------- hosts/gabe-workstation.nix | 2 +- modules/home-manager/kittty/kitty.nix | 10 ++--- .../home-manager/terminal/nvim/lsp/clangd.nix | 2 +- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/hosts/archlaptop/hardware-configuration.nix b/hosts/archlaptop/hardware-configuration.nix index 50c2ae3..e3c5a38 100644 --- a/hosts/archlaptop/hardware-configuration.nix +++ b/hosts/archlaptop/hardware-configuration.nix @@ -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 + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/1000b969-f089-4b1e-bbef-3d0c39da8a91"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/1000b969-f089-4b1e-bbef-3d0c39da8a91"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/AB75-97AD"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/AB75-97AD"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/506f2ef4-c9ee-4fe6-8590-95e0821d5903"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/506f2ef4-c9ee-4fe6-8590-95e0821d5903";} + ]; # 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 diff --git a/hosts/gabe-workstation.nix b/hosts/gabe-workstation.nix index 1f60d05..099cba4 100644 --- a/hosts/gabe-workstation.nix +++ b/hosts/gabe-workstation.nix @@ -4,8 +4,8 @@ lib, ... }: { + # machine specific options host = { - # machine specific options enable-speech = true; nvim = { enable-lsp = true; diff --git a/modules/home-manager/kittty/kitty.nix b/modules/home-manager/kittty/kitty.nix index 2db0d22..1212600 100644 --- a/modules/home-manager/kittty/kitty.nix +++ b/modules/home-manager/kittty/kitty.nix @@ -5,11 +5,11 @@ ... }: { programs.kitty = { - enable=true; - font={ - package=pkgs.fira-code-nerdfont; - name="Fira Code"; + enable = true; + font = { + package = pkgs.fira-code-nerdfont; + name = "Fira Code"; }; - theme="Gruvbox Dark"; + theme = "Gruvbox Dark"; }; } diff --git a/modules/home-manager/terminal/nvim/lsp/clangd.nix b/modules/home-manager/terminal/nvim/lsp/clangd.nix index d91195d..1f70a4b 100644 --- a/modules/home-manager/terminal/nvim/lsp/clangd.nix +++ b/modules/home-manager/terminal/nvim/lsp/clangd.nix @@ -28,7 +28,7 @@ BreakBeforeBinaryOperators: NonAssignment ... ''; - "work/.clang-format" = lib.mkIf config.host.git.workProfile.enable{ + "work/.clang-format" = lib.mkIf config.host.git.workProfile.enable { text = '' --- #this syncronizes with settings used by neovims treesitters so that the lsp formatting and treesitter formatting do not fight eatch other.