Merge branch 'framework/master' into alpine/master

nixos/default.nix

@@ -8,7 +8,6 @@
 }: let
   user = config.user;
 in {
-
   nix = {
     settings = {
       experimental-features = ["nix-command" "flakes" "pipe-operators"];
@@ -62,7 +61,8 @@ in {
   i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8";
 
   services.xserver.xkb = {
-    layout = lib.mkDefault "gb";
+    layout = lib.mkDefault "us";
+    variant = lib.mkDefault "dvorak";
     options = "caps:escape";
   };
 
@@ -96,8 +96,7 @@ in {
     sops
     lsof
     nix-tree
-    nix-index
-    nh
+    comma
     jq
   ];
 
@@ -109,4 +108,8 @@ in {
     enable = true;
     enabledCollectors = ["systemd"];
   };
+
+  programs.command-not-found.enable = false;
+  programs.nix-index.enable = true;
+  programs.nh.enable = true;
 }

nixos/programs/auto-login.nix

@@ -1,12 +1,9 @@
-command: {config, ...}: let
-  user = config.user;
-in {
+command: {user, ...}: {
   services.greetd = {
     enable = true;
     settings = {
       default_session = {
-        inherit command;
-        user = user;
+        inherit command user;
       };
     };
   };

nixos/programs/cosmic.nix

@@ -1,8 +1,8 @@
-{
-  inputs,
-  config,
-  ...
-}: {
+{...}: {
   services.desktopManager.cosmic.enable = true;
   services.displayManager.cosmic-greeter.enable = true;
+  # fix for shutdown, not yet in 25.05
+  # https://github.com/NixOS/nixpkgs/pull/412260/commits/27c3430d620adfed574674e36a89a52be80f01d9
+  services.geoclue2.enable = true;
+  services.geoclue2.enableDemoAgent = false;
 }

nixos/programs/niri.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  inputs,
+  user,
+  ...
+}: {
+  programs.niri = {
+    enable = true;
+  };
+
+  imports = [
+    ./pipewire.nix
+    ../workstation.nix
+    inputs.niri-flake.nixosModules.niri
+  ];
+
+  home-manager.users.${user}.imports = [
+    ../../home/desktop/niri/.
+  ];
+}

nixos/workstation.nix

@@ -22,6 +22,8 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
+  services.gnome.gnome-keyring.enable = true;
+
   programs.kdeconnect.enable = true;
 
   virtualisation.waydroid.enable = true;
@@ -34,6 +36,7 @@
   stylix = {
     enable = true;
     image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
     polarity = "dark";
     opacity = {
       terminal = 0.9;
@@ -52,7 +55,26 @@
         useWallpaper = true;
       };
     };
+    fonts = {
+      serif = config.stylix.fonts.sansSerif;
+
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+
+      monospace = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans Mono";
+      };
+
+      emoji = {
+        package = pkgs.noto-fonts-emoji;
+        name = "Noto Color Emoji";
+      };
+    };
   };
+  qt.enable = true;
 
   nixpkgs.overlays = [
     (final: prev: {
@@ -74,4 +96,10 @@
     enable = true;
     indicator = true;
   };
+
+  hardware.keyboard.zsa.enable = true;
+  # enable keychron keyboard configuration
+  services.udev.extraRules = ''
+    KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="3434", ATTRS{idProduct}=="0e60", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
+  '';
 }