diff --git a/flake.nix b/flake.nix index dfad36a..1e6978c 100644 --- a/flake.nix +++ b/flake.nix @@ -24,24 +24,7 @@ in rec { laptop = false; }; }; - modules = [ - ./nixos/default.nix - home-manager.nixosModule - ]; - }; - lucy = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit stateVersion; - hostname = "lucy"; - username = "ephase"; - hostConfig = { - gaming = false; - desktop = true; - laptop = true; - }; - }; - modules = [ + modules = [ ./nixos/default.nix home-manager.nixosModule ]; diff --git a/hosts/lucy/hardware-configuration.nix b/hosts/lucy/hardware-configuration.nix deleted file mode 100644 index 5b5fb11..0000000 --- a/hosts/lucy/hardware-configuration.nix +++ /dev/null @@ -1,54 +0,0 @@ -# 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") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" "i915" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" "i915" ]; - boot.extraModulePackages = [ ]; - - boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/ee06e049-e738-4f1f-84ab-e8066e0f1640"; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/97c3403a-fdad-4dc8-a103-a666d5fd8d6c"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/97c3403a-fdad-4dc8-a103-a666d5fd8d6c"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/97c3403a-fdad-4dc8-a103-a666d5fd8d6c"; - fsType = "btrfs"; - options = [ "subvol=nix" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B77A-53B1"; - fsType = "vfat"; - }; - - 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/modules/home/desktop/sway/kanshi.nix b/modules/home/desktop/sway/kanshi.nix index 00d29fa..cf6ef7a 100644 --- a/modules/home/desktop/sway/kanshi.nix +++ b/modules/home/desktop/sway/kanshi.nix @@ -1,5 +1,5 @@ _: { - services.kanshi = { + service.kanshi = { enable = true; profiles = { home = { @@ -8,14 +8,14 @@ _: { criteria = "Iiyama North America PL2792UH 1166310803122"; mode = "3840x2160"; position = "0,0"; - scale = 2.0; + scale = 2; } { criteria = "Iiyama North America PL2792UH 1176923201598"; mode = "3840x2160"; position = "1920,0"; transform = "270"; - scale = 2.0; + scale = "2"; } { criteria = "eDP-1";