Merge pull request 'split-homemanager' (#6) from split-homemanager into main

Reviewed-on: https://git.duckland.org/don/NixOS-Configs/pulls/6

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

home/default.nix

@@ -1,28 +1,24 @@
 { config, pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [
+    ./programs.nix
-      <home-manager/nixos>
+    ./services.nix
-    ];
+    ./mpv.nix
-  users.users.don.isNormalUser = true;
+    ./tmux.nix
-  home-manager = {
+    ./neovim.nix
-    users.don = {
+  ];
-      home.username = "don";
+  home = {
-      home.homeDirectory = "/home/don";
+      username = "don";
-      home.stateVersion = "22.11";
+      homeDirectory = "/home/don";
-      programs.go.enable = true;
+      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
-      ];
-    };
-  };
 }

home/neovim.nix

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

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

home/tmux.nix

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

hosts/ace/configuration.nix

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

hosts/dragon/configuration.nix

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

hosts/eve/configuration.nix

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

hosts/loki/configuration.nix

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

hosts/pocket2/configuration.nix

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

hosts/smaug/configuration.nix

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

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