hosts/de-lacadie/home.nix

@@ -1,5 +1,3 @@
-# de-lacadie
-
 { lib, pkgs, ... }:
 
 {
@@ -8,9 +6,58 @@
   ];
   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;
+
 }

hosts/randolph/home.nix

@@ -1,5 +1,3 @@
-# randolph
-
 { pkgs, ... }:
 
 rec {
@@ -8,19 +6,77 @@ 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 = with pkgs;
+  home.packages =
-  # [
+  let
-  #   hunspell
+    overlay = (final: prev: {
-  #   hunspellDicts.fr-any
+      olympus = prev.callPackage ../../pkgs/olympus/package.nix { };
-  #   hunspellDicts.fr-moderne
+      olympus-unwrapped = prev.callPackage ../../pkgs/olympus-unwrapped/package.nix { };
-  #   hunspellDicts.fr-classique
+    });
-  # ] ++ # Spell checking
+  in
-  [ ] ++ # Temp
+  (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";
+  };
 
   services.batsignal = {
       enable = true;

snippets/common_home.nix

@@ -15,18 +15,10 @@
     ./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";
 
@@ -56,42 +48,12 @@
     };
   };
 
+
   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 xfce.tumbler xfce.ristretto hledger ] ++
+  [ xdg-terminal-exec glib upower ] ++
   (let
     archivo = callPackage ../pkgs/archivo/archivo.nix { };
     highway-gothic = callPackage ../pkgs/highway-gothic/highway-gothic.nix { };
@@ -117,16 +79,8 @@
   ]) ++ # 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";
-  };
 }

snippets/kakoune.nix

@@ -77,15 +77,10 @@
 
       # don't remove trailing indent
       set global disabled_hooks .*-trim-indent
-
       source ${pkgs.writeText "kakoune-divider.kak" (builtins.readFile ./kakoune/divider.kak)}
       set-option global divider_face LineNumbers
       divider-on 80
 
-      source ${pkgs.writeText "move-lines.kak" (builtins.readFile ./kakoune/move-lines.kak)}
-      map global normal <c-s-j> ': move-lines-down %val{count}<ret>'
-      map global normal <c-s-k> ': move-lines-up %val{count}<ret>'
-
       # byline enables extending selection with x
       require-module byline
 

snippets/kakoune/move-lines.kak

@@ -1,13 +0,0 @@
-define-command move-lines-down \
--docstring 'move-lines-down [<count>] move selected lines down by <count> or one line' \
--params ..1 \
-%{
-    execute-keys -draft "x<a-_><a-:>Z;ez;%arg{1}J<a-;>LxdzP"
-}
-
-define-command move-lines-up \
--docstring 'move-lines-up [<count>] move selected lines up by <count> or one line' \
--params ..1 \
-%{
-    execute-keys -draft "x<a-_><a-:><a-;>Z;bz;%arg{1}K<a-;>Hxdzp"
-}