Compare commits

...

4 Commits

5 changed files with 17 additions and 7 deletions

View File

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: { }: {
imports = [ imports = [
@ -43,9 +44,11 @@
hive.zsh.enable = true; hive.zsh.enable = true;
hive.nix-scripts.enable = true; hive.nix-scripts.enable = true;
hive.doom.enable = true; hive.doom.enable = true;
hive.doom.asDefaultEditor = true;
hive.doom.enableCopilot = true; hive.doom.enableCopilot = true;
hive.doom.withNixPkgs = true; hive.doom.withNixPkgs = true;
hive.doom.withShellPkgs = true; hive.doom.withShellPkgs = true;
hive.doom.withPythonPkgs = true;
# Make session variables available in systemd units # Make session variables available in systemd units
# SEE: https://github.com/nix-community/home-manager/pull/5543 # SEE: https://github.com/nix-community/home-manager/pull/5543
@ -81,7 +84,7 @@
home.stateVersion = "24.11"; # Please read the comment before changing. home.stateVersion = "24.11"; # Please read the comment before changing.
home.sessionVariables = { home.sessionVariables = {
EDITOR = "vim"; EDITOR = lib.mkDefault "vim";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.

View File

@ -1,4 +1,4 @@
{...}: { {lib, ...}: {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = "jonas"; home.username = "jonas";
@ -9,6 +9,7 @@
hive.nix-scripts.enable = true; hive.nix-scripts.enable = true;
hive.ranger.enable = true; hive.ranger.enable = true;
hive.doom.enable = true; hive.doom.enable = true;
hive.doom.asDefaultEditor = true;
hive.doom.withNixPkgs = true; hive.doom.withNixPkgs = true;
hive.doom.withShellPkgs = true; hive.doom.withShellPkgs = true;
@ -22,7 +23,7 @@
home.stateVersion = "24.11"; # Please read the comment before changing. home.stateVersion = "24.11"; # Please read the comment before changing.
home.sessionVariables = { home.sessionVariables = {
EDITOR = "vim"; EDITOR = lib.mkDefault "vim";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.

View File

@ -1,4 +1,8 @@
{config, ...}: rec { {
config,
lib,
...
}: rec {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = "jonas"; home.username = "jonas";
@ -10,10 +14,12 @@
# hive moduless # hive moduless
hive.doom.enable = true; hive.doom.enable = true;
hive.doom.asDefaultEditor = true;
hive.doom.enableCopilot = true; hive.doom.enableCopilot = true;
hive.doom.enableTidal = true; hive.doom.enableTidal = true;
hive.doom.withNixPkgs = true; hive.doom.withNixPkgs = true;
hive.doom.withShellPkgs = true; hive.doom.withShellPkgs = true;
hive.doom.withPythonPkgs = true;
hive.firefox = { hive.firefox = {
enable = true; enable = true;
plasmaIntegration = false; plasmaIntegration = false;
@ -62,7 +68,7 @@
home.stateVersion = "24.11"; # Please read the comment before changing. home.stateVersion = "24.11"; # Please read the comment before changing.
home.sessionVariables = { home.sessionVariables = {
EDITOR = "vim"; EDITOR = lib.mkDefault "vim";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.

View File

@ -14,7 +14,7 @@
${pkgs.alejandra}/bin/alejandra . &>/dev/null ${pkgs.alejandra}/bin/alejandra . &>/dev/null
${pkgs.git}/bin/git diff -U0 ${pkgs.git}/bin/git diff -U0
echo "NixOS Rebuilding..." echo "NixOS Rebuilding..."
${pkgs.nh}/bin/nh home switch ~/.hive home-manager switch --flake ~/.hive -b backup --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json
gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1 "-" $2}') gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1 "-" $2}')
by="$(${pkgs.coreutils-full}/bin/whoami)@$(${pkgs.nettools}/bin/hostname)" by="$(${pkgs.coreutils-full}/bin/whoami)@$(${pkgs.nettools}/bin/hostname)"
${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen by $by" ${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen by $by"

View File

@ -28,7 +28,7 @@
vscode-langservers-extracted vscode-langservers-extracted
]; ];
default-shell-pkgs = with pkgs; [ default-shell-pkgs = with pkgs; [
emmet-ls bash-language-server
]; ];
default-nix-pkgs = with pkgs; [ default-nix-pkgs = with pkgs; [
alejandra alejandra