Update configuration

sestrella · Jan 6, 2025 · 1b43b65 · 1b43b65
1 parent 81ed26c
commit 1b43b65
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 30 deletions.
diff --git a/home.nix b/home.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   # This value determines the Home Manager release that your configuration is
@@ -15,9 +20,9 @@
     ./home/alacritty
     ./home/bat
     ./home/fish
-    # ./home/ghostty
+    ./home/ghostty
     ./home/git
-    # ./home/helix
+    ./home/helix
     ./home/home-manager
     ./home/neovim
     ./home/nix

diff --git a/home/helix/default.nix b/home/helix/default.nix
@@ -36,14 +36,13 @@
     };
   };
 
-  # TODO: Test this approach
-  launchd.agents.sync-helix-theme = {
+  launchd.agents.helix-theme = {
     enable = true;
     config = {
       ProgramArguments =
         let
-          script = pkgs.writeScript "sync-helix-theme" ''
-            mkdir =p ~/.config/helix/themes
+          script = pkgs.writeScriptBin "helix-theme" ''
+            mkdir -p ~/.config/helix/themes
             if [ "$1" == "dark" ]; then
               ln -sf ${config.programs.helix.package}/lib/runtime/themes/solarized_dark.toml ~/.config/helix/themes/solarized.toml
             else
@@ -54,7 +53,7 @@
         [
           "/opt/homebrew/bin/dark-notify"
           "-c"
-          "${script}/bin/sync-helix-theme"
+          "${script}/bin/helix-theme"
         ];
       RunAtLoad = true;
       KeepAlive = {

diff --git a/home/neovim/default.nix b/home/neovim/default.nix
@@ -3,7 +3,7 @@
 {
   programs.neovim = {
     enable = true;
-    defaultEditor = true;
+    # defaultEditor = true;
     extraPackages = [
       pkgs.gopls
       pkgs.lua-language-server
@@ -19,27 +19,31 @@
       pkgs.yaml-language-server
     ];
     extraLuaConfig = builtins.readFile ./extra-config.lua;
-    plugins = builtins.concatMap (plugin: pkgs.callPackage plugin { }) [
-      ./plugins/auto-dark-mode
-      ./plugins/cmp
-      ./plugins/comment
-      ./plugins/conform
-      ./plugins/gitsigns
-      ./plugins/lspconfig
-      ./plugins/lualine
-      ./plugins/null-ls
-      ./plugins/solarized
-      ./plugins/telescope
-      ./plugins/treesitter
-      # ./plugins/which-key
-      ./plugins/whitespace
-    ] ++ [{
-      plugin = pkgs.vimPlugins.oil-nvim;
-      config = ''
-        require("oil").setup()
-      '';
-      type = "lua";
-    }];
+    plugins =
+      builtins.concatMap (plugin: pkgs.callPackage plugin { }) [
+        ./plugins/auto-dark-mode
+        ./plugins/cmp
+        ./plugins/comment
+        ./plugins/conform
+        ./plugins/gitsigns
+        ./plugins/lspconfig
+        ./plugins/lualine
+        ./plugins/null-ls
+        ./plugins/solarized
+        ./plugins/telescope
+        ./plugins/treesitter
+        # ./plugins/which-key
+        ./plugins/whitespace
+      ]
+      ++ [
+        {
+          plugin = pkgs.vimPlugins.oil-nvim;
+          config = ''
+            require("oil").setup()
+          '';
+          type = "lua";
+        }
+      ];
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;