barrett/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(nix): revert setup

Browse source
This commit is contained in:
Barrett Ruth 2026-02-11 18:15:12 -05:00
parent 9aac8350a5
commit 5db1a08d07
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
3 changed files with 124 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

25
config/nvim/lua/config/lines/statuscolumn.lua
View file

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

4
home/home.nix
View file

@ -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";

62
home/modules/packages.nix
View file

@ -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 cfg.claude.enable { CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; })
(lib.mkIf zen { BROWSER = "zen"; })
(lib.mkIf claude { CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; })
];
programs.mpv.enable = true;
home.packages = lib.mkMerge [
(with pkgs; [
home.packages =
with pkgs;
[
slack
bitwarden-desktop
gemini-cli
typst
])
(lib.mkIf cfg.claude.enable [ pkgs.claude-code ])
(lib.mkIf cfg.zen.enable [ zen-browser.packages.${hostPlatform}.default ])
(lib.mkIf cfg.sioyek.enable [ sioyek-wrapped ])
(lib.mkIf cfg.vesktop.enable [ pkgs.vesktop ])
];
]
++ lib.optionals zen [ zen-browser.packages.${hostPlatform}.default ]
++ lib.optionals sioyek [ sioyek-wrapped ]
++ lib.optionals vesktop [ 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";
})
];
};
};
}