From acd513371b35c5cbbff609cc63e9f4a0dea4517e Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Wed, 24 Jul 2024 10:59:51 +0700
Subject: [PATCH] refactor: Comment nix and hyprlang without spacing in between

---
 .config/hypr/hyprland.conf             |  2 +-
 .config/nix/darwin/configuration.nix   | 10 +++++-----
 .config/nix/flake.nix                  |  1 +
 .config/nvim/lua/null/plugins/init.lua |  5 ++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 934c3e5..d4ce852 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -189,7 +189,7 @@ env = __GL_GSYNC_ALLOWED,1
 env = __GL_VRR_ALLOWED,1
 env = WLR_DRM_NO_ATOMIC,1
 env = WLR_USE_LIBINPUT,1
-env = XWAYLAND_NO_GLAMOR,1 # with this you'll need to use gamescope for gaming
+#env = XWAYLAND_NO_GLAMOR,1 # with this you'll need to use gamescope for gaming
 env = __GL_MaxFramesAllowed,1
 env = WLR_RENDERER_ALLOW_SOFTWARE,1
 
diff --git a/.config/nix/darwin/configuration.nix b/.config/nix/darwin/configuration.nix
index 71e463a..4c88d52 100644
--- a/.config/nix/darwin/configuration.nix
+++ b/.config/nix/darwin/configuration.nix
@@ -26,7 +26,7 @@
     pkgs.htop-vim
     python
     (pkgs.inkscape.override { python3 = python; })
-    # (pkgs.poetry.override { python3 = python; })
+    #(pkgs.poetry.override { python3 = python; })
     pkgs.fastfetch
     pkgs.eza
     pkgs.lf
@@ -48,14 +48,14 @@
 
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
+  #nix.package = pkgs.nix;
 
   # Necessary for using flakes on this system.
   nix.settings.experimental-features = "nix-command flakes";
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true;  # default shell on catalina
-  # programs.fish.enable = true;
+  #programs.fish.enable = true;
 
   # Set Git commit hash for darwin-version.
   system.configurationRevision = vars.rev or null;
@@ -99,8 +99,8 @@
   };
 
   users.users.ziro = {
-    name = "ziro";
-    home = "/Users/ziro";
+    name = vars.user;
+    home = "/Users/${vars.user}";
   };
   home-manager.users.ziro = {
     home.stateVersion = "22.05";
diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix
index 8f6a1f4..55fdec2 100644
--- a/.config/nix/flake.nix
+++ b/.config/nix/flake.nix
@@ -16,6 +16,7 @@
   outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager }:
   let
     vars = {
+      user = "ziro";  # TODO: Make it possible to setup multi-user
       rev = self.rev or self.dirtyRev or null;
     };
   in
diff --git a/.config/nvim/lua/null/plugins/init.lua b/.config/nvim/lua/null/plugins/init.lua
index d4eda63..f8cfa5b 100644
--- a/.config/nvim/lua/null/plugins/init.lua
+++ b/.config/nvim/lua/null/plugins/init.lua
@@ -57,13 +57,12 @@ return {
 		},
 		init = function ()
 			vim.api.nvim_create_autocmd("FileType", {
-				pattern = { "nix" },
+				pattern = { "nix", "hyprlang" },
 				callback = function()
-					vim.opt_local.commentstring = "# %s"
+					vim.opt_local.commentstring = "#%s"
 				end,
 				group = generalSettingsGroup,
 			})
-
 		end,
 	},
 	{