diff --git a/flake.nix b/flake.nix index 05083f4..b5865b1 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,8 @@ "linode" = machine "x86_64-linux" "linode"; + "jude" = machine "x86_64-linux" "jude"; + "iso" = machine "x86_64-linux" "iso"; }; diff --git a/hosts/jude/boot.nix b/hosts/jude/boot.nix new file mode 100644 index 0000000..65f8ae9 --- /dev/null +++ b/hosts/jude/boot.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + # Use the systemd-boot EFI boot loader. + #boot.loader.systemd-boot.enable = true; + boot.loader.grub.device = "/dev/nvme0n1"; + boot.loader.efi.canTouchEfiVariables = true; + networking.interfaces.enp4s0.useDHCP = true; +} diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix new file mode 100644 index 0000000..ad1dbca --- /dev/null +++ b/hosts/jude/default.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = [ + ./boot.nix + ./hardware-configuration.nix + ]; + networking.hostName = "jude"; + greg.gnome = true; +} diff --git a/hosts/jude/hardware-configuration.nix b/hosts/jude/hardware-configuration.nix new file mode 100644 index 0000000..8dbc6be --- /dev/null +++ b/hosts/jude/hardware-configuration.nix @@ -0,0 +1,24 @@ +# 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 = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/27ae91ed-32e9-411e-8227-0d99e360fbbf"; + fsType = "btrfs"; + }; + + swapDevices = [ ]; + + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/default.nix b/modules/default.nix index cddba76..27807ce 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,6 +3,7 @@ { imports = [ ./home.nix + ./gnome.nix ./linode.nix ./proxy.nix ./rpi4.nix diff --git a/modules/gnome.nix b/modules/gnome.nix new file mode 100644 index 0000000..a3b8575 --- /dev/null +++ b/modules/gnome.nix @@ -0,0 +1,36 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.greg.gnome; + +in with lib; { + options = { + greg.gnome = mkEnableOption "Enable my default Gnome3 setup"; + }; + + config = mkIf cfg { + # Sets up a basic Gnome installation + services.xserver = { + enable = true; + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + layout = "us"; + # Trackpad support + libinput.enable = true; + }; + + programs.dconf.enable = true; + programs.sway.enable = true; # Gives us Wayland + xdg.portal.wlr.enable = true; # Allows screen sharing in Wayland + + # Enable some Gnome plugins that I like + environment.systemPackages = with pkgs; [ + gnome3.adwaita-icon-theme + gnomeExtensions.appindicator + ]; + + services.udev.packages = with pkgs; [ + gnome3.gnome-settings-daemon + ]; + }; +} diff --git a/profiles/gnome.nix b/profiles/gnome.nix deleted file mode 100644 index d2fc077..0000000 --- a/profiles/gnome.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Sets up a basic Gnome installation - services.xserver = { - enable = true; - displayManager = { - gdm.enable = true; - gnome.enable = true; - }; - layout = "us"; - # Trackpad support - libinput.enable = true; - }; - - programs.dconf.enable = true; - - # Enable some Gnome plugins that I like - environment.systemPackages = with pkgs; [ - gnome3.adwaita-icon-theme - gnomeExtensions.appindicator - ]; - - services.udev.packages = with pkgs; [ - gnome3.gnome-settings-daemon - ]; -}