fix(nix): revert setup

config/nvim/lua/config/lines/statuscolumn.lua

@@ -19,19 +19,18 @@ return {
 
         return '%#' .. hl .. '#' .. (relnum == 0 and lnum or relnum)
     end,
-    -- fold = function()
+    fold = function()
-    --     local expr = require('config.fold').foldexpr()
+        local expr = require('config.fold').foldexpr()
-    --     if expr:sub(1, 1) == '>' then
+        if expr:sub(1, 1) == '>' then
-    --         if vim.fn.foldclosed(vim.v.lnum) ~= -1 then
+            if vim.fn.foldclosed(vim.v.lnum) ~= -1 then
-    --             return '>'
+                return '>'
-    --         else
+            else
-    --             return 'v'
+                return 'v'
-    --         end
+            end
-    --     end
+        end
-    --     return ' '
+        return ' '
-    -- end,
+    end,
     statuscolumn = function()
-        -- return '%{%v:lua.require("config.lines.statuscolumn").fold()%}%s%=%{%v:lua.require("config.lines.statuscolumn").num()%} '
+        return '%{%v:lua.require("config.lines.statuscolumn").fold()%}%s%=%{%v:lua.require("config.lines.statuscolumn").num()%} '
-        return '%=%{%v:lua.require("config.lines.statuscolumn").num()%} '
     end,
 }

home/home.nix

@@ -33,10 +33,6 @@
     home.sessionPath = [ "${config.home.homeDirectory}/.config/nix/scripts" ];
 
     programs.home-manager.enable = true;
-    programs.zen.enable = true;
-    programs.sioyek.enable = true;
-    programs.vesktop.enable = true;
-    programs.claude.enable = true;
 
     systemd.user.services.nix-flake-update = {
       Unit.Description = "Update nix flake inputs";

home/modules/packages.nix

@@ -8,9 +8,14 @@
 }:
 
 let
-  cfg = config.programs;
   repoDir = "${config.home.homeDirectory}/.config/nix";
 
+  neovim = config.programs.neovim.enable;
+  zen = true;
+  sioyek = true;
+  vesktop = true;
+  claude = true;
+
   sioyek-wrapped = pkgs.symlinkJoin {
     name = "sioyek";
     paths = [ pkgs.sioyek ];
@@ -22,35 +27,27 @@ let
   };
 in
 {
-  options.programs = {
-    zen.enable = lib.mkEnableOption "zen browser";
-    sioyek.enable = lib.mkEnableOption "sioyek PDF viewer";
-    vesktop.enable = lib.mkEnableOption "vesktop Discord client";
-    claude.enable = lib.mkEnableOption "claude code";
-  };
-
-  config = {
   home.sessionVariables = lib.mkMerge [
-      (lib.mkIf cfg.zen.enable { BROWSER = "zen"; })
+    (lib.mkIf zen { BROWSER = "zen"; })
-      (lib.mkIf cfg.claude.enable { CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; })
+    (lib.mkIf claude { CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; })
   ];
 
   programs.mpv.enable = true;
 
-    home.packages = lib.mkMerge [
+  home.packages =
-      (with pkgs; [
+    with pkgs;
+    [
       slack
       bitwarden-desktop
       gemini-cli
       typst
-      ])
+    ]
-      (lib.mkIf cfg.claude.enable [ pkgs.claude-code ])
+    ++ lib.optionals zen [ zen-browser.packages.${hostPlatform}.default ]
-      (lib.mkIf cfg.zen.enable [ zen-browser.packages.${hostPlatform}.default ])
+    ++ lib.optionals sioyek [ sioyek-wrapped ]
-      (lib.mkIf cfg.sioyek.enable [ sioyek-wrapped ])
+    ++ lib.optionals vesktop [ pkgs.vesktop ]
-      (lib.mkIf cfg.vesktop.enable [ pkgs.vesktop ])
+    ++ lib.optionals claude [ pkgs.claude-code ];
-    ];
 
-    xdg.configFile."claude/settings.json" = lib.mkIf cfg.claude.enable {
+  xdg.configFile."claude/settings.json" = lib.mkIf claude {
     text = builtins.toJSON {
       permissions.defaultMode = "acceptEdits";
       network_access = true;
@@ -63,35 +60,35 @@ in
     };
   };
 
-    xdg.configFile."claude/CLAUDE.md" = lib.mkIf cfg.claude.enable {
+  xdg.configFile."claude/CLAUDE.md" = lib.mkIf claude {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/CLAUDE.md";
   };
 
-    xdg.configFile."claude/rules" = lib.mkIf cfg.claude.enable {
+  xdg.configFile."claude/rules" = lib.mkIf claude {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/rules";
   };
 
-    xdg.configFile."claude/skills" = lib.mkIf cfg.claude.enable {
+  xdg.configFile."claude/skills" = lib.mkIf claude {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/skills";
   };
 
-    xdg.configFile."sioyek/keys_user.config" = lib.mkIf cfg.sioyek.enable {
+  xdg.configFile."sioyek/keys_user.config" = lib.mkIf sioyek {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/sioyek/keys_user.config";
   };
 
-    xdg.configFile."sioyek/prefs_user.config" = lib.mkIf cfg.sioyek.enable {
+  xdg.configFile."sioyek/prefs_user.config" = lib.mkIf sioyek {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/sioyek/prefs_user.config";
   };
 
-    xdg.configFile."sioyek/themes/midnight.config" = lib.mkIf cfg.sioyek.enable {
+  xdg.configFile."sioyek/themes/midnight.config" = lib.mkIf sioyek {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/sioyek/themes/midnight.config";
   };
 
-    xdg.configFile."sioyek/themes/daylight.config" = lib.mkIf cfg.sioyek.enable {
+  xdg.configFile."sioyek/themes/daylight.config" = lib.mkIf sioyek {
     source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/sioyek/themes/daylight.config";
   };
 
-    home.activation.linkZenProfile = lib.mkIf cfg.zen.enable (
+  home.activation.linkZenProfile = lib.mkIf zen (
     lib.hm.dag.entryAfter [ "writeBoundary" ] ''
       zen_config="$HOME/.zen"
       repo_zen="${repoDir}/config/zen"
@@ -142,22 +139,21 @@ in
   xdg.mimeApps = {
     enable = true;
     defaultApplications = lib.mkMerge [
-        (lib.mkIf cfg.zen.enable {
+      (lib.mkIf zen {
         "x-scheme-handler/http" = "zen.desktop";
         "x-scheme-handler/https" = "zen.desktop";
         "text/html" = "zen.desktop";
       })
-        (lib.mkIf cfg.neovim.enable {
+      (lib.mkIf neovim {
         "text/plain" = "nvim.desktop";
       })
-        (lib.mkIf cfg.sioyek.enable {
+      (lib.mkIf sioyek {
         "application/pdf" = "sioyek.desktop";
         "application/epub+zip" = "sioyek.desktop";
       })
-        (lib.mkIf cfg.vesktop.enable {
+      (lib.mkIf vesktop {
         "x-scheme-handler/discord" = "vesktop.desktop";
       })
     ];
   };
-  };
 }