From dff742a856500c1cd14fe7242837311bb3fdd998 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 17 Oct 2026 02:56:13 -0400 Subject: [PATCH] tree --- client-configuration.nix | 2 +- mako.nix | 7 ++++++ mako/config | 47 ++++++++++++++++++++++++++++++++++++ nvim.nix | 30 +++++++++++++++++++++++ nvim/init.lua | 1 + nvim/lua/config/autocmds.lua | 0 nvim/lua/config/keymaps.lua | 0 nvim/lua/config/lazy.lua | 39 ++++++++++++++++++++++++++++++ nvim/lua/config/options.lua | 2 ++ nvim/lua/plugins/example.lua | 1 + shared-configuration.nix | 4 +++ 11 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 mako.nix create mode 100644 mako/config create mode 100644 nvim.nix create mode 100644 nvim/init.lua create mode 100644 nvim/lua/config/autocmds.lua create mode 100644 nvim/lua/config/keymaps.lua create mode 100644 nvim/lua/config/lazy.lua create mode 100644 nvim/lua/config/options.lua create mode 100644 nvim/lua/plugins/example.lua diff --git a/client-configuration.nix b/client-configuration.nix index a594e35..f2a5f50 100644 --- a/client-configuration.nix +++ b/client-configuration.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, inputs, ... }: { - imports = [ ./waybar.nix ]; + imports = [ ./waybar.nix ./mako.nix ]; nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/mako.nix b/mako.nix new file mode 100644 index 0000000..435afb4 --- /dev/null +++ b/mako.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + home-manager.users.jeremy = { ... }: { + xdg.configFile."mako/config".source = ./mako/config; + }; +} diff --git a/mako/config b/mako/config new file mode 100644 index 0000000..0d3c199 --- /dev/null +++ b/mako/config @@ -0,0 +1,47 @@ +font=JetBrainsMono Nerd Font 11 +background-color=#1a1b26ee +text-color=#c0caf5 +border-color=#7aa2f7 +progress-color=over #7aa2f733 +border-size=2 +border-radius=12 +padding=14,18 +margin=12 +default-timeout=5000 +ignore-timeout=0 +width=380 +height=140 +icons=1 +max-icon-size=48 +icon-location=left +icon-border-radius=8 +layer=overlay +anchor=top-right +outer-margin=10 +max-visible=5 +group-by=app-name +format=%s\n%b + +[urgency=low] +border-color=#565f89 +text-color=#acb0d0 +default-timeout=4000 + +[urgency=normal] +border-color=#7aa2f7 + +[urgency=critical] +border-color=#f7768e +text-color=#f7768e +background-color=#1a1b26f2 +default-timeout=0 + +[category=mpd] +border-color=#9ece6a +default-timeout=2000 + +[app-name=discord] +border-color=#bb9af7 + +[app-name=Slack] +border-color=#e0af68 diff --git a/nvim.nix b/nvim.nix new file mode 100644 index 0000000..873be6a --- /dev/null +++ b/nvim.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + neovim + git + gcc + gnumake + ripgrep + fd + lazygit + tree-sitter + nodejs + unzip + wget + curl + xclip + wl-clipboard + nerd-fonts.jetbrains-mono + ]; + + home-manager.users.jeremy = { ... }: { + xdg.configFile."nvim/init.lua".source = ./nvim/init.lua; + xdg.configFile."nvim/lua/config/lazy.lua".source = ./nvim/lua/config/lazy.lua; + xdg.configFile."nvim/lua/config/options.lua".source = ./nvim/lua/config/options.lua; + xdg.configFile."nvim/lua/config/keymaps.lua".source = ./nvim/lua/config/keymaps.lua; + xdg.configFile."nvim/lua/config/autocmds.lua".source = ./nvim/lua/config/autocmds.lua; + xdg.configFile."nvim/lua/plugins/example.lua".source = ./nvim/lua/plugins/example.lua; + }; +} diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..55b8979 --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1 @@ +require("config.lazy") diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..e69de29 diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..e69de29 diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..29ce2ac --- /dev/null +++ b/nvim/lua/config/lazy.lua @@ -0,0 +1,39 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { import = "plugins" }, + }, + defaults = { + lazy = false, + version = false, + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { enabled = true }, + performance = { + rtp = { + disabled_plugins = { + "gzip", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua new file mode 100644 index 0000000..3ee3c34 --- /dev/null +++ b/nvim/lua/config/options.lua @@ -0,0 +1,2 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" diff --git a/nvim/lua/plugins/example.lua b/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/nvim/lua/plugins/example.lua @@ -0,0 +1 @@ +return {} diff --git a/shared-configuration.nix b/shared-configuration.nix index 7e05b87..6d57e02 100644 --- a/shared-configuration.nix +++ b/shared-configuration.nix @@ -1,5 +1,9 @@ { config, lib, pkgs, inputs, ... }: { + imports = [ ./nvim.nix ]; + + environment.systemPackages = with pkgs; [ tree ]; + programs.ssh.extraConfig = '' Host rocky Hostname 100.125.188.0