common/bluetooth.nix

@@ -1,8 +0,0 @@
-{ config, lib ,... }:
-
-{
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-
-  services.blueman.enable = true;
-}

common/desktop/core.nix

@@ -10,11 +10,6 @@
     hyfetch 
     sway-contrib.grimshot
     discord
-    pamixer
-  ];
-
-  fonts.packages = [
-    pkgs.nerd-fonts.fira-code
   ];
 
   environment.sessionVariables.NIXOS_OZONE_WL = "1";

common/desktop/sway.nix

@@ -20,7 +20,6 @@ in
   programs.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
-    package = pkgs.swayfx;
   };
 
   environment.sessionVariables = {

home/regent/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, system, inputs, lib, ... }:
+{ config, pkgs, system, inputs, ... }:
 
 {
   home.username = "regent";
@@ -13,8 +13,6 @@
     };*/
     ghostty.enable = true;
     ghostty.flavor = "mocha";
-    nvim.enable = true;
-    nvim.flavor = "mocha";
   };
 
   programs.ghostty.enable = true;
@@ -23,19 +21,6 @@
     theme = "catppuccin-mocha";
   };
 
-  programs.neovim.enable = true;
-  programs.neovim = {
-    extraPackages = with pkgs; [
-      lua-language-server
-      stylua
-      ripgrep
-    ];
-
-    plugins = with pkgs.vimPlugins; [
-      lazy-nvim
-    ];
-  };
-
    home.pointerCursor = {
     gtk.enable = true;
     package = pkgs.phinger-cursors;
@@ -76,7 +61,7 @@
 
 
 * {
-  font-family: 'Fira Code', monospace;
+  font-family: FantasqueSansMono Nerd Font;
   font-size: 17px;
   min-height: 0;
 }
@@ -86,7 +71,7 @@ window#waybar {
   margin: 0px;
   border: 0px;
   /*background-color:rgb(0, 0, 0);*/
-  background-color: @base;
+  background-color: rgba(0, 0, 0, 0.9);
   color: @text;
 }
 
@@ -97,10 +82,11 @@ window#waybar {
 #workspaces {
   border-radius: 1rem;
   margin: 5px;
+  background-color: @surface0;
   margin-left: 1rem;
-  background-color: rgba(0, 0, 0, 0.21);
 }
 
+
 #workspaces button {
   color: @lavender;
   border-radius: 1rem;
@@ -110,7 +96,6 @@ window#waybar {
 #workspaces button.active {
   color: @sky;
   border-radius: 1rem;
-  background-color: rgba(255, 255, 255, 0.5);
 }
 
 #workspaces button:hover {
@@ -126,88 +111,35 @@ window#waybar {
 #pulseaudio,
 #custom-lock,
 #custom-power {
+  background-color: @surface0;
   padding: 0.5rem 1rem;
   margin: 5px 0;
-  color: @text;
 }
 
 #clock {
-  color: @text;
+  color: @blue;
   border-radius: 0px 1rem 1rem 0px;
   margin-right: 1rem;
 }
+
 '';
     settings = {
       mainBar = {
         layer = "top";
         position = "top";
-        mod = "dock";
-        exclusive = true;
-        passthrough = false;
-        #gtk-layer-shell = true;
-        height = 0;
+        height = 34;
         output = [
           "HDMI-A-1"
-          "DP-1"
-        ];
-        modules-left = [ 
-          "sway/workspaces"
+          "DP-2"
         ];
+        modules-left = [ "sway/workspaces" ];
         modules-center = [ "sway/window" ];
-        modules-right = [
-          "pulseaudio"
-          "clock"          
-        ];
+        modules-right = [ "clock"  ];
 
         "sway/workspaces" = {
           disable-scroll = true;
           sort-by-name = true;
         };
-        tray = {
-          icon-size = 13;
-          tooltip = false;
-          spacing = 10;
-        };
-        network = {
-          format = "󰖩 {essid}";
-          format-disconnected = "󰖪 disconnected";
-        };
-        clock = {
-          format = " {:%I:%M %p   %m/%d} ";
-          tooltip-format = ''
-            <big>{:%Y %B}</big>
-            <tt><small>{calendar}</small></tt>'';
-        };
-
-        pulseaudio = {
-          format = "{icon} {volume}%";
-          tooltip = false;
-          format-muted = " Muted";
-          on-click = "pamixer -t";
-          on-scroll-up = "pamixer -i 5";
-          on-scroll-down = "pamixer -d 5";
-          scroll-step = 5;
-          format-icons = {
-            headphone = "";
-            hands-free = "";
-            headset = "";
-            phone = "";
-            portable = "";
-            car = "";
-            default = [ "" "" "" ];
-          };
-        };
-
-        "pulseaudio#microphone" = {
-          format = "{format_source}";
-          tooltip = false;
-          format-source = " {volume}%";
-          format-source-muted = " Muted";
-          on-click = "pamixer --default-source -t";
-          on-scroll-up = "pamixer --default-source -i 5";
-          on-scroll-down = "pamixer --default-source -d 5";
-          scroll-step = 5;
-        };
       };
     };
   };

hosts/focalor/default.nix

@@ -13,7 +13,6 @@
     ../../common/users.nix
     ../../common/services.nix
     ../../common/efi.nix
-    ../../common/bluetooth.nix
 
     # Desktop modules
     ../../common/desktop/core.nix
@@ -65,8 +64,6 @@
     };
   };
 
-  programs.steam.enable = true;
-
   /*networking = {
     firewall.enable = false;
     firewall.trustedInterfaces = [
@@ -94,15 +91,6 @@
   services.vscode-server.enable = true;
   services.vscode-server.nodejsPackage = pkgs.nodejs_20;
 
-
-  programs.obs-studio = {
-    enable = true;
-    enableVirtualCamera = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      droidcam-obs
-    ];
-  };
-
   environment.systemPackages = with pkgs; [
     #lm_sensors
     #code-server

hosts/focalor/scripts/vm-win11-hook.sh

@@ -55,8 +55,7 @@ if [[ "$GUEST_NAME" != "win11" ]]; then
 fi
 
 if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then
-  #start_hook
-  echo "do nothing"
+  start_hook
 elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then
   revert_hook
 fi