seq keep fix

7 files changed, 23 insertions, 20 deletions

diff --git a/home/codeium.nix b/home/codeium.nix
index f29f389..f3841b3 100644
--- a/home/codeium.nix
+++ b/home/codeium.nix
@@ -1,8 +1,7 @@
 {
-  flake,
+  inputs,
   config,
   pkgs,
-  home-manager,
   ...
 }: let
   codeium = with pkgs; stdenv.mkDerivation rec {
@@ -46,7 +45,7 @@
 in {
   home.activation = {
     # links codeium into place
-    codium-symlink = home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
+    codium-symlink = inputs.home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
       CODEIUM_TARGET="${config.home.homeDirectory}/.codeium/bin/c8fda9657259bb7f3d432c1b558db921db4257aa"
       if [ -L $CODEIUM_TARGET ] && [ -e $CODEIUM_TARGET ]; then
           $DRY_RUN_CMD echo "codeium linked"
diff --git a/home/fennel-language-server.nix b/home/fennel-language-server.nix
deleted file mode 100644
index e69de29..0000000
--- a/home/fennel-language-server.nix
+++ /dev/null
diff --git a/home/kakoune.nix b/home/kakoune.nix
index dba1f25..41caf9f 100644
--- a/home/kakoune.nix
+++ b/home/kakoune.nix
@@ -1,8 +1,8 @@
 {
+  inputs,
   flake,
   config,
   pkgs,
-  home-manager,
   ...
 }:
   let
@@ -10,7 +10,7 @@
   in {
   home.packages = [kakouneWithPlugins];
   home.activation = {
-    kakoune-symlink = home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
+    kakoune-symlink = inputs.home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
       KAK_CONFIG="${config.home.homeDirectory}/kakoune"
       XDG_CONFIG_HOME_KAK="${config.xdg.configHome}/kak"
       if [ -L $XDG_CONFIG_HOME_KAK ] && [ -e $XDG_CONFIG_HOME_KAK ]; then
diff --git a/home/meta.nix b/home/meta.nix
new file mode 100644
index 0000000..e6f3a78
--- /dev/null
+++ b/home/meta.nix
@@ -0,0 +1,8 @@
+{inputs,lib,config, ...}: with lib; {
+  lib.meta = {
+    configPath = "${config.home.homeDirectory}/flake";
+    mkMutableSymlink = path:
+      config.lib.file.mkOutOfStoreSymlink
+        (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path));
+  };
+}
diff --git a/home/mpv.nix b/home/mpv.nix
index 689cc75..1b673ab 100644
--- a/home/mpv.nix
+++ b/home/mpv.nix
@@ -3,7 +3,6 @@
   flake,
   config,
   pkgs,
-  home-manager,
   ...
 }: {
     programs.mpv = {
diff --git a/home/neovim.nix b/home/neovim.nix
index 1fbbf40..8957c89 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -1,23 +1,12 @@
 {
-  flake,
+  inputs,
   config,
   pkgs,
-  home-manager,
   ...
 }: {
   home.activation = {
-    # links neovim repo to xdg config home
-    neovim-symlink = home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
-      NEOVIM_CONFIG="${config.home.homeDirectory}/neovim"
-      XDG_CONFIG_HOME_NVIM="${config.xdg.configHome}/nvim"
-      if [ -L $XDG_CONFIG_HOME_NVIM ] && [ -e $XDG_CONFIG_HOME_NVIM ]; then
-          $DRY_RUN_CMD echo "neovim linked"
-      else
-          $DRY_RUN_CMD ln -s $NEOVIM_CONFIG $XDG_CONFIG_HOME_NVIM
-      fi
-    '';
     # fixes hotpot cannot be found error after updates
-    clearHotpotCache = home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
+    clearHotpotCache = inputs.home-manager.lib.hm.dag.entryAfter ["writeBoundary"] ''
       HOTPOT_CACHE="${config.xdg.cacheHome}/nvim/hotpot"
       if [[ -d "$HOTPOT_CACHE" ]]; then
         $DRY_RUN_CMD rm -rf "$VERBOSE_ARG" "$HOTPOT_CACHE"
@@ -25,6 +14,12 @@
     '';
   };
 
+  xdg = {
+    configFile = with config.lib.meta; {
+      "nvim".source = mkMutableSymlink ../neovim;
+    };
+  };
+
   editorconfig = {
     enable = true;
     settings = {
diff --git a/home/packages.nix b/home/packages.nix
index 0d3cec1..02c5b8e 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -2,7 +2,6 @@
   flake,
   config,
   pkgs,
-  home-manager,
   username,
   ...
 }: let
@@ -29,6 +28,8 @@
       inetutils
       usbutils
       gcc
+      pkgsi686Linux.glibc
+      gnumake
       raylib
       gdb
       maim
@@ -37,6 +38,7 @@
       file
       lf
       ueberzug
+      mypaint
       lynx
       pstree
       pywal