Merge pull request 'Desktop and p50 hosts merge' (#1) from desktop into master

Reviewed-on: #1

hosts/desktop/configuration.nix

@@ -36,5 +36,32 @@
   networking.firewall.allowedTCPPorts = [ 9999 ];
   networking.firewall.allowedUDPPorts = [ 9999 ];
 
+  # Enable Pipewire &&
+  # Disocrd OBS virtual mic audio sync
+  services.pipewire = {
+  enable = true;
+  pulse.enable = true;
+  extraConfig.pipewire."99-obs-virtual-mic" = {
+    "context.modules" = [
+      {
+        name = "libpipewire-module-loopback";
+        args = {
+          "node.description" = "OBS Virtual Mic";
+          "capture.props" = {
+            "node.name" = "obs_capture";
+            "media.class" = "Audio/Sink";
+            "audio.position" = [ "FL" "FR" ];
+          };
+          "playback.props" = {
+            "node.name" = "obs_mic";
+            "media.class" = "Audio/Source";
+            "audio.position" = [ "FL" "FR" ];
+          };
+        };
+      }
+    ];
+  };
+};
+
   system.stateVersion = "25.11"; # don't change
-}
+}

hosts/desktop/home.nix

@@ -15,6 +15,8 @@
     ../../modules/home-manager/bspwm.nix
     ../../modules/home-manager/polybar.nix
     ../../modules/home-manager/browsers/zen.nix
+    ../../modules/home-manager/picom.nix
+    ../../modules/home-manager/syncplay.nix
     # ../../modules/home-manager/editors/helix.nix
   ];
 
@@ -27,13 +29,13 @@
   my.bspwm.monitors = [
     {
       name = "DP-0";
-      xrandr = "--primary --auto --pos 1080x0";
-      desktops = [ "1" "2" "3" "4" "5" "6" ];
+      xrandr = "--primary --mode 2560x1440 --pos 1080x0";
+      desktops = [ "4" "5" "6" "7" "8" "9" ];
     }
     {
       name = "DP-2";
       xrandr = "--auto --rotate left --pos 0x0";
-      desktops = [ "7" "8" "9" ];
+      desktops = [ "1" "2" "3" ];
     }
   ];
 

hosts/p50/configuration.nix

@@ -5,7 +5,7 @@
     ./hardware-configuration.nix
     ../../modules/nixos/quadro-m1000m.nix
     ../../modules/nixos/common.nix
-    ../../modules/nixos/bspwm.nix
+    ../../modules/nixos/gnome.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/shell.nix
     ../../modules/nixos/dev.nix
@@ -26,4 +26,4 @@
   programs.zsh.shellAliases.ssh-server = "ssh braincell@192.168.1.3";
 
   system.stateVersion = "26.05"; # don't change
-}
+}

hosts/p50/home.nix

@@ -8,10 +8,10 @@
 
   imports = [
     ../../modules/home-manager/defaults.nix
-    ../../modules/home-manager/bspwm.nix
-    ../../modules/home-manager/wallpaper.nix
-    ../../modules/home-manager/polybar.nix
-    ../../modules/home-manager/sxhkd.nix
+    # ../../modules/home-manager/bspwm.nix
+    # ../../modules/home-manager/wallpaper.nix
+    # ../../modules/home-manager/polybar.nix
+    # ../../modules/home-manager/sxhkd.nix
     ../../modules/home-manager/terminals/alacritty.nix
     ../../modules/home-manager/browsers/zen.nix
     ../../modules/home-manager/browsers/ugc.nix

modules/home-manager/bspwm.nix

@@ -52,6 +52,9 @@ in
 
         # Wallpapers
         [ -x ~/.config/wallpaper/set.sh ] && ~/.config/wallpaper/set.sh
+
+        # Picom
+        ${pkgs.procps}/bin/pgrep -x picom >/dev/null || ${pkgs.picom}/bin/picom -b --config $HOME/.config/picom/picom.conf
       '';
     };
 

modules/home-manager/picom.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [ pkgs.picom ];
+
+  xdg.configFile."picom/picom.conf".text = ''
+    backend = "glx";
+    vsync = true;
+
+    unredir-if-possible = false;
+
+    shadow = false;
+    fade-in-step = 1;
+    fade-out-step = 1;
+  '';
+}

modules/home-manager/syncplay.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+  home.packages = [
+    pkgs.syncplay
+    pkgs.mpv
+  ];
+}

modules/home-manager/terminals/alacritty.nix

@@ -5,7 +5,7 @@
     enable = true;
     settings = {
       font.size = 11;
-      window.opacity = 0.95;
+      window.opacity = 0.85;
     };
   };
 }

modules/nixos/apps.nix

@@ -2,8 +2,8 @@
 {
   users.users.chris.packages = with pkgs; [
     telegram-desktop discord inkscape obsidian obs-studio
-    r2modman signal-desktop flameshot vscodium
+    r2modman signal-desktop flameshot vscodium spotify
     nautilus onlyoffice-desktopeditors vlc orca-slicer blender grayjay
-    kdePackages.kdenlive kicad
+    kdePackages.kdenlive gimp nextcloud-client
   ];
-}
+}

modules/nixos/common.nix

@@ -49,4 +49,4 @@
   environment.systemPackages = with pkgs; [
     vim wget git helix nixd nixfmt btop fastfetch lazygit file disktui busybox nmap screen scrot xclip
   ];
-}
+}

modules/nixos/gaming.nix

@@ -1,4 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs.steam.enable = true;
-}
+
+  users.users.chris.packages = with pkgs; [
+    # lutris
+  ];
+}

modules/nixos/gnome.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
+
+  # To disable installing GNOME's suite of applications
+  # and only be left with GNOME shell.
+  # services.gnome.core-apps.enable = false;
+  services.gnome.core-developer-tools.enable = false;
+  services.gnome.games.enable = false;
+  environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
+
+}