From b28639701d6d98d809c86b736d76c9095b04071e Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sat, 1 Jul 2023 12:46:13 -0500 Subject: [PATCH 1/3] First pass splitting out home-manager again --- home/default.nix | 31 ++++++++---------- home/programs.nix | 61 ++++++++++++++++++++++++++++++++++++ hosts/loki/configuration.nix | 2 +- workstation/default.nix | 59 +--------------------------------- 4 files changed, 76 insertions(+), 77 deletions(-) create mode 100644 home/programs.nix diff --git a/home/default.nix b/home/default.nix index 0c2a5bf..91c4f5f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,28 +1,23 @@ { config, pkgs, ... }: { - imports = - [ - - ]; - users.users.don.isNormalUser = true; - home-manager = { - users.don = { - home.username = "don"; - home.homeDirectory = "/home/don"; - home.stateVersion = "22.11"; - programs.go.enable = true; + imports = [ + ./programs.nix + ./services.nix + ./mpv.nix + ./neovim.nix + ]; + home = { + username = "don"; + homeDirectory = "/home/don"; + stateVersion = "23.05"; + }; + programs.home-manager.enable = true; + programs.go.enable = true; # services = { # nextcloud-client = { # enable = true; # startInBackground = true; # }; # }; - imports = [ - ./services.nix - ./mpv.nix - ./neovim.nix - ]; - }; - }; } diff --git a/home/programs.nix b/home/programs.nix new file mode 100644 index 0000000..2ed57f9 --- /dev/null +++ b/home/programs.nix @@ -0,0 +1,61 @@ +{ config, pkgs, ... }: +{ + home.packages = [ + pkgs.bc + pkgs.bitwarden-cli + pkgs.diff-so-fancy + pkgs.exiftool + pkgs.figlet + pkgs.file + pkgs.fzf + pkgs.git-crypt + pkgs.gitFull + pkgs.gnumake + pkgs.gnupg + pkgs.gping + pkgs.gtop + pkgs.hugo + pkgs.jq + pkgs.keychain + pkgs.keyutils + pkgs.khal + pkgs.khard + pkgs.lazygit + pkgs.links2 + pkgs.mairix + pkgs.moreutils + pkgs.mosh + pkgs.mutt-ics + pkgs.ncdu + pkgs.neofetch + pkgs.neomutt + pkgs.newsboat + pkgs.nmap + pkgs.notmuch + pkgs.pandoc + pkgs.ps_mem + pkgs.psmisc + pkgs.ranger + pkgs.sqlite + pkgs.syncthing + pkgs.tailscale + pkgs.tasksh + pkgs.taskwarrior + pkgs.tig + pkgs.timewarrior + pkgs.tmux + pkgs.tmux-cssh + pkgs.tmuxp + pkgs.toot + pkgs.topgrade + pkgs.tut + pkgs.unzip + pkgs.urlview + pkgs.vdirsyncer + pkgs.vifm-full + pkgs.vit + pkgs.wget + pkgs.zip + ]; + +} diff --git a/hosts/loki/configuration.nix b/hosts/loki/configuration.nix index a1f5741..0c176e9 100644 --- a/hosts/loki/configuration.nix +++ b/hosts/loki/configuration.nix @@ -6,7 +6,7 @@ /etc/nixos/hardware-configuration.nix ../../workstation - ../../home + #../../home ../../wm/sway ]; networking.hostName = "loki"; diff --git a/workstation/default.nix b/workstation/default.nix index 87dd708..b32a766 100644 --- a/workstation/default.nix +++ b/workstation/default.nix @@ -140,9 +140,6 @@ in authy bash-completion nix-bash-completions - bc - #bitwarden - bitwarden-cli blueberry btop cantarell-fonts @@ -150,72 +147,42 @@ in clipman cura darktable - diff-so-fancy dmenu-wayland espeak-classic - exiftool - feh - figlet - file firefox flameshot font-awesome fractal-next fuzzel - fzf - git-crypt - gitFull gnome.gnome-tweaks gnome.simple-scan - gnumake gnumeric - gnupg - gping - gtop headset-charge-indicator headsetcontrol - hugo + home-manager hunspell hunspellDicts.en_US imagemagick imv isync jellyfin-media-player - jq kanshi - keychain - keyutils - khal - khard kitty ktimer lapce - lazygit libappindicator libnotify libreoffice-fresh libsForQt5.kwallet libsForQt5.qtkeychain - links2 lsb-release - mairix - moreutils - mosh #mpv #mutt - mutt-ics - ncdu - neofetch - neomutt neovim-qt nerdfonts - newsboat nextcloud-client - nmap - notmuch noto-fonts obsidian - pandoc pasystray pavucontrol pkg-config @@ -223,54 +190,30 @@ in poppler_utils poweralertd powerline-fonts - ps_mem - psmisc pulseaudio - #python3 qpwgraph qutebrowser-qt6 - ranger rofi ruby signal-desktop sshuttle sonixd source-code-pro - sqlite steam stellarium #sublime-music - syncthing - tailscale - tasksh - taskwarrior tdesktop terminus-nerdfont texlive.combined.scheme-medium - tig - timewarrior thunderbird - tmux - tmux-cssh - tmuxp - toot - topgrade - tut ubuntu_font_family udiskie - unzip - urlview - vdirsyncer - vifm-full - vit - wget widevine-cdm wireplumber wlsunset xdg-utils xfce.thunar zathura - zip zoom-us ]; From ba30e93eecd12a4e44c2d96d47c1ba0b681dea17 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 2 Jul 2023 00:05:33 -0500 Subject: [PATCH 2/3] home | add tmuxinator and neovim module --- home/bufferline.nix | 101 ++++++++++++++++++++++++++++++++++++++++++++ home/default.nix | 1 + home/neovim.nix | 3 ++ home/tmux.nix | 7 +++ 4 files changed, 112 insertions(+) create mode 100644 home/bufferline.nix create mode 100644 home/tmux.nix diff --git a/home/bufferline.nix b/home/bufferline.nix new file mode 100644 index 0000000..f019b2f --- /dev/null +++ b/home/bufferline.nix @@ -0,0 +1,101 @@ +{ pkgs, ... }: +{ + programs.neovim = { + plugins = with pkgs.vimPlugins; [ + { + plugin = bufferline-nvim; + type = "lua"; + config = '' + require("bufferline").setup({ + options = { + close_command = "bdelete! %d", -- can be a string | function, see "Mouse actions" + right_mouse_command = "bdelete! %d", -- can be a string | function, see "Mouse actions" + offsets = { { filetype = "NvimTree", text = "", padding = 1 } }, + separator_style = "thin", -- | "thick" | "thin" | { 'any', 'any' }, + }, + highlights = { + fill = { + fg = "#ff0000", + bg = { attribute = "bg", highlight = "TabLine" }, + }, + background = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + + buffer_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + + close_button = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + close_button_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + + tab_selected = { + fg = { attribute = "fg", highlight = "Normal" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + tab = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + tab_close = { + fg = { attribute = "fg", highlight = "TabLineSel" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + + duplicate_selected = { + fg = { attribute = "fg", highlight = "TabLineSel" }, + bg = { attribute = "bg", highlight = "TabLineSel" }, + italic = true, + }, + duplicate_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + italic = true, + }, + duplicate = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + italic = true, + }, + + modified = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + modified_selected = { + fg = { attribute = "fg", highlight = "Normal" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + modified_visible = { + fg = { attribute = "fg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + + separator = { + fg = { attribute = "bg", highlight = "TabLine" }, + bg = { attribute = "bg", highlight = "TabLine" }, + }, + separator_selected = { + fg = { attribute = "bg", highlight = "Normal" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + indicator_selected = { + fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" }, + bg = { attribute = "bg", highlight = "Normal" }, + }, + }, + }) + ''; + } + ]; + }; +} +# vim: shiftwidth=2 tabstop=2 expandtab diff --git a/home/default.nix b/home/default.nix index 91c4f5f..8cb1205 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,6 +5,7 @@ ./programs.nix ./services.nix ./mpv.nix + ./tmux.nix ./neovim.nix ]; home = { diff --git a/home/neovim.nix b/home/neovim.nix index 0c567b2..e782b9d 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -60,4 +60,7 @@ vimwiki ]; }; + imports = [ + ./bufferline.nix + ]; } diff --git a/home/tmux.nix b/home/tmux.nix new file mode 100644 index 0000000..bbd704e --- /dev/null +++ b/home/tmux.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: +{ + programs.tmux = { + enable = true; + tmuxinator.enable = true; + }; +} From dd08a97f695ea3f85b9a08aa67286052b03ebe67 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 2 Jul 2023 20:45:51 -0500 Subject: [PATCH 3/3] move home stuff seperate --- hosts/ace/configuration.nix | 1 - hosts/dragon/configuration.nix | 1 - hosts/eve/configuration.nix | 1 - hosts/loki/configuration.nix | 1 - hosts/pocket2/configuration.nix | 1 - hosts/smaug/configuration.nix | 1 - 6 files changed, 6 deletions(-) diff --git a/hosts/ace/configuration.nix b/hosts/ace/configuration.nix index 0c811a2..793d999 100644 --- a/hosts/ace/configuration.nix +++ b/hosts/ace/configuration.nix @@ -5,7 +5,6 @@ [ /etc/nixos/hardware-configuration.nix ../../workstation - ../../home ../../wm/sway ]; networking.hostName = "ace"; diff --git a/hosts/dragon/configuration.nix b/hosts/dragon/configuration.nix index 52dfb67..528eed1 100644 --- a/hosts/dragon/configuration.nix +++ b/hosts/dragon/configuration.nix @@ -5,7 +5,6 @@ [ /etc/nixos/hardware-configuration.nix ../../workstation - ../../home ../../wm/sway ]; networking.hostName = "dragon"; diff --git a/hosts/eve/configuration.nix b/hosts/eve/configuration.nix index ed73b5e..5748248 100644 --- a/hosts/eve/configuration.nix +++ b/hosts/eve/configuration.nix @@ -6,7 +6,6 @@ /etc/nixos/hardware-configuration.nix ../../workstation - ../../home ../../wm/sway ]; networking.hostName = "eve"; diff --git a/hosts/loki/configuration.nix b/hosts/loki/configuration.nix index 0c176e9..a513560 100644 --- a/hosts/loki/configuration.nix +++ b/hosts/loki/configuration.nix @@ -6,7 +6,6 @@ /etc/nixos/hardware-configuration.nix ../../workstation - #../../home ../../wm/sway ]; networking.hostName = "loki"; diff --git a/hosts/pocket2/configuration.nix b/hosts/pocket2/configuration.nix index 76e4cd8..7457911 100644 --- a/hosts/pocket2/configuration.nix +++ b/hosts/pocket2/configuration.nix @@ -5,7 +5,6 @@ [ /etc/nixos/hardware-configuration.nix ../../workstation - ../../home ../../wm/sway ]; networking.hostName = "pocket2"; diff --git a/hosts/smaug/configuration.nix b/hosts/smaug/configuration.nix index 48622b2..3052395 100644 --- a/hosts/smaug/configuration.nix +++ b/hosts/smaug/configuration.nix @@ -6,7 +6,6 @@ /etc/nixos/hardware-configuration.nix ../../workstation - ../../home ../../wm/sway ]; networking.hostName = "smaug";