diff --git a/hosts/hebesu/hardware-configuration.nix b/hosts/hebesu/hardware-configuration.nix index f7ea762..a9c8d0b 100644 --- a/hosts/hebesu/hardware-configuration.nix +++ b/hosts/hebesu/hardware-configuration.nix @@ -1,39 +1,43 @@ # 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" "xhci_pci" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/e9de5286-c8b1-4629-be01-f052c34b4062"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/e9de5286-c8b1-4629-be01-f052c34b4062"; + fsType = "ext4"; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/aa592b0f-13bd-4ae6-af3f-68a8f76f65ae"; - fsType = "ext4"; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/aa592b0f-13bd-4ae6-af3f-68a8f76f65ae"; + fsType = "ext4"; + }; boot.initrd.luks.devices."drive".device = "/dev/disk/by-uuid/60d5cc58-4381-4869-a1b5-d4e2bf1afdfd"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F0F5-744F"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/F0F5-744F"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/2d015dcd-81a0-4d81-b530-5ea96aa0d953"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/2d015dcd-81a0-4d81-b530-5ea96aa0d953";} + ]; # 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/system/configuration.nix b/system/configuration.nix index 84677a7..1e09b3a 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -19,7 +19,7 @@ networking.networkmanager.enable = true; environment.systemPackages = with pkgs; [ - (neovim.override { withRuby = false; }) + (neovim.override {withRuby = false;}) wget tree tmux diff --git a/user/autostart.nix b/user/autostart.nix index 7894ef6..bf408b4 100644 --- a/user/autostart.nix +++ b/user/autostart.nix @@ -1,4 +1,8 @@ -{pkgs, pkgs-stable, ...}: { +{ + pkgs, + pkgs-stable, + ... +}: { systemd.user.targets.autostart = { Unit = { Wants = [ diff --git a/user/options.nix b/user/options.nix index 477c007..bb06847 100644 --- a/user/options.nix +++ b/user/options.nix @@ -1,4 +1,8 @@ -{config, lib, ...}: { +{ + config, + lib, + ... +}: { options.u = { confPath = lib.mkOption { type = lib.types.path; diff --git a/user/packages.nix b/user/packages.nix index 3372862..8985c6c 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -93,18 +93,23 @@ ghidra-bin pwninit patchelf - (let base = pkgs.appimageTools.defaultFhsEnvArgs; in - pkgs.buildFHSUserEnv (base // { - name = "fhs"; - targetPkgs = pkgs: - (base.targetPkgs pkgs) ++ (with pkgs; [ - pkg-config - ncurses - ] - ); - profile = "export FHS=1"; - runScript = "bash"; - extraOutputsToInstall = ["dev"]; - })) + (let + base = pkgs.appimageTools.defaultFhsEnvArgs; + in + pkgs.buildFHSUserEnv (base + // { + name = "fhs"; + targetPkgs = pkgs: + (base.targetPkgs pkgs) + ++ ( + with pkgs; [ + pkg-config + ncurses + ] + ); + profile = "export FHS=1"; + runScript = "bash"; + extraOutputsToInstall = ["dev"]; + })) ]; }