feat(profiles/workstation): enable mesa-git (#158)

* feat(shared/nixos): add nix-community binary cache * chore(flake): update all inputs * test(system): test overlays setup * chore(profiles): export profiles attr * feat(shared/overlays): add overlays module * feat(flake): integrate overlays from default overlays module * patch(home/pkgs): use overlays neovim-nightly * feat(profiles/workstation): enable mesa-git * feat(system/pkgs): add glxinfo * feat(home/pkgs): add alacritty * patch(profiles/workstation): enable mesa-git fallback by default * chore(flake): update inputs.dotfiles-desktop
piyoki · Mar 17, 2024 · 8fb0971 · 8fb0971
1 parent 264cb1a
commit 8fb0971
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 55 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,12 +4,13 @@
   outputs = { nixpkgs, home-manager, ... }@inputs: with inputs;
     let
       system = "x86_64-linux";
+      inherit (import ./profiles.nix { }) profiles;
+      inherit (import ./shared/overlays { inherit inputs; }) overlays;
       # use a system-specific version of nixpkgs
-      pkgs = (import nixpkgs) { inherit system; config.allowUnfree = lib.mkDefault true; };
+      pkgs = (import nixpkgs) { inherit system overlays; config.allowUnfree = lib.mkDefault true; };
       inherit (nixpkgs) lib;
       inherit (import ./shared/vars) user;
       specialArgs = genSpecialArgs system;
-      profiles = import ./profiles.nix { };
       extraModules = [
         sops-nix.nixosModules.sops
       ];

diff --git a/home/packages/windowmanager/hyprland/editor/default.nix b/home/packages/windowmanager/hyprland/editor/default.nix
@@ -1,9 +1,8 @@
-{ inputs, pkgs, system, ... }:
+{ pkgs, ... }:
 
 {
   home.packages = with pkgs; [
     neovim
-    inputs.neovim-nightly-overlay.packages.${system}.neovim
     notepadqq
   ];
 }
diff --git a/home/packages/windowmanager/hyprland/productivity/default.nix b/home/packages/windowmanager/hyprland/productivity/default.nix
@@ -3,6 +3,7 @@
 {
   home.packages = with pkgs; [
     kitty # terminal emulator
+    alacritty_git # terminal emulator
     handbrake # video editor
     hyprpicker # color picker
     lf # terminal file manager

diff --git a/profiles.nix b/profiles.nix
@@ -10,17 +10,19 @@ let
     }: { inherit hostname home-manager keys; };
 in
 {
-  workstations = [
-    (genProfile { hostname = "thinkpad-x1-carbon"; home-manager = true; })
-    (genProfile { hostname = "nuc-12"; home-manager = true; })
-  ];
-  servers = [
-    (genProfile { hostname = "mars"; home-manager = true; })
-    (genProfile { hostname = "tailscale-gateway"; })
-    (genProfile { hostname = "sdwan-gateway"; })
-    (genProfile { hostname = "felix"; keys = { inherit (import (secretsDir + "/atuin-server.nix")) "env" "server.toml"; }; })
-  ];
-  microvms = [
-    (genProfile { hostname = "firecracker"; })
-  ];
+  profiles = {
+    workstations = [
+      (genProfile { hostname = "thinkpad-x1-carbon"; home-manager = true; })
+      (genProfile { hostname = "nuc-12"; home-manager = true; })
+    ];
+    servers = [
+      (genProfile { hostname = "mars"; home-manager = true; })
+      (genProfile { hostname = "tailscale-gateway"; })
+      (genProfile { hostname = "sdwan-gateway"; })
+      (genProfile { hostname = "felix"; keys = { inherit (import (secretsDir + "/atuin-server.nix")) "env" "server.toml"; }; })
+    ];
+    microvms = [
+      (genProfile { hostname = "firecracker"; })
+    ];
+  };
 }
diff --git a/profiles/workstation/nuc-12/hardware-configuration.nix b/profiles/workstation/nuc-12/hardware-configuration.nix
@@ -134,10 +134,7 @@
   };
 
   # Mesa
-  # chaotic.mesa-git = {
-  #   enable = true;
-  #   fallbackSpecialisation = false;
-  # };
+  chaotic.mesa-git.enable = true;
 
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

diff --git a/profiles/workstation/thinkpad-x1-carbon/hardware-configuration.nix b/profiles/workstation/thinkpad-x1-carbon/hardware-configuration.nix
@@ -133,10 +133,7 @@
   };
 
   # Mesa
-  # chaotic.mesa-git = {
-  #   enable = true;
-  #   fallbackSpecialisation = false;
-  # };
+  chaotic.mesa-git.enable = true;
 
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

diff --git a/shared/nixos.nix b/shared/nixos.nix
@@ -21,11 +21,13 @@
         "https://nixpkgs-wayland.cachix.org"
         "https://hyprland.cachix.org"
         "https://nyx.chaotic.cx"
+        "https://nix-community.cachix.org"
       ];
       extra-trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
         "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       # ref: https://github.com/NixOS/nix/issues/4894
       # workaround to fix ssh signature issues

diff --git a/shared/overlays/default.nix b/shared/overlays/default.nix
@@ -0,0 +1,8 @@
+{ inputs, ... }:
+
+{
+  overlays = [
+    inputs.neovim-nightly-overlay.overlay
+    inputs.chaotic.overlays.default
+  ];
+}
diff --git a/system/packages/misc.nix b/system/packages/misc.nix
@@ -11,5 +11,6 @@
     cpufetch # Simplistic yet fancy CPU architecture fetching tool
     vulkan-tools # Khronos official Vulkan Tools and Utilities
     intel-gpu-tools # Tools for development and testing of the Intel DRM driver
+    glxinfo # Test utilities for OpenGL
   ];
 }