diff --git a/flake.nix b/flake.nix index 1c5e46b..ffdeab1 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,11 @@ inherit self; inherit nixpkgs; }; + vega = (import ./system/hosts/vega) { + inherit inputs; + inherit self; + inherit nixpkgs; + }; }; darwinConfigurations = { # Removed. See 133a3f82073f03e62cb3e7902c85fb3fc6292fe2 for when the diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix index 812be3a..492242f 100644 --- a/home-manager/features/linux-desktop.nix +++ b/home-manager/features/linux-desktop.nix @@ -7,7 +7,6 @@ ./nix.nix ./rofi/rofi.nix ../apps/element.nix - ../apps/eww ./terminal.nix ]; diff --git a/system/hosts/drew-desktop/drew.nix b/system/hosts/drew-desktop/drew.nix index 7dfb8cd..ae4d21d 100644 --- a/system/hosts/drew-desktop/drew.nix +++ b/system/hosts/drew-desktop/drew.nix @@ -6,6 +6,7 @@ "/features/gaming.nix" "/features/linux-desktop.nix" "/features/notes.nix" + "./eww" ]; home.stateVersion = "24.11"; diff --git a/home-manager/apps/eww/config/clock.yuck b/system/hosts/drew-desktop/eww/config/clock.yuck similarity index 100% rename from home-manager/apps/eww/config/clock.yuck rename to system/hosts/drew-desktop/eww/config/clock.yuck diff --git a/home-manager/apps/eww/config/eww.scss b/system/hosts/drew-desktop/eww/config/eww.scss similarity index 100% rename from home-manager/apps/eww/config/eww.scss rename to system/hosts/drew-desktop/eww/config/eww.scss diff --git a/home-manager/apps/eww/config/eww.yuck b/system/hosts/drew-desktop/eww/config/eww.yuck similarity index 100% rename from home-manager/apps/eww/config/eww.yuck rename to system/hosts/drew-desktop/eww/config/eww.yuck diff --git a/home-manager/apps/eww/config/launcher.yuck b/system/hosts/drew-desktop/eww/config/launcher.yuck similarity index 100% rename from home-manager/apps/eww/config/launcher.yuck rename to system/hosts/drew-desktop/eww/config/launcher.yuck diff --git a/home-manager/apps/eww/config/power-button.yuck b/system/hosts/drew-desktop/eww/config/power-button.yuck similarity index 100% rename from home-manager/apps/eww/config/power-button.yuck rename to system/hosts/drew-desktop/eww/config/power-button.yuck diff --git a/home-manager/apps/eww/config/primary-statusbar.yuck b/system/hosts/drew-desktop/eww/config/primary-statusbar.yuck similarity index 100% rename from home-manager/apps/eww/config/primary-statusbar.yuck rename to system/hosts/drew-desktop/eww/config/primary-statusbar.yuck diff --git a/home-manager/apps/eww/config/scripts/active-workspace.sh b/system/hosts/drew-desktop/eww/config/scripts/active-workspace.sh similarity index 100% rename from home-manager/apps/eww/config/scripts/active-workspace.sh rename to system/hosts/drew-desktop/eww/config/scripts/active-workspace.sh diff --git a/home-manager/apps/eww/config/scripts/audio-toolkit.sh b/system/hosts/drew-desktop/eww/config/scripts/audio-toolkit.sh similarity index 100% rename from home-manager/apps/eww/config/scripts/audio-toolkit.sh rename to system/hosts/drew-desktop/eww/config/scripts/audio-toolkit.sh diff --git a/home-manager/apps/eww/config/scripts/gpu-stats.sh b/system/hosts/drew-desktop/eww/config/scripts/gpu-stats.sh similarity index 100% rename from home-manager/apps/eww/config/scripts/gpu-stats.sh rename to system/hosts/drew-desktop/eww/config/scripts/gpu-stats.sh diff --git a/home-manager/apps/eww/config/scripts/workspaces.sh b/system/hosts/drew-desktop/eww/config/scripts/workspaces.sh similarity index 100% rename from home-manager/apps/eww/config/scripts/workspaces.sh rename to system/hosts/drew-desktop/eww/config/scripts/workspaces.sh diff --git a/home-manager/apps/eww/config/secondary-statusbar.yuck b/system/hosts/drew-desktop/eww/config/secondary-statusbar.yuck similarity index 100% rename from home-manager/apps/eww/config/secondary-statusbar.yuck rename to system/hosts/drew-desktop/eww/config/secondary-statusbar.yuck diff --git a/home-manager/apps/eww/config/system-monitor.yuck b/system/hosts/drew-desktop/eww/config/system-monitor.yuck similarity index 100% rename from home-manager/apps/eww/config/system-monitor.yuck rename to system/hosts/drew-desktop/eww/config/system-monitor.yuck diff --git a/home-manager/apps/eww/config/tokyonight-night.scss b/system/hosts/drew-desktop/eww/config/tokyonight-night.scss similarity index 100% rename from home-manager/apps/eww/config/tokyonight-night.scss rename to system/hosts/drew-desktop/eww/config/tokyonight-night.scss diff --git a/home-manager/apps/eww/config/vars.yuck b/system/hosts/drew-desktop/eww/config/vars.yuck similarity index 100% rename from home-manager/apps/eww/config/vars.yuck rename to system/hosts/drew-desktop/eww/config/vars.yuck diff --git a/home-manager/apps/eww/config/workspaces.yuck b/system/hosts/drew-desktop/eww/config/workspaces.yuck similarity index 100% rename from home-manager/apps/eww/config/workspaces.yuck rename to system/hosts/drew-desktop/eww/config/workspaces.yuck diff --git a/home-manager/apps/eww/default.nix b/system/hosts/drew-desktop/eww/default.nix similarity index 100% rename from home-manager/apps/eww/default.nix rename to system/hosts/drew-desktop/eww/default.nix diff --git a/system/hosts/vega/configuration.nix b/system/hosts/vega/configuration.nix index 0e5e9df..6b0b924 100644 --- a/system/hosts/vega/configuration.nix +++ b/system/hosts/vega/configuration.nix @@ -9,10 +9,6 @@ }: { - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "vega"; # Define your hostname. # Configure network proxy if necessary diff --git a/system/hosts/vega/hardware-configuration.nix b/system/hosts/vega/hardware-configuration.nix index dae24b3..829aa00 100644 --- a/system/hosts/vega/hardware-configuration.nix +++ b/system/hosts/vega/hardware-configuration.nix @@ -1,50 +1,31 @@ # 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, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; + # Bootloader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.useOSProber = true; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ata_piix" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/4981ad42-b108-4eb4-accb-b092813bd981"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5F99-043D"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" + swapDevices = + [ { device = "/dev/disk/by-uuid/f8868dce-6b32-45b7-bdf3-c9a34df1441d"; } ]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8"; - fsType = "ext4"; - }; - - 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 @@ -52,7 +33,7 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -88,13 +69,4 @@ nvidiaSettings = true; }; - # Add a udev rule to prevent the mouse from waking the system. Note that it - # has two entries depending on whether it's plugged in or not. - # Bus 001 Device 009: ID 046d:c539 Logitech, Inc. Lightspeed Receiver - # Bus 001 Device 015: ID 046d:c08d Logitech, Inc. G502 LIGHTSPEED Wireless Gaming Mouse - # Note: Still seem to require `sudo udevadm trigger` or reconnecting the device after the change. - services.udev.extraRules = '' - ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c539", ATTR{power/wakeup}="disabled" - ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c08d", ATTR{power/wakeup}="disabled" - ''; }