split-homemanager #6

Merged
don merged 3 commits from split-homemanager into main 2023-07-02 20:48:39 -05:00
12 changed files with 187 additions and 82 deletions

101
home/bufferline.nix Normal file
View file

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

View file

@ -1,28 +1,24 @@
{ config, pkgs, ... }:
{
imports =
[
<home-manager/nixos>
];
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
./tmux.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
];
};
};
}

View file

@ -60,4 +60,7 @@
vimwiki
];
};
imports = [
./bufferline.nix
];
}

61
home/programs.nix Normal file
View file

@ -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
];
}

7
home/tmux.nix Normal file
View file

@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
programs.tmux = {
enable = true;
tmuxinator.enable = true;
};
}

View file

@ -5,7 +5,6 @@
[
/etc/nixos/hardware-configuration.nix
../../workstation
../../home
../../wm/sway
];
networking.hostName = "ace";

View file

@ -5,7 +5,6 @@
[
/etc/nixos/hardware-configuration.nix
../../workstation
../../home
../../wm/sway
];
networking.hostName = "dragon";

View file

@ -6,7 +6,6 @@
<nixos-hardware/google/pixelbook>
/etc/nixos/hardware-configuration.nix
../../workstation
../../home
../../wm/sway
];
networking.hostName = "eve";

View file

@ -6,7 +6,6 @@
<nixos-hardware/dell/xps/13-9310>
/etc/nixos/hardware-configuration.nix
../../workstation
../../home
../../wm/sway
];
networking.hostName = "loki";

View file

@ -5,7 +5,6 @@
[
/etc/nixos/hardware-configuration.nix
../../workstation
../../home
../../wm/sway
];
networking.hostName = "pocket2";

View file

@ -6,7 +6,6 @@
<nixos-hardware/lenovo/thinkpad/x260>
/etc/nixos/hardware-configuration.nix
../../workstation
../../home
../../wm/sway
];
networking.hostName = "smaug";

View file

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