custom neovim matugen theme with noctalia

and update system and other stuff i dont really remember

10 files changed, 70 insertions, 58 deletions

diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix
index 42b857e..973bd8e 100644
--- a/common/modules/matugen/default.nix
+++ b/common/modules/matugen/default.nix
@@ -101,7 +101,7 @@ in
 
               ${lib.optionalString config.beeMods.windowManagers.niri.enable ''
                 [templates.niri]
-                input_path = '~/.config/matugen/templates/matugen.kdl'
+                input_path = '~/.config/matugen/templates/niri.kdl'
                 output_path = '~/.config/niri/matugen.kdl'
               ''}
 
diff --git a/common/modules/matugen/templates/matugen-niri.nix b/common/modules/matugen/templates/matugen-niri.nix
index 9012878..3d365e3 100644
--- a/common/modules/matugen/templates/matugen-niri.nix
+++ b/common/modules/matugen/templates/matugen-niri.nix
@@ -6,7 +6,7 @@
 {
   config = lib.mkIf (config.beeMods.windowManagers.niri.enable) {
     xdg.configFile = {
-      "matugen/templates/matugen.kdl" = {
+      "matugen/templates/niri.kdl" = {
         text = ''
           layout {
           	background-color "{{colors.background.default.hex}}"
diff --git a/common/modules/matugen/templates/matugen-nvim.nix b/common/modules/matugen/templates/matugen-nvim.nix
index 3be508e..771d163 100644
--- a/common/modules/matugen/templates/matugen-nvim.nix
+++ b/common/modules/matugen/templates/matugen-nvim.nix
@@ -4,21 +4,23 @@
   ...
 }:
 {
-  config = lib.mkIf (config.wrappers.neovim.enable) {
-    xdg.configFile = {
-      "matugen/templates/neovim.json" = {
-        text = ''
-          {
-              "mode": "{{mode}}",
-              "source_color":"{{colors.primary.default.hex}}",
-              <* if {{ is_dark_mode }} *>
-              "background":"{{colors.surface.default.hex}}"
-              <* else *>
-              "background":"{{colors.surface_container_low.default.hex}}"
-              <* endif *>
-          }
-        '';
+  config =
+    lib.mkIf (config.beeMods.windowManagers.beeConfig.enable || config.beeMods.windowManagers.noctalia)
+      {
+        xdg.configFile = {
+          "matugen/templates/neovim.json" = {
+            text = ''
+              {
+                  "mode": "{{mode}}",
+                  "source_color":"{{colors.primary.default.hex}}",
+                  <* if {{ is_dark_mode }} *>
+                  "background":"{{colors.surface.default.hex}}"
+                  <* else *>
+                  "background":"{{colors.surface_container_low.default.hex}}"
+                  <* endif *>
+              }
+            '';
+          };
+        };
       };
-    };
-  };
 }
diff --git a/common/modules/window_managers/noctalia.nix b/common/modules/window_managers/noctalia.nix
index 5a37f68..472359e 100644
--- a/common/modules/window_managers/noctalia.nix
+++ b/common/modules/window_managers/noctalia.nix
@@ -28,7 +28,7 @@ in
           output_path = '~/.config/neovim/nvim-colors.json'
 
           [theme.templates.user.niri]
-          input_path = '~/.config/matugen/templates/matugen.kdl'
+          input_path = '~/.config/matugen/templates/niri.kdl'
           output_path = '~/.config/niri/matugen.kdl'
         '';
       };
diff --git a/common/programs/vesktop.nix b/common/programs/vesktop.nix
index be35840..b90e5b3 100644
--- a/common/programs/vesktop.nix
+++ b/common/programs/vesktop.nix
@@ -12,7 +12,7 @@
           then
             [ "midnight.css" ]
           else
-            [ "noctalia.theme.css" ];
+            [ "discord-system24.css" ];
         # autoUpdate = true;
         # autoUpdateNotification = true;
         # notifyAboutUpdates = false;
diff --git a/common/programs/zenBrowser.nix b/common/programs/zenBrowser.nix
index 406f9b7..00eb264 100644
--- a/common/programs/zenBrowser.nix
+++ b/common/programs/zenBrowser.nix
@@ -92,7 +92,7 @@ in
               }
               {
                 Name = "Nixpkgs";
-                URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
+                URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";
                 IconURL = "https://wiki.nixos.org/favicon.ico";
                 Alias = ":np";
               }
diff --git a/flake.lock b/flake.lock
index 00f2942..e0ef6de 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1787572613,
-        "narHash": "sha256-vqOl2vOB6oTLxzJD9OZwz2m5dRGYec6jKCYsBRIweCI=",
+        "lastModified": 1788174060,
+        "narHash": "sha256-mpT65x9NdtfXZWEE9oqMmfVSvU4CyYen/2VzZV1n+iA=",
         "ref": "refs/heads/main",
-        "rev": "8b138abdba70537b4dd720391ca366807101fa89",
-        "revCount": 53,
+        "rev": "3c5867dbbe67505e945bf5a34afc5a6a53b1084f",
+        "revCount": 56,
         "type": "git",
         "url": "https://codeberg.org/beeb5k/beeVim"
       },
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787680808,
-        "narHash": "sha256-9168tNt0NZdtlx5RM5huEuc9NCWMLACJA9O4UK/l2Zc=",
+        "lastModified": 1788146656,
+        "narHash": "sha256-XmJmvk9rytTb7dCotO/aqR+YysB8HOqnprlOdv+LAF4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6840c9a8f50722944eb106ce8bb237c138584f2a",
+        "rev": "82c265faf4e3161d6015db07c9b0f1ee36a9029b",
         "type": "github"
       },
       "original": {
@@ -65,11 +65,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787498568,
-        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
+        "lastModified": 1788039129,
+        "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
     "plugins-lze": {
       "flake": false,
       "locked": {
-        "lastModified": 1782136817,
-        "narHash": "sha256-7RNUVDWU13E0LGv3QVfC/Qmz/gA564FKfpv6PxYn75M=",
+        "lastModified": 1787578920,
+        "narHash": "sha256-OF1my8rsj9Bk50JRskIM4UBStn3At/otBTv4+R38OQI=",
         "owner": "BirdeeHub",
         "repo": "lze",
-        "rev": "ae45b9f1fd923955a5ebc733b920e23f0c105ae1",
+        "rev": "f8f007cd73a08bc3453b001e4438da0f1a3e41ea",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
     "plugins-lzextras": {
       "flake": false,
       "locked": {
-        "lastModified": 1782220927,
-        "narHash": "sha256-9hoMQoor4SjQ8+2eH33YQkoEfSXc+kKjRdTRCJYxL+M=",
+        "lastModified": 1787578944,
+        "narHash": "sha256-paY9kHeNmgln4wXhJ18+8A8lzfRMipWzt/pj36PdgDg=",
         "owner": "BirdeeHub",
         "repo": "lzextras",
-        "rev": "0dd4ed15331b6eaf4b6304d4e0db32ccb043b76e",
+        "rev": "8ff93cb97a42b6d30d33a940e1fde0f01516dead",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787531025,
-        "narHash": "sha256-PbDBQ714Ua/FFpfWVNa8wLEgLeSxidQintFM8VF4p+w=",
+        "lastModified": 1787722691,
+        "narHash": "sha256-bWBt7v2FhgG6WTLgSi8nYGi1zXaTdA+vTdCRdvR2vcw=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "f4e8db680592dbdd729d776e87c6278423d70a1d",
+        "rev": "04ef216559b18214853879df862f493a9e6bb8cf",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787200418,
-        "narHash": "sha256-4d24Wa/CO8WsSEjKwzFwJXn+oxbI4Bm8xuMR77xJgYI=",
+        "lastModified": 1788083005,
+        "narHash": "sha256-e6U3sXUlu/QzZyJp/+ymW8s57Jbdb7bwT9+WaTAhHfQ=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "20195bc99e82b02abe82bb81ac366ae81c67dc5a",
+        "rev": "afbbbef7c3c00f160f4a9dfdd8c6c6b8b089a33f",
         "type": "github"
       },
       "original": {
diff --git a/hosts/common.nix b/hosts/common.nix
index bb92ba9..d8b8ba0 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -84,15 +84,6 @@
     LC_TIME = "en_IN";
   };
 
-  services.displayManager.ly = {
-    enable = true;
-    x11Support = false;
-    settings = {
-      load = true;
-      save = true;
-    };
-  };
-
   security.pam.services.ly.enableGnomeKeyring = true;
   security.pam.services.login.enableGnomeKeyring = true;
 
diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix
index 02a98d4..5d6c199 100644
--- a/hosts/niuwux/default.nix
+++ b/hosts/niuwux/default.nix
@@ -15,12 +15,34 @@
     ./hardware-configuration.nix
     (import ../common.nix { inherit user; })
     beeMods
+    inputs.beevim.nixosModules.default
   ];
 
+  wrappers.neovim.enable = true;
+
   boot.kernelPackages = pkgs.linuxPackages_zen;
 
   programs.dconf.enable = true;
 
+  services.displayManager.noctalia-greeter = {
+    enable = true;
+    settings = {
+      cursor = {
+        theme = "Bibata-Modern-Ice";
+        size = 24;
+        path = "${pkgs.bibata-cursors}/share/icons";
+      };
+    };
+  };
+  services.displayManager.ly = {
+    enable = false;
+    x11Support = false;
+    settings = {
+      load = true;
+      save = true;
+    };
+  };
+
   zramSwap = {
     enable = true;
     algorithm = "zstd";
@@ -66,7 +88,7 @@
     # capSysNice = true;
   };
   programs.steam = {
-    enable = true;
+    enable = false;
     protontricks.enable = true;
     gamescopeSession.enable = false;
     remotePlay.openFirewall = true;
@@ -93,7 +115,7 @@
 
   networking.hostName = hostname;
   networking.firewall.allowedTCPPorts = [ ];
-  networking.firewall.allowedUDPPorts = [ ];
+  networking.firewall.allowedUDPPorts = [ 43210 ];
   networking.firewall.enable = true;
   programs.direnv.enable = true;
 
diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix
index c51fbfd..b59876a 100644
--- a/users/beeb5k/default.nix
+++ b/users/beeb5k/default.nix
@@ -14,15 +14,12 @@
     ../common.nix
     beeMods
     programs
-    inputs.beevim.homeModules.default
   ];
 
-  wrappers.neovim.enable = true;
-
   beeMods = {
     windowManagers = {
       niri.enable = true;
-      xwayland = true;
+      xwayland = false;
       eyeCandy.enable = true;
       eyeCandy = {
         window = {