Add noctalia niri and way to switch between my config and noxtalia easily

3 files changed, 92 insertions, 35 deletions

diff --git a/hosts/common.nix b/hosts/common.nix
index 5000a37..016bfc9 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -4,6 +4,7 @@
   inputs,
   lib,
   config,
+
   ...
 }:
 {
@@ -149,11 +150,12 @@
   # };
 
   fonts.fontDir.enable = true;
-  fonts.packages = with pkgs; [
-    IosevkaInput
-    nerd-fonts.symbols-only
+  fonts.packages = [
+    inputs.self.packages.${pkgs.system}.iosevka-input
+    pkgs.nerd-fonts.symbols-only
+    pkgs.noto-fonts
+    pkgs.noto-fonts-cjk-sans-static
     # nerd-fonts.jetbrains-mono
-    # ioskeley-mono
     # maple-mono.NF
   ];
 
@@ -201,7 +203,8 @@
        if [ -n "$INSIDE_EMACS" ]; then
          PS1="\[\033[$PROMPT_COLOR\]\u@\h:\w\\$\[\033[0m\] "
        else
-         PS1="\[\033[$PROMPT_COLOR\]\[\e]0;\u@\h: \w\a\]\u@\h:\w\\$\[\033[0m\] "
+         # PS1="\[\033[$PROMPT_COLOR\]\[\e]0;\u@\h: \w\a\]\u@\h:\w\\$\[\033[0m\] "
+         PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]"
        fi
        
        if test "$TERM" = "xterm"; then
diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix
index 265769e..aa97b0d 100644
--- a/hosts/niuwux/default.nix
+++ b/hosts/niuwux/default.nix
@@ -31,6 +31,7 @@
   beeMods = {
     windowManagers = {
       mango.enable = true;
+      niri.enable = true;
     };
   };
 
@@ -41,6 +42,7 @@
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
       pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gnome
     ];
     config = {
       common = {
@@ -53,6 +55,12 @@
         "org.freedesktop.impl.portal.Screenshot" = [ "wlr" ];
         "org.freedesktop.impl.portal.Inhibit" = [ "none" ];
       };
+      niri = {
+        default = [
+          "gnome"
+          "gtk"
+        ];
+      };
       hyrpland = {
         default = [
           "hyrland"
@@ -83,6 +91,9 @@
       "networkmanager"
       "wheel"
       "video"
+      "pipewire"
+      "uinput"
+      "input"
     ];
   };
 
diff --git a/hosts/niuwux/hardware-configuration.nix b/hosts/niuwux/hardware-configuration.nix
index 4c20a84..fc1e219 100644
--- a/hosts/niuwux/hardware-configuration.nix
+++ b/hosts/niuwux/hardware-configuration.nix
@@ -1,47 +1,90 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
-      fsType = "btrfs";
-      options = [ "subvol=@" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+    fsType = "btrfs";
+    options = [
+      "subvol=@"
+      "noatime"
+      "space_cache=v2"
+      "nodiscard"
+      "ssd"
+      "compress=zstd:3"
+    ];
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
-      fsType = "btrfs";
-      options = [ "subvol=@home" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+    fsType = "btrfs";
+    options = [
+      "subvol=@home"
+      "noatime"
+      "space_cache=v2"
+      "nodiscard"
+      "ssd"
+      "compress=zstd:3"
+    ];
+  };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
-      fsType = "btrfs";
-      options = [ "subvol=@nix" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
-    };
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+    fsType = "btrfs";
+    options = [
+      "subvol=@nix"
+      "noatime"
+      "space_cache=v2"
+      "nodiscard"
+      "ssd"
+      "compress=zstd:3"
+    ];
+  };
 
-  fileSystems."/var" =
-    { device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
-      fsType = "btrfs";
-      options = [ "subvol=@var" "noatime" "space_cache=v2" "nodiscard" "ssd" "compress=zstd:3" ];
-    };
+  fileSystems."/var" = {
+    device = "/dev/disk/by-uuid/933658d7-eaf2-4e75-a23d-c80d8a1cf8c6";
+    fsType = "btrfs";
+    options = [
+      "subvol=@var"
+      "noatime"
+      "space_cache=v2"
+      "nodiscard"
+      "ssd"
+      "compress=zstd:3"
+    ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/59FA-D495";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/59FA-D495";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
   swapDevices = [ ];