From 2cfe93780fac55c5800aa123d067b624c9ebaf0e Mon Sep 17 00:00:00 2001 From: vorboyvo Date: Wed, 3 Dec 2025 14:51:23 -0500 Subject: [PATCH] Consolidated a bunch of stuff into common home. --- hosts/de-lacadie/home.nix | 51 +------------------------ hosts/randolph/home.nix | 78 ++++++--------------------------------- snippets/common_home.nix | 52 ++++++++++++++++++++++++-- 3 files changed, 62 insertions(+), 119 deletions(-) diff --git a/hosts/de-lacadie/home.nix b/hosts/de-lacadie/home.nix index 13043f5..e91f5bf 100644 --- a/hosts/de-lacadie/home.nix +++ b/hosts/de-lacadie/home.nix @@ -1,3 +1,5 @@ +# de-lacadie + { lib, pkgs, ... }: { @@ -6,58 +8,9 @@ ]; home.stateVersion = "24.05"; - # Configure default applications as per /snippets/defaults.nix - defaultPrograms = with pkgs; { - terminal = alacritty; - editor = kakoune; - browser = firefox; - mail = thunderbird; - }; - # Install packages home.packages = with pkgs; - let - overlay = (final: prev: { - olympus = prev.callPackage ../../pkgs/olympus/package.nix { }; - olympus-unwrapped = prev.callPackage ../../pkgs/olympus-unwrapped/package.nix { }; - }); - in - (with (pkgs.extend overlay); [ olympus ]) ++ - [ - kak-lsp - brightnessctl - jq - blueman - ] ++ # Basic utilities - [ bitwarden-cli htop snore hledger hledger-ui ] - ++ # Personalized selection of command-line (CLI/TUI) apps - [ - vlc - pavucontrol - ] ++ # Basic graphical apps - [ - libreoffice - signal-desktop - prismlauncher - mumble - gimp - inkscape - deluge-gtk - shotwell - lorien - keepassxc - zulip - filezilla - bitwarden - activate-linux - remmina - pinta - ] ++ # Personalized selection of graphical apps - [ shticker-book-unwritten ] ++ # Games - [ bemenu j4-dmenu-desktop xclip xdotool ] ++ # i3 and x11 related packages [ ] ++ # Temp [ ]; - programs.home-manager.enable = true; - } diff --git a/hosts/randolph/home.nix b/hosts/randolph/home.nix index 7a926ba..9964fe7 100644 --- a/hosts/randolph/home.nix +++ b/hosts/randolph/home.nix @@ -1,3 +1,5 @@ +# randolph + { pkgs, ... }: rec { @@ -6,77 +8,19 @@ rec { ]; home.stateVersion = "23.11"; - # Configure default applications as per /snippets/defaults.nix - defaultPrograms = with pkgs; { - terminal = alacritty; - editor = kakoune; - browser = firefox; - mail = thunderbird; - }; - # Configure cursor home.pointerCursor.size = 256; # Install packages - home.packages = - let - overlay = (final: prev: { - olympus = prev.callPackage ../../pkgs/olympus/package.nix { }; - olympus-unwrapped = prev.callPackage ../../pkgs/olympus-unwrapped/package.nix { }; - }); - in - (with (pkgs.extend overlay); [ olympus ]) ++ - (with pkgs; - [ - blueman - kalker - tldr - ] ++ # Basic utilities - [ htop snore catgirl ] - ++ # Personalized selection of command-line (CLI/TUI) apps - [ defaultPrograms.terminal ] ++ # Terminal emulator - [ - vlc - pavucontrol - font-manager - ] ++ # Basic graphical apps - [ - libreoffice - signal-desktop - prismlauncher - mumble - gimp - inkscape - deluge-gtk # Client BitTorrent - shotwell - lorien - keepassxc - zulip - filezilla - bitwarden-desktop - activate-linux - remmina - pinta - ] ++ # Personalized selection of graphical apps - [ - shticker-book-unwritten - ] ++ # Games - [ - hunspell - hunspellDicts.fr-any - hunspellDicts.fr-moderne - hunspellDicts.fr-classique - ] ++ # Spell checking - [ keyutils ] ++ # Temp - [ ]); - - programs.home-manager.enable = true; - - # Fixes electron apps - home.sessionVariables = - { - NIXOS_OZONE_WL = "1"; - }; + home.packages = with pkgs; + # [ + # hunspell + # hunspellDicts.fr-any + # hunspellDicts.fr-moderne + # hunspellDicts.fr-classique + # ] ++ # Spell checking + [ ] ++ # Temp + [ ]; services.batsignal = { enable = true; diff --git a/snippets/common_home.nix b/snippets/common_home.nix index 9ab23a1..ab7a0c8 100644 --- a/snippets/common_home.nix +++ b/snippets/common_home.nix @@ -15,10 +15,18 @@ ./waybar.nix ./firefox.nix ./thunderbird.nix - ./imv.nix + # ./imv.nix ./zathura.nix ]; + # Configure default applications as per /snippets/defaults.nix + defaultPrograms = with pkgs; { + terminal = alacritty; + editor = kakoune; + browser = firefox; + mail = thunderbird; + }; + home.username = "alice"; home.homeDirectory = "/home/alice"; @@ -48,12 +56,42 @@ }; }; - home.packages = with pkgs; + let + overlay = (final: prev: { + olympus = prev.callPackage ../pkgs/olympus/package.nix { }; + olympus-unwrapped = prev.callPackage ../pkgs/olympus-unwrapped/package.nix { }; + }); + in + (with (pkgs.extend overlay); [ olympus ]) ++ + [ kalker tldr htop snore ] ++ # Basic CLI/TUI utilities + [ catgirl hledger hledger-ui ] ++ # Selection of CLI/TUI apps + [ blueman pavucontrol font-manager ] ++ # Basic graphical utilities + [ + libreoffice + signal-desktop + mumble + gimp + inkscape + deluge-gtk + shotwell + lorien + keepassxc + zulip + filezilla + bitwarden-desktop + activate-linux + remmina + pinta + ] ++ # Selection of graphical apps + [ + prismlauncher + shticker-book-unwritten + ] ++ # Games [ marksman nil ] ++ # Language servers for built in languages [ texliveFull texlab ] ++ # LaTeX - remove this eventually and put it in dev # envs - [ xdg-terminal-exec glib upower ] ++ + [ xdg-terminal-exec glib upower xfce.tumbler xfce.ristretto hledger ] ++ (let archivo = callPackage ../pkgs/archivo/archivo.nix { }; highway-gothic = callPackage ../pkgs/highway-gothic/highway-gothic.nix { }; @@ -79,8 +117,16 @@ ]) ++ # Fonts []; + programs.home-manager.enable = true; + # terminal emulator programs.alacritty.enable = true; programs.pandoc.enable = true; + + # Fixes electron apps + home.sessionVariables = + { + NIXOS_OZONE_WL = "1"; + }; }