whole bunch of stuff

home/bolt.nix

@@ -23,14 +23,15 @@
   ];
 
   programs.comfyui = {
-    enable = true;
+    enable = false;
     storage = "/home/${config.mainUser}/.local/share/comfyui/";
-    plugins = let
-      inherit (pkgs.comfyui-plugins) gguf openpose;
-    in [
-      gguf
-      # essentials
-      openpose
-    ];
+    plugins = [];
+    # plugins = let
+    #   inherit (pkgs.comfyui-plugins) gguf openpose;
+    # in [
+    #   gguf
+    #   # essentials
+    #   openpose
+    # ];
   };
 }

home/home.nix

@@ -15,7 +15,6 @@ in {
     ./modules/theming.nix
     ./modules/niri.nix
     ./util/ez.nix
-    ./util/flatpak.nix
     ./util/murex.nix
     ./util/name.nix
     inputs.nix-index-database.hmModules.nix-index
@@ -50,10 +49,11 @@ in {
   };
 
   home.packages = let
-    inherit (pkgs.rice) icons fonts;
+    inherit (pkgs.rice) icons fonts cursor;
   in
     fonts.pkgs
-    ++ icons.pkgs;
+    ++ icons.pkgs
+    ++ [cursor.package];
 
   systemd.user.targets.tray = {
     Unit = {
@@ -91,6 +91,6 @@ in {
 
   systemd.user.startServices = "sd-switch";
   ezServices = {
-    ckb-next = "${getExe inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next} -c -b";
+    ckb-next = "${getExe pkgs.ckb-next} -c -b";
   };
 }

home/modules/chat.nix

@@ -1,7 +1,6 @@
 {config, ...}: {
   imports = [
     ../util/firefox-webapp.nix
-    ../util/flatpak.nix
   ];
   programs.firefox.webapps = {
     "Microsoft-Teams" = {
@@ -19,5 +18,4 @@
       icon = ../icons/fb_msg.png;
     };
   };
-  # flatpaks = ["im.riot.Riot"];
 }

home/modules/cli.nix

@@ -2,9 +2,9 @@
   imports = [
     ../programs/kitty.nix
     ../programs/zsh.nix
-    ../programs/xresources.nix
+    # ../programs/xresources.nix
     ../programs/helix.nix
-    ../programs/atuin.nix
+    # ../programs/atuin.nix
     ../programs/murex.nix
   ];
   home.packages = with pkgs; [

home/modules/creative.nix

@@ -1,10 +1,10 @@
 {...}: {
-  imports = [
-    ../util/flatpak.nix
-  ];
-  flatpaks = [
-    "ar.com.tuxguitar.TuxGuitar"
-    "org.inkscape.Inkscape"
-    "com.github.PintaProject.Pinta"
-  ];
+  # imports = [
+  #   ../util/flatpak.nix
+  # ];
+  # flatpaks = [
+  #   "ar.com.tuxguitar.TuxGuitar"
+  #   "org.inkscape.Inkscape"
+  #   "com.github.PintaProject.Pinta"
+  # ];
 }

home/modules/documents.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    ../util/flatpak.nix
+    # ../util/flatpak.nix
   ];
   # home.packages = with pkgs; [
   #   libreoffice

home/modules/niri.nix

@@ -127,6 +127,7 @@ in {
       hide-after-inactive-ms = 5000;
       hide-when-typing = true;
       size = 16;
+      theme = pkgs.rice.cursor.name;
     };
     layout = {
       always-center-single-column = true;

home/programs/helix.nix

@@ -157,22 +157,6 @@ in {
 
     # theme = "nix-rice"
 
-    # [editor]
-    # bufferline = "multiple"
-    # cursorline = true
-    # true-color = true
-
-    # [editor.cursor-shape]
-    # insert = "bar"
-    # normal = "block"
-    # select = "underline"
-
-    # [editor.lsp]
-    # display-messages = true
-
-    # [editor.statusline]
-    # left = ["mode", "spinner", "version-control", "file-name", "file-modification-indicator"]
-
     settings = {
       theme = "nix-rice";
       editor = {
@@ -206,7 +190,7 @@ in {
         }
         {
           name = "nix";
-          language-servers = ["nixd"];
+          language-servers = ["nil"];
           file-types = ["nix"];
           # auto-format = true;
           formatter = {
@@ -216,8 +200,8 @@ in {
       ];
 
       language-server = {
-        nixd = {
-          command = "nixd";
+        nil = {
+          command = "nil";
         };
 
         rust-analyzer = {

home/programs/vscode.nix

@@ -17,11 +17,12 @@
       "editor.fontFamily" = "${pkgs.rice.fonts.monospace.name}";
       "editor.fontSize" = 12;
       "workbench.colorTheme" = "KanagawaTheme";
-      "rust-analyzer.check.overrideCommand" = ["clippy"];
       "rust-analyzer.debug.engine" = "vadimcn.vscode-lldb";
       "rust-analyzer.inlayHints.chainingHints.enable" = false;
       "rust-analyzer.inlayHints.parameterHints.enable" = false;
       "rust-analyzer.inlayHints.typeHints.enable" = false;
+      "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "nil";
     };
   };
 }

home/programs/xresources.nix

@@ -13,7 +13,6 @@ in {
   };
   home.packages = with pkgs; [
     xorg.xrdb
-    culr
   ];
   xresources.properties = with palette-hex; {
     "*.foreground" = util.fg;