Merge remote-tracking branch 'refs/remotes/origin/main'

home/default.nix

@@ -2,9 +2,10 @@
   imports = [
     #home-manager modules
     inputs.nix-index-database.hmModules.nix-index
-    inputs.nvf.homeManagerModules.default
+    inputs.nixvim.homeManagerModules.nixvim
     inputs.catppuccin.homeManagerModules.catppuccin
     #aux files to make finding specific things easier
+    ./nixvim
     ./sway.nix
     ./theming.nix
     ./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways
@@ -42,6 +43,8 @@
       }
     '';
   };
+  services.syncthing.enable = (vars.useSyncthing);
+  
   services.mpd-mpris = {
     enable = true;
   };
@@ -72,24 +75,4 @@
       obs-pipewire-audio-capture
     ];
   };
-   programs.nvf = {
-      enable = true;
-      settings.vim = {
-        statusline.lualine = {
-          enable = true;
-          theme = "dracula";
-        };
-        autocomplete.nvim-cmp.enable = true;
-        languages = {
-	       enableFormat = true;
-	       enableLSP = true;
-          #enableTreesitter = true; disabled until it fixes itself
-	       nix.enable = true;
-	       clang.enable = true;
-	       html.enable = true;
-          css.enable = true;
-	       python.enable = true;
-	     };
-      };
-    };
 }

home/nixvim/default.nix

@@ -0,0 +1,38 @@
+{vars, ...}:{
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin.enable = true;
+    colorschemes.catppuccin.settings.flavour = "mocha";
+    plugins = { 
+      treesitter.enable = true;
+      fidget.enable = true; 
+      lualine.enable = true;
+      lualine.settings.options.theme = "dracula";
+      cmp = {
+        enable = true;
+        settings = {
+	  performance.throttle = 30;
+          sources = [{name = "nvim_lsp";}{name = "luasnip";}{name = "path";}{name = "buffer";}];
+	  mapping = {
+	    "<Tab>" = "cmp.mapping.select_next_item()";
+	    "<S-Tab>" = "cmp.mapping.select_prev_item()";
+	    "<C-space>" = "cmp.mapping.confirm({ select = false })";
+	  };
+	};
+      };
+      lsp = {
+        enable = true;
+	servers.nixd = {
+	  enable = true;
+	  extraOptions.offset_encoding = "utf-8";
+	  settings.nixpkgs.expr = "import <nixpkgs>{}";
+	  settings.options = {
+	    nixos.expr = "(builtins.getFlake \"/home/${vars.user}/.config/nixos\").nixosConfigurations.apollo.options";
+	    home-manager.expr = "(builtins.getFlake \"/home/${vars.user}/.config/nixos\").homeConfigurations.generic.options"; 
+	    nixvim.expr = "(builtins.getFlake \"/home/${vars.user}/.config/nixos\").homeConfigurations.generic.options.programs.nixvim.type.getSubOptions []";
+	  };
+	};
+      };
+    };
+  };
+}

home/sway.nix

@@ -66,6 +66,8 @@
         "XF86Launch1" = "exec nmcli device wifi rescan";
         "Shift_L+Control_L+B" = "exec playerctl position 10-";
         "Shift_L+Control_L+F" = "exec playerctl position 10+";
+	"Mod4+w" = null;
+	"Mod4+s" = null;
       };
       floating.criteria = [
         { app_id = "^fzf-launcher-foot$";}

home/syncthing.nix

@@ -1,6 +1,5 @@
 {
  services.syncthing = {
-    enable = true;
     overrideDevices = true;
     overrideFolders = true;
     settings = {

home/waybar/mocha.css

@@ -1,26 +0,0 @@
-@define-color rosewater #f5e0dc;
-@define-color flamingo #f2cdcd;
-@define-color pink #f5c2e7;
-@define-color mauve #cba6f7;
-@define-color red #f38ba8;
-@define-color maroon #eba0ac;
-@define-color peach #fab387;
-@define-color yellow #f9e2af;
-@define-color green #a6e3a1;
-@define-color teal #94e2d5;
-@define-color sky #89dceb;
-@define-color sapphire #74c7ec;
-@define-color blue #89b4fa;
-@define-color lavender #b4befe;
-@define-color text #cdd6f4;
-@define-color subtext1 #bac2de;
-@define-color subtext0 #a6adc8;
-@define-color overlay2 #9399b2;
-@define-color overlay1 #7f849c;
-@define-color overlay0 #6c7086;
-@define-color surface2 #585b70;
-@define-color surface1 #45475a;
-@define-color surface0 #313244;
-@define-color base #1e1e2e;
-@define-color mantle #181825;
-@define-color crust #11111b;

home/waybar/style.css

@@ -1,4 +1,30 @@
-@import "/home/maya/.config/nixos/home/waybar/mocha.css";
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;
+/* forgive me, above is the contents of catppuccin mocha's waybar css file */
 * {
 	font-family: Iosevka NF;
 }