diff options
| -rw-r--r-- | home/profiles/development/default.nix | 12 | ||||
| -rw-r--r-- | nixos/haruka/configuration.nix | 2 | ||||
| -rw-r--r-- | nixos/haruka/hardware-configuration.nix | 21 |
3 files changed, 20 insertions, 15 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index b0988c3..60ab329 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -206,12 +206,12 @@ in (pkgs.writeShellScriptBin "ec" "emacsclient -cna emacs $@") # Emacsclient with 24bit colours fix for foot (pkgs.writeShellScriptBin "e" '' - if [[ "$TERM" == "foot" ]]; then - eprefix="TERM=foot-emacs" - elif [[ "$TERM" == "foot-direct" ]]; then - eprefix="TERM=foot-direct-emacs" - fi - eval "$eprefix emacsclient -ta emacs $@" + if [[ "$TERM" == "foot" ]]; then + eprefix="TERM=foot-emacs" + elif [[ "$TERM" == "foot-direct" ]]; then + eprefix="TERM=foot-direct-emacs" + fi + eval "$eprefix emacsclient -ta emacs $@" '') pkgs.bfg-repo-cleaner diff --git a/nixos/haruka/configuration.nix b/nixos/haruka/configuration.nix index c6aecdc..41dfc4a 100644 --- a/nixos/haruka/configuration.nix +++ b/nixos/haruka/configuration.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - imports = [ ]; + imports = [ ]; security = { rtkit.enable = true; diff --git a/nixos/haruka/hardware-configuration.nix b/nixos/haruka/hardware-configuration.nix index d4b89d1..06a342f 100644 --- a/nixos/haruka/hardware-configuration.nix +++ b/nixos/haruka/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" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; @@ -14,33 +15,37 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "rpool/local/root"; + { + device = "rpool/local/root"; fsType = "zfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5382-69DE"; + { + device = "/dev/disk/by-uuid/5382-69DE"; fsType = "vfat"; }; fileSystems."/nix" = - { device = "rpool/local/nix"; + { + device = "rpool/local/nix"; fsType = "zfs"; }; fileSystems."/home" = - { device = "rpool/safe/home"; + { + device = "rpool/safe/home"; fsType = "zfs"; }; fileSystems."/persist" = - { device = "rpool/safe/persist"; + { + device = "rpool/safe/persist"; fsType = "zfs"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/88f5f850-d91c-4eba-be16-944717e9d24d"; } - ]; + [{ device = "/dev/disk/by-uuid/88f5f850-d91c-4eba-be16-944717e9d24d"; }]; # 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 |