Merge remote-tracking branch 'origin/main'

flake.nix

@@ -283,6 +283,34 @@
         ];
       };
 
+      grablet = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = with nixosModules; [
+          common
+
+          outputs.diskoConfigurations.standard
+          hardware.nixosModules.common-cpu-intel-kaby-lake
+          hardware.nixosModules.common-pc-laptopp-ssd
+          graphical-workstation
+          laptop
+          gaming
+
+          ./nixos/thablet.nix
+
+          {
+            home-manager.users.daniel = {
+              imports = with homeManagerModules; [
+                iex
+                cargo
+                linux-desktop-environment-config
+              ];
+            };
+
+            powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+          }
+        ];
+      };
+
       thinker = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = with nixosModules; [

modules/nixos/default.nix

@@ -385,9 +385,9 @@
     services.desktopManager.plasma6.enable = true;
     programs.dconf.enable = true;
 
-    # services.xrdp.enable = true;
-    # services.xrdp.defaultWindowManager = "plasma";
-    # services.xrdp.openFirewall = false;
+    services.xrdp.enable = true;
+    services.xrdp.defaultWindowManager = "plasma";
+    services.xrdp.openFirewall = false;
 
     environment.systemPackages = with pkgs; [
       wl-clipboard

nixos/beefcake.nix

@@ -18,9 +18,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
   networking.hostName = "beefcake";
 
   imports = [
-    ../modules/nixos/intel.nix
-    ../modules/nixos/fonts.nix
-
     # TODO: break these modules out someday maybe?
     {
       # hardware

templates/nix-flake/flake.nix

@@ -1,4 +1,6 @@
 {
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+
   inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
   inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -10,8 +12,8 @@
   }: let
     systems = ["aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-linux"];
     forSystems = nixpkgs.lib.genAttrs systems;
-    pkgsFor = system: import nixpkgs {inherit system;};
-    genPkgs = f: (f (forSystems pkgsFor));
+    pkgsFor = system: (import nixpkgs {inherit system;});
+    genPkgs = func: (forSystems (system: func (pkgsFor system)));
   in {
     formatter = genPkgs (pkgs: pkgs.alejandra);
 
@@ -26,7 +28,7 @@
 
     devShells = genPkgs (pkgs: {
       nix = pkgs.mkShell {
-        buildInputs = with pkgs; [nil alejandra];
+        packages = with pkgs; [nil alejandra];
         inherit (self.outputs.checks.${pkgs.system}.pre-commit-check) shellHook;
       };