From 361d0c8df8aff4a9956ccae4ede8fac924e47bf4 Mon Sep 17 00:00:00 2001 From: CDaut Date: Thu, 18 Apr 2024 10:15:25 +0200 Subject: [PATCH] nix in vscode and reformatting files --- configuration.nix | 12 ++++++------ hardware_configuration.nix | 9 ++++++--- home.nix | 1 + programm_configs/git.nix | 6 +++--- programm_configs/vscode.nix | 1 + programm_configs/yubikey-gpg.nix | 2 +- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4a8417a..4b7903d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,7 +7,7 @@ ]; # Bootloader. - boot.loader = { + boot.loader = { efi.canTouchEfiVariables = true; grub = { enable = true; @@ -17,9 +17,9 @@ }; }; - boot.initrd.kernelModules = ["amdgpu"]; - - services.hardware.bolt.enable = true; + boot.initrd.kernelModules = [ "amdgpu" ]; + + services.hardware.bolt.enable = true; networking.hostName = "nixpad"; # Define your hostname. @@ -55,7 +55,7 @@ defaultSession = "none+i3"; setupCommands = '' ${pkgs.xorg.xrandr}/bin/xrandr --output eDP-1 --mode 3840x2160; - ''; + ''; }; windowManager.i3 = { @@ -70,7 +70,7 @@ desktopManager.wallpaper.mode = "fill"; }; - imports = [ + imports = [ ./programm_configs/yubikey-gpg.nix ]; diff --git a/hardware_configuration.nix b/hardware_configuration.nix index c9932c3..9cd2df8 100644 --- a/hardware_configuration.nix +++ b/hardware_configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; @@ -14,14 +15,16 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/9acc939a-f9d8-4e3b-a3b2-a90752de8ce7"; + { + device = "/dev/disk/by-uuid/9acc939a-f9d8-4e3b-a3b2-a90752de8ce7"; fsType = "ext4"; }; boot.initrd.luks.devices."luks-38517f01-1bef-4603-bcfe-8c66124dc32a".device = "/dev/disk/by-uuid/38517f01-1bef-4603-bcfe-8c66124dc32a"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F0FA-6F3D"; + { + device = "/dev/disk/by-uuid/F0FA-6F3D"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/home.nix b/home.nix index 85a9043..9e53908 100644 --- a/home.nix +++ b/home.nix @@ -47,6 +47,7 @@ in signal-desktop redshift nextcloud-client + nixpkgs-fmt ]; # dotfiles diff --git a/programm_configs/git.nix b/programm_configs/git.nix index 2a6ecb7..e4783bf 100644 --- a/programm_configs/git.nix +++ b/programm_configs/git.nix @@ -1,11 +1,11 @@ -{pkgs, ...}: { +{ pkgs, ... }: { programs.git = { enable = true; - userName = "CDaut"; + userName = "CDaut"; userEmail = "git@cdaut.de"; signing = { signByDefault = true; key = "58EF8D71114EF548DEE3320DE6F04916B6EEBD83"; }; }; -} \ No newline at end of file +} diff --git a/programm_configs/vscode.nix b/programm_configs/vscode.nix index 41b34b2..824c38a 100644 --- a/programm_configs/vscode.nix +++ b/programm_configs/vscode.nix @@ -6,6 +6,7 @@ extensions = with pkgs.vscode-extensions; [ bbenoist.nix james-yu.latex-workshop + jnoortheen.nix-ide ]; }; } \ No newline at end of file diff --git a/programm_configs/yubikey-gpg.nix b/programm_configs/yubikey-gpg.nix index 0701a4c..2e09646 100644 --- a/programm_configs/yubikey-gpg.nix +++ b/programm_configs/yubikey-gpg.nix @@ -21,4 +21,4 @@ export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ''; -} \ No newline at end of file +}