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

5 files changed, 163 insertions, 144 deletions

diff --git a/common/programs/btop.nix b/common/programs/btop.nix
index a030e3d..6600188 100644
--- a/common/programs/btop.nix
+++ b/common/programs/btop.nix
@@ -3,7 +3,15 @@
   programs.btop = {
     enable = true;
     settings = {
-      color_theme = lib.optionalString config.beeMods.matugen.enable "matugen";
+      color_theme =
+        if
+          config.beeMods.matugen.enable
+          && config.beeMods.windowManagers.beeConfig.enable
+          && !config.beeMods.windowManagers.noctalia
+        then
+          "matugen"
+        else
+          "noctalia";
       theme_background = false;
       truecolor = true;
       vim_keys = true;
diff --git a/common/programs/dunst.nix b/common/programs/dunst.nix
index c5b5eb0..78aadf5 100644
--- a/common/programs/dunst.nix
+++ b/common/programs/dunst.nix
@@ -10,31 +10,33 @@ let
   '';
 in
 {
-  services.dunst = {
-    enable = true;
-    settings = {
-      global = {
-        font = "IosevkaInput 11";
-        corner_radius = 0;
-        frame_width = 2;
-        markup = "yes";
-        browser = "librewolf";
+  config = lib.mkIf config.beeMods.windowManagers.beeConfig.enable {
+    services.dunst = {
+      enable = true;
+      settings = {
+        global = {
+          font = "IosevkaInput 11";
+          corner_radius = 0;
+          frame_width = 2;
+          markup = "yes";
+          browser = "librewolf";
 
-        origin = "top-center";
-        offset = "(0, 4)";
-      };
-      urgency_low = {
-        timeout = 3;
-      };
-      urgency_normal = {
-        timeout = 5;
-      };
-      urgency_critical = {
-        timeout = 0;
-      };
-      play_sound = {
-        summary = "*";
-        script = "${playSound}/bin/play-notification-sound";
+          origin = "top-center";
+          offset = "(0, 4)";
+        };
+        urgency_low = {
+          timeout = 3;
+        };
+        urgency_normal = {
+          timeout = 5;
+        };
+        urgency_critical = {
+          timeout = 0;
+        };
+        play_sound = {
+          summary = "*";
+          script = "${playSound}/bin/play-notification-sound";
+        };
       };
     };
   };
diff --git a/common/programs/fastfetch.nix b/common/programs/fastfetch.nix
index 96c942d..59ba8ac 100644
--- a/common/programs/fastfetch.nix
+++ b/common/programs/fastfetch.nix
@@ -16,7 +16,6 @@
         "shell"
         "de"
         "wm"
-        "font"
         "terminal"
         "cpu"
         "gpu"
diff --git a/common/programs/rofi.nix b/common/programs/rofi.nix
index d0abd1a..20fdffe 100644
--- a/common/programs/rofi.nix
+++ b/common/programs/rofi.nix
@@ -5,140 +5,142 @@
   ...
 }:
 {
-  programs.rofi = {
-    enable = true;
-    font = "IosevkaInput";
-    # plugins = with pkgs; [ rofi-emoji ];
-    theme = "~/.config/rofi/themes/config.rasi";
-    extraConfig = {
-      show-icons = true;
-      # drun-display-format = "{name}";
+  config = lib.mkIf config.beeMods.windowManagers.beeConfig.enable {
+    programs.rofi = {
+      enable = true;
+      font = "IosevkaInput";
+      # plugins = with pkgs; [ rofi-emoji ];
+      theme = "~/.config/rofi/themes/config.rasi";
+      extraConfig = {
+        show-icons = true;
+        # drun-display-format = "{name}";
+      };
     };
-  };
 
-  home.packages = [
-    pkgs.rofi-power-menu
-  ];
+    home.packages = [
+      pkgs.rofi-power-menu
+    ];
 
-  xdg.configFile = {
-    "rofi/shared/colors.rasi" = {
-      enable = !config.beeMods.matugen.enable;
-      text =
-        # rasi
-        ''
-          * {
-              bg:          #212121;
-              bg-alt:      #2d2d2d;
-              fg:          #ffffffdd;
-              fg-dim:      #616161;
-              accent:      #80cbc4;
-              selected-bg: #424242;
-              selected-fg: #80cbc4;
-              urgent:      #ef9a9a;
-              outline:     #424242;
-          }
-        '';
-    };
+    xdg.configFile = {
+      "rofi/shared/colors.rasi" = {
+        enable = !config.beeMods.matugen.enable;
+        text =
+          # rasi
+          ''
+            * {
+                bg:          #212121;
+                bg-alt:      #2d2d2d;
+                fg:          #ffffffdd;
+                fg-dim:      #616161;
+                accent:      #80cbc4;
+                selected-bg: #424242;
+                selected-fg: #80cbc4;
+                urgent:      #ef9a9a;
+                outline:     #424242;
+            }
+          '';
+      };
 
-    "rofi/themes/config.rasi" = {
-      enable = true;
-      text =
-        # rasi
-        ''
-          @import "shared/colors.rasi"
-          * {
-              background-color: transparent;
-              text-color:       @fg;
-              border:           0px;
-              margin:           0px;
-              padding:          0px;
-              spacing:          0px;
-          }
+      "rofi/themes/config.rasi" = {
+        enable = true;
+        text =
+          # rasi
+          ''
+            @import "shared/colors.rasi"
+            * {
+                background-color: transparent;
+                text-color:       @fg;
+                border:           0px;
+                margin:           0px;
+                padding:          0px;
+                spacing:          0px;
+            }
 
-          window {
-              background-color: @bg;
-              border-radius:    0px;
-              border:           2px;
-              border-color:     @outline;
-              width:            680px;
-              padding:          10px;
-          }
+            window {
+                background-color: @bg;
+                border-radius:    0px;
+                border:           2px;
+                border-color:     @outline;
+                width:            680px;
+                padding:          10px;
+            }
 
-          mainbox {
-              background-color: transparent;
-              spacing:          8px;
-          }
+            mainbox {
+                background-color: transparent;
+                spacing:          8px;
+            }
 
-          inputbar {
-              background-color: @bg-alt;
-              border-radius:    0px;
-              padding:          10px 12px;
-              spacing:          8px;
-              children:         [entry];
-          }
+            inputbar {
+                background-color: @bg-alt;
+                border-radius:    0px;
+                padding:          10px 12px;
+                spacing:          8px;
+                children:         [entry];
+            }
 
-          entry {
-              background-color:  transparent;
-              text-color:        @fg;
-              placeholder-color: @fg-dim;
-              placeholder:       "Search...";
-              cursor:            text;
-              font:              "IosevkaInput 13";
-          }
+            entry {
+                background-color:  transparent;
+                text-color:        @fg;
+                placeholder-color: @fg-dim;
+                placeholder:       "Search...";
+                cursor:            text;
+                font:              "IosevkaInput 13";
+            }
 
-          listview {
-              background-color: transparent;
-              columns:          1;
-              lines:            5;
-              spacing:          2px;
-              scrollbar:        false;
-          }
+            listview {
+                background-color: transparent;
+                columns:          1;
+                lines:            5;
+                spacing:          2px;
+                scrollbar:        false;
+            }
 
-          element {
-              background-color: transparent;
-              border-radius:    0px;
-              padding:          8px 12px;
-              spacing:          12px;
-              children:         [element-icon, element-text];
-          }
+            element {
+                background-color: transparent;
+                border-radius:    0px;
+                padding:          8px 12px;
+                spacing:          12px;
+                children:         [element-icon, element-text];
+            }
 
-          element normal normal {
-              background-color: transparent;
-              text-color:       @fg;
-          }
+            element normal normal {
+                background-color: transparent;
+                text-color:       @fg;
+            }
 
-          element alternate normal {
-              background-color: transparent;
-              text-color:       @fg;
-          }
+            element alternate normal {
+                background-color: transparent;
+                text-color:       @fg;
+            }
 
-          element selected normal {
-              background-color: @selected-bg;
-              text-color:       @selected-fg;
-          }
+            element selected normal {
+                background-color: @selected-bg;
+                text-color:       @selected-fg;
+            }
 
-          element normal urgent {
-              text-color: @urgent;
-          }
+            element normal urgent {
+                text-color: @urgent;
+            }
 
-          element selected urgent {
-              background-color: @selected-bg;
-              text-color:       @urgent;
-          }
+            element selected urgent {
+                background-color: @selected-bg;
+                text-color:       @urgent;
+            }
 
-          element-icon {
-              background-color: transparent;
-              size:             22px;
-          }
+            element-icon {
+                background-color: transparent;
+                size:             22px;
+            }
 
-          element-text {
-              background-color: transparent;
-              text-color:       inherit;
-              vertical-align:   0.5;
-              font:             "IosevkaInput 13";
-          }
-        '';
-    };
+            element-text {
+                background-color: transparent;
+                text-color:       inherit;
+                vertical-align:   0.5;
+                font:             "IosevkaInput 13";
+            }
+          '';
+      };
 
+    };
   };
 }
diff --git a/common/programs/vesktop.nix b/common/programs/vesktop.nix
index 5cb6a6b..0363bb9 100644
--- a/common/programs/vesktop.nix
+++ b/common/programs/vesktop.nix
@@ -4,7 +4,15 @@
     enable = false;
     vencord = {
       settings = {
-        enabledThemes = lib.optionals config.beeMods.matugen.enable [ "system24.css" ];
+        enabledThemes =
+          if
+            config.beeMods.matugen.enable
+            && config.beeMods.windowManagers.beeConfig.enable
+            && !config.beeMods.windowManagers.noctalia
+          then
+            [ "system24-matugen" ]
+          else
+            [ "noctalia-system24" ];
         autoUpdate = false;
         autoUpdateNotification = false;
         notifyAboutUpdates = false;