change some niri config, add setup script for nobara on PC

modules/capabilities/graphics.nix

@@ -1,4 +1,16 @@
-{ inputs, self, ... }: {
+{ inputs, self, ... }: let
+  extraPackages = pkgs: with pkgs; [
+    x264
+    gparted
+    vlc
+    obsidian
+    proton-vpn
+    ente-auth
+    signal-desktop
+    github-desktop
+    kdePackages.filelight
+  ];
+in {
   flake.nixosModules.graphics = { pkgs, ... }: {
     imports = [ self.nixosModules.graphicsOptions ];
 
@@ -6,7 +18,7 @@
       wayland-utils
       mesa-demos
       vulkan-tools
-    ];
+    ] ++ (if !config.features.nixos.home-manager.enable then (extraPackages pkgs) else []);
 
     fonts.packages = with pkgs; [
       iosevka-comfy.comfy
@@ -17,14 +29,10 @@
   flake.homeModules.graphics = { config, pkgs, ... }: {
     imports = [ self.homeModules.graphicsOptions ];
 
-    home.packages = with pkgs; [
-      bibata-cursors
-      x264
-      gparted
-      vlc
+    home.packages = (extraPackages pkgs) ++ (if config.info.isStandalone then (with pkgs; [
       iosevka-comfy.comfy
       nerd-fonts.jetbrains-mono
-    ];
+    ]) else []);
 
     dconf.settings = {
       "org/gnome/desktop/interface" = {

modules/features/shells/zsh.nix

@@ -8,8 +8,6 @@
 
   flake.nixosModules.global = { config, pkgs, lib, ... }: {
     config = lib.mkIf (config.features.shells.zsh.enable || config.features.shells.defaultShell == "zsh") {
-      programs.zsh.enable = true;
-
       home-manager.users.${config.info.userName} = lib.mkIf (config.features.nixos.home-manager.enable) {
         features.shells.zsh.enable = lib.mkDefault true;
         features.shells.zsh.antidote.enable = lib.mkDefault config.features.shells.zsh.antidote.enable;

modules/hosts/kitagawa/kitagawa.nix

@@ -40,6 +40,7 @@
             enable = true;
             spicetify.enable = true;
           };
+          thunderbird.enable = true;
         };
 
         cli = {
@@ -48,7 +49,6 @@
         };
 
         extraPackages = with pkgs; [
-          github-desktop
           moonlight-qt
         ];
       };
@@ -99,15 +99,9 @@
     features = {
       applications = {
         extraPackages = with pkgs; [
-          obsidian
-          thunderbird
           jetbrains.clion
           jetbrains.idea
-          proton-vpn
-          ente-auth
-          signal-desktop
           xarchiver
-          kdePackages.filelight
           kdePackages.kate
           loupe
           sshfs

modules/hosts/takamaki/system/setup.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+nobara-sync cli
+
+# niri build dependencies
+sudo dnf install git cargo gcc libudev-devel libgbm-devel libxkbcommon-devel wayland-devel libinput-devel dbus-devel systemd-devel libseat-devel pipewire-devel pango-devel cairo-gobject-devel clang libdisplay-info-devel -y
+cargo install -f cargo-generate-rpm
+
+# build niri (biri fork)
+cd ~/Documents
+git clone https://github.com/barrulus/biri
+cd biri
+cargo build --release
+cargo generate-rpm
+
+RPM_FILE=$(ls ./target/generate-rpm)
+sudo dnf install ./target/generate-rpm/$RPM_FILE -y
+
+# other system applications that are NOT handled by nix+home-manager
+sudo dnf install noctalia steam goverlay protonplus prismlauncher obs-studio mangohud -y
+
+# activate home-manger config
+sudo dnf install nix -y
+nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
+nix-channel --update
+nix-shell '<home-manager>' -A install
+home-manager switch --flake ~/flake

modules/hosts/takamaki/takamaki.nix

@@ -67,15 +67,11 @@
               theme = "comfy";
             };
           };
-          thunderbird = {
-            enable = true;
-          };
+          thunderbird.enable = true;
         };
 
         extraPackages = with pkgs; [
           nix-init
-          github-desktop
-          signal-desktop
         ];
 
         shellScripts = let