diff --git a/boxes/mainsail/default.nix b/boxes/mainsail/default.nix index d17b946..0a90333 100644 --- a/boxes/mainsail/default.nix +++ b/boxes/mainsail/default.nix @@ -56,7 +56,8 @@ }; users.users.usr.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbhM3wj0oqjR3pUaZgpfX4Xo4dlzvBTbQ48zHyg7Pwx usr" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbhM3wj0oqjR3pUaZgpfX4Xo4dlzvBTbQ48zHyg7Pwx usr" # x230t + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2xUbQw9+RCPVw7qCFm4NNCP/MpS2BIArcwMv0KdKOI usr" # mlg ]; system.stateVersion = "23.11"; diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix index fd22d23..b057c63 100644 --- a/boxes/mlg/default.nix +++ b/boxes/mlg/default.nix @@ -26,6 +26,7 @@ libreoffice nomacs vscodium + thunderbird minetest ]; @@ -59,5 +60,7 @@ services.avahi.nssmdns = true; # enables the mDNS NSS plug-in services.avahi.openFirewall = true; # opens the firewall for UDP port 5353 + nixpkgs.config.allowUnfree = true; networking.hostName = "mlg"; + } diff --git a/boxes/mlg/hardware-configuration.nix b/boxes/mlg/hardware-configuration.nix new file mode 100644 index 0000000..99531a4 --- /dev/null +++ b/boxes/mlg/hardware-configuration.nix @@ -0,0 +1,41 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# testing +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/eada30c2-ffc5-4410-b1cf-fcea6a4040ff"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5318-1A44"; + 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.enp58s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.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/boxes/mlg/home.nix b/boxes/mlg/home.nix new file mode 100644 index 0000000..8c118a1 --- /dev/null +++ b/boxes/mlg/home.nix @@ -0,0 +1,10 @@ +{ lib, inputs, config, pkgs, home, ... }: + +{ + imports = [ + ../../home/x11.nix + ../../home/chromium + ]; + + home.stateVersion = "23.11"; +} diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 32411e0..64ff359 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -27,6 +27,12 @@ case "$(hostname)" in bspc monitor VGA-1 -d 1 3 5 7 9 bspc monitor HDMI-1 -d 2 4 6 8 0 ;; + "mlg") + # holdover configuration for the time being + xrandr --output eDP-1 --brightness 0 + xrandr --output DP-1 --primary + bspc monitor DP-1 -d 1 2 3 4 5 6 7 8 9 + ;; "x230t") echo "x230t" case "$1" in diff --git a/flake.lock b/flake.lock index 430a6ad..ef6132e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1705709716, - "narHash": "sha256-YJdWSN3ra0FsAQT5PXe7uXxMeAXxTR+SY/wVOO1c6Bs=", + "lastModified": 1706081037, + "narHash": "sha256-R2dkUMLZa6qvRl4mXOG7bLHaGvoOYf5vIXWeyRDqML0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d7ad3362283fced58410547650be31e37f9d0f41", + "rev": "5f23ef51cad74dbf30633366e52eb895c9c633d1", "type": "gitlab" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705641746, - "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", + "lastModified": 1705916986, + "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", + "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2a1dfcb..220cdcd 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,20 @@ } ]; }; + mlg = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./boxes/mlg + + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.usr = import ./boxes/mlg/home.nix; + } + ]; + }; virtbox = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; };