diff --git a/config/nvim/plugin/autocmds.lua b/config/nvim/plugin/autocmds.lua index cbdea1e..0ce8740 100644 --- a/config/nvim/plugin/autocmds.lua +++ b/config/nvim/plugin/autocmds.lua @@ -7,28 +7,6 @@ au('BufEnter', { group = aug, }) -au('BufWritePost', { - pattern = (vim.env.XDG_CONFIG_HOME or (vim.env.HOME .. '/.config')) - .. '/firefox/userChrome.css', - callback = function() - if not vim.tbl_contains({ 'firefox', 'zen-browser' }, vim.env.BROWSER) then - return - end - vim.notify( - 'Updating firefox-based browser userChrome.css...', - vim.log.levels.INFO - ) - local src = (vim.env.XDG_CONFIG_HOME or (vim.env.HOME .. '/.config')) - .. '/firefox/userChrome.css' - local targets = - vim.fn.glob(vim.env.HOME .. '/.zen/*release*/chrome', true, true) - for _, dir in ipairs(targets) do - vim.fn.system({ 'cp', '-f', src, dir .. '/userChrome.css' }) - end - end, - group = aug, -}) - au({ 'TermOpen', 'BufWinEnter' }, { callback = function(args) if vim.bo[args.buf].buftype == 'terminal' then diff --git a/home/home.nix b/home/home.nix index 82d7e11..aea7077 100644 --- a/home/home.nix +++ b/home/home.nix @@ -31,7 +31,7 @@ in targets.genericLinux.enable = !isNixOS; news.display = "silent"; - home.sessionPath = [ "${config.home.homeDirectory}/nix-config/scripts" ]; + home.sessionPath = [ "${config.home.homeDirectory}/.config/nix/scripts" ]; programs.home-manager.enable = true; @@ -39,7 +39,7 @@ in Unit.Description = "Update nix flake inputs"; Service = { Type = "oneshot"; - WorkingDirectory = "%h/nix-config"; + WorkingDirectory = "%h/.config/nix"; ExecStart = "${pkgs.nix}/bin/nix flake update"; }; }; diff --git a/home/modules/bootstrap.nix b/home/modules/bootstrap.nix index b923f39..fd62405 100644 --- a/home/modules/bootstrap.nix +++ b/home/modules/bootstrap.nix @@ -7,7 +7,7 @@ let homeDir = config.home.homeDirectory; - repoDir = "${homeDir}/nix-config"; + repoDir = "${homeDir}/.config/nix"; directories = [ "dev" @@ -26,6 +26,7 @@ in home.activation.cloneNixConfig = lib.hm.dag.entryAfter [ "createDirectories" ] '' if [ ! -d "${repoDir}" ]; then + $DRY_RUN_CMD mkdir -p "$(dirname "${repoDir}")" $DRY_RUN_CMD ${pkgs.git}/bin/git clone https://github.com/barrettruth/nix-config.git "${repoDir}" fi ''; diff --git a/home/modules/editor.nix b/home/modules/editor.nix index 5bf9770..808c18a 100644 --- a/home/modules/editor.nix +++ b/home/modules/editor.nix @@ -6,6 +6,25 @@ MANPAGER = "nvim +Man!"; }; + home.packages = with pkgs; [ + nodejs + isort + black + mypy + stylua + selene + prettierd + eslint_d + shfmt + buf + hadolint + cbfmt + cmake-format + checkmake + cpplint + texlivePackages.latexindent + ]; + programs.neovim = { enable = true; defaultEditor = true; @@ -14,5 +33,5 @@ }; xdg.configFile."nvim".source = - config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/nvim"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/nvim"; } diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 9694b22..6721be8 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -53,7 +53,7 @@ in home.activation.linkZenProfile = lib.mkIf enableZen ( lib.hm.dag.entryAfter [ "writeBoundary" ] '' zen_config="$HOME/.zen" - repo_zen="${config.home.homeDirectory}/nix-config/config/zen" + repo_zen="${config.home.homeDirectory}/.config/nix/config/zen" if [ ! -d "$zen_config" ]; then exit 0 diff --git a/home/modules/shell.nix b/home/modules/shell.nix index f5061ca..ed2019d 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -557,15 +557,15 @@ in }; xdg.configFile."lf/previewer" = { - source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/lf/previewer"; + source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/lf/previewer"; }; xdg.configFile."lf/cleaner" = { - source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/lf/cleaner"; + source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/lf/cleaner"; }; xdg.configFile."lf/lf.lua".source = - config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/lf/lf.lua"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/lf/lf.lua"; xdg.configFile."lf/sort.py".source = - config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/lf/sort.py"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/lf/sort.py"; } diff --git a/home/modules/theme.nix b/home/modules/theme.nix index 7310cff..74a2072 100644 --- a/home/modules/theme.nix +++ b/home/modules/theme.nix @@ -73,13 +73,13 @@ in }; home.file.".local/share/fonts".source = - config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/fonts"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/fonts"; home.activation.checkFonts = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - if [ ! -d "${config.home.homeDirectory}/nix-config/fonts" ] || \ - [ -z "$(ls -A "${config.home.homeDirectory}/nix-config/fonts" 2>/dev/null)" ]; then - echo "WARNING: ~/nix-config/fonts is missing or empty — fonts will not be available" - echo " copy your fonts into ~/nix-config/fonts/ and rebuild" + if [ ! -d "${config.home.homeDirectory}/.config/nix/fonts" ] || \ + [ -z "$(ls -A "${config.home.homeDirectory}/.config/nix/fonts" 2>/dev/null)" ]; then + echo "WARNING: ~/.config/nix/fonts is missing or empty — fonts will not be available" + echo " copy your fonts into ~/.config/nix/fonts/ and rebuild" fi ''; }; diff --git a/home/modules/ui.nix b/home/modules/ui.nix index 136a30e..06f94ca 100644 --- a/home/modules/ui.nix +++ b/home/modules/ui.nix @@ -541,5 +541,5 @@ in ''; xdg.configFile."X11".source = - config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/X11"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/X11"; }