diff --git a/blue/hardware-configuration.nix b/blue/hardware-configuration.nix index e5f834c..45e2bad 100644 --- a/blue/hardware-configuration.nix +++ b/blue/hardware-configuration.nix @@ -1,57 +1,61 @@ # 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 = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; - fsType = "btrfs"; - options = [ "subvol=root" "compress=zstd" "noatime" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; + fsType = "btrfs"; + options = ["subvol=root" "compress=zstd" "noatime"]; + }; boot.initrd.luks.devices."enc_root".device = "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f"; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; - fsType = "btrfs"; - options = [ "subvol=home" "compress=zstd" "noatime" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; + fsType = "btrfs"; + options = ["subvol=home" "compress=zstd" "noatime"]; + }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress=zstd" "noatime" ]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; + fsType = "btrfs"; + options = ["subvol=nix" "compress=zstd" "noatime"]; + }; - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; - fsType = "btrfs"; - options = [ "subvol=log" "compress=zstd" "noatime" ]; - neededForBoot = true; - }; + fileSystems."/var/log" = { + device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; + fsType = "btrfs"; + options = ["subvol=log" "compress=zstd" "noatime"]; + neededForBoot = true; + }; - fileSystems."/persist" = - { device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; - fsType = "btrfs"; - options = [ "subvol=persist" "compress=zstd" "noatime" ]; - }; + fileSystems."/persist" = { + device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; + fsType = "btrfs"; + options = ["subvol=persist" "compress=zstd" "noatime"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6C85-D29B"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6C85-D29B"; + fsType = "vfat"; + }; - swapDevices = [ ]; + swapDevices = []; # 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/flake.nix b/flake.nix index f80b6c0..b67fc31 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { description = "NixOS configuration"; - inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/home/sway.nix b/home/sway.nix index 5055880..0603e5e 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -39,15 +39,15 @@ */ }; - HDMI-A-4 = { - res = "1920x1080"; - }; + HDMI-A-4 = { + res = "1920x1080"; + }; }; input = { - "type:keyboard" = { repeat_delay = "150"; }; - "type:keyboard" = { repeat_rate = "70"; }; - "type:touchpad" = { tap = "enabled"; }; + "type:keyboard" = {repeat_delay = "150";}; + "type:keyboard" = {repeat_rate = "70";}; + "type:touchpad" = {tap = "enabled";}; }; bars = [ diff --git a/nixy/configuration.nix b/nixy/configuration.nix index 1428810..a1e7070 100644 --- a/nixy/configuration.nix +++ b/nixy/configuration.nix @@ -136,7 +136,7 @@ wantedBy = ["multi-user.target"]; serviceConfig.Nice = -20; script = '' - sleep 1 + sleep 1 ${zremap.defaultPackage.x86_64-linux}/bin/zremap \ /dev/input/by-path/platform-i8042-serio-0-event-kbd '';