refactor

home-manager/sajenim/features/cli/default.nix

@@ -1,15 +1,22 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   imports = [
     ./git.nix
     ./mpd.nix
-    ./nvim.nix
-    ./remarkable.nix
     ./ssh.nix
-    ./zsh.nix
   ];
 
-  home.packages = with pkgs; [
-    pulsemixer
-    unstable.qmk
-  ];
+  home.packages = with pkgs;
+    [
+      mum
+      pulsemixer
+      unstable.qmk
+      unstable.rmapi
+    ]
+    ++ [
+      inputs.remarks.packages.${pkgs.system}.default
+    ];
 }

home-manager/sajenim/features/cli/nvim.nix

@@ -1,18 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  home.packages = [
-    # Toolchain
-    pkgs.direnv
-    pkgs.gcc
-    pkgs.pandoc
-    pkgs.python313Full
-    pkgs.texliveFull
-
-
-    # Install our nixvim configuration for neovim.
-    inputs.nixvim.packages.${pkgs.system}.default
-  ];
-}

home-manager/sajenim/features/cli/remarkable.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  # This module is for the ReMarkable tablet, which is a Linux-based e-reader
-  home.packages = [
-    # Allows access to the ReMarkable Cloud API
-    pkgs.unstable.rmapi
-    # Converts ReMarkable files to PDF
-    inputs.remarks.packages.${pkgs.system}.default
-  ];
-}

home-manager/sajenim/features/cli/zsh.nix

@@ -1,53 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    fzf # command-line fuzzy finder
-  ];
-
-  programs.zsh = {
-    enable = true;
-
-    # Enable extra features
-    autosuggestion = {
-      enable = true;
-    };
-    syntaxHighlighting = {
-      enable = true;
-    };
-    enableCompletion = true;
-    dotDir = ".config/zsh";
-
-    # Aliases
-    shellAliases = {
-      c = "clear";
-      la = "ls -a";
-      ll = "ls -l";
-      tt = "wezterm cli set-tab-title ";
-      mount-backup = "sshfs viridian:/srv/shares/sajenim /home/sajenim/.backup";
-      mount-turing = "sshfs turing:/home/jwils254 /home/sajenim/.turing";
-    };
-
-    # Install plugins
-    plugins = [
-      {
-        name = "fzf-tab";
-        src = pkgs.fetchFromGitHub {
-          owner = "Aloxaf";
-          repo = "fzf-tab";
-          rev = "5a81e13792a1eed4a03d2083771ee6e5b616b9ab";
-          sha256 = "dPe5CLCAuuuLGRdRCt/nNruxMrP9f/oddRxERkgm1FE=";
-        };
-      }
-    ];
-
-    # Extra commands that should be added to '.zshrc'
-    initContent = ''
-      eval "$(direnv hook zsh)"
-      source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
-      path+=('/home/sajenim/.repositories/sysadmin.sh/bin')
-      bindkey "^[[1;5C" forward-word
-      bindkey "^[[1;5D" backward-word
-      export PATH
-      PROMPT='%F{blue}%n@%m %F{cyan}%~ %F{red}♥ %f';
-    '';
-  };
-}

home-manager/sajenim/features/editor/default.nix

@@ -0,0 +1,16 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs;
+    [
+      gcc
+      pandoc
+      python313Full
+      texliveFull
+    ]
+    ++ [
+      inputs.nixvim.packages.${pkgs.system}.default
+    ];
+}