Comments

.gitignore

@@ -1,2 +1,3 @@
 result
 **/dist-newstyle
+.direnv

nixos/fuchsia/configuration.nix

@@ -10,10 +10,12 @@
 
     ../common/optional/key.nix
 
+    ./programs
     ./services
     ./hardware-configuration.nix
   ];
 
+  /* Boot configuration */
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = [ 
@@ -24,6 +26,7 @@
     initrd.kernelModules = [ "amdgpu" ];
   };
 
+  /* Hardware configuration */
   hardware = {
     bluetooth = {
       enable = true;
@@ -46,48 +49,12 @@
     };
   };
 
+  /* Networking configuration */
   networking = {
     hostName = "fuchsia";
     networkmanager.enable = true;
   };
 
-  programs = {
-    zsh.enable = true;
-    direnv.enable = true;
-    adb.enable = true;
-  };
-
-  services = {
-    # Enable necessary udev rules.
-    udev.packages = with pkgs; [
-      openrgb
-      qmk-udev-rules
-    ];
-
-    # Setup our display server.
-    xserver = {
-      enable = true;
-      xkb.layout = "au";
-      videoDrivers = [ "amdgpu" ];
-      displayManager.startx.enable = true;
-    };
-
-    libinput = {
-      enable = true;
-      mouse = { accelProfile = "flat"; };
-    };
-
-    # Get up and running with large language models locally.
-    ollama = {
-      enable = true;
-      acceleration = "rocm";
-    };
-
-    # Enable a few other services.
-    ratbagd.enable = true;
-    pcscd.enable = true;
-  };
-
   # Use docker instead of podman for our containers.
   virtualisation.docker = {
     enable = true;

nixos/fuchsia/programs/default.nix

@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  programs = {
+    zsh.enable = true;
+    # Load and unload environment variables.
+    direnv.enable = true;
+    # Android debug bridge: communicate with devices.
+    adb.enable = true;
+  };
+}
+

nixos/fuchsia/services/default.nix

@@ -3,5 +3,15 @@
 {
   imports = [
     ./amdgpu-clocks.nix
+    ./flatpak.nix
+    ./libinput.nix
+    ./ollama.nix
+    ./udev.nix
+    ./xserver.nix
   ];
+
+  # Enable a few extra services.
+  services = {
+    pcscd.enable = true;
+  };
 }

nixos/fuchsia/services/flatpak.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  # Required to install flatpak
+  xdg.portal = {
+    enable = true;
+    config.common.default = [ "gtk" ];
+    extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
+  };
+
+  services.flatpak.enable = true;
+}

nixos/fuchsia/services/libinput.nix

@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  services.libinput = {
+    enable = true;
+    mouse = { accelProfile = "flat"; };
+  };
+
+  # DBus daemon to configure input devices.
+  services.ratbagd.enable = true;
+}

nixos/fuchsia/services/ollama.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  # Get up and running with large language models locally.
+  services.ollama = {
+    enable = true;
+    acceleration = "rocm";
+  };
+}

nixos/fuchsia/services/udev.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  # Enable necessary udev rules.
+  services.udev.packages = with pkgs; [
+    openrgb
+    qmk-udev-rules
+  ];
+}

nixos/fuchsia/services/xserver.nix

@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  # Setup our display server
+  services.xserver = {
+    enable = true;
+    xkb.layout = "au";
+    videoDrivers = [ "amdgpu" ];
+    displayManager.startx.enable = true;
+  };
+}

pkgs/xmonad-config/default.nix

@@ -2,4 +2,11 @@
 
 pkgs.haskellPackages.developPackage {
   root = ./.;
+  source-overrides = {
+    xmonad = (builtins.fetchTarball {
+      url = "https://github.com/xmonad/xmonad/archive/refs/tags/v0.18.0.tar.gz";
+      sha256 = "0jlc60n5jarcxgjxm1vcsgc3s2lwmn3c3n56hialhzx54wfskkbc";
+    });
+  };
 }
+

pkgs/xmonad-config/xmonad-config.cabal

@@ -8,11 +8,12 @@ author:             sajenim
 maintainer:         its.jassy@pm.me
 build-type:         Simple
 
-executable xmonad-config
+executable xmonad
     main-is:          xmonad.hs
     hs-source-dirs:   src
     ghc-options:      -Wall
     build-depends:    base,
+                      X11,
                       xmonad,
                       xmonad-contrib
     default-language: Haskell2010