home, os: refactor

7 files changed, 42 insertions, 6 deletions

diff --git a/home/cez/home.nix b/home/cez/home.nix
index a97ce83..bba7bd9 100644
--- a/home/cez/home.nix
+++ b/home/cez/home.nix
@@ -1,3 +1,3 @@
 { ... }: {
-  imports = [ ../wayland/home.nix ];
+  imports = [ ../pc/home.nix ];
 }
diff --git a/home/common/home.nix b/home/common/home.nix
index c103a3f..13cbff5 100644
--- a/home/common/home.nix
+++ b/home/common/home.nix
@@ -17,11 +17,12 @@ in {
       htop
       curl
       file
+      nnn
+      ps_mem
+
       dig
       tcpdump
       mtr
-      nnn
-      ps_mem
       geoipWithDatabase
     ];
   };
diff --git a/home/common/modules/mimeapps.nix b/home/common/modules/mimeapps.nix
index 6f4b770..269cea6 100644
--- a/home/common/modules/mimeapps.nix
+++ b/home/common/modules/mimeapps.nix
@@ -1,6 +1,7 @@
 { ... }: {
   xdg.mimeApps = {
     enable = true;
+
     defaultApplications = {
       # text
       "application/javascript" = "nvim.desktop";
diff --git a/home/pc/home.nix b/home/pc/home.nix
new file mode 100644
index 0000000..cad5bd6
--- /dev/null
+++ b/home/pc/home.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  imports = [
+    ./modules/pass.nix
+    ./modules/dev.nix
+    ../wayland/home.nix
+  ];
+
+  home.packages = with pkgs; [ ffmpeg ];
+}
diff --git a/home/pc/modules/dev.nix b/home/pc/modules/dev.nix
new file mode 100644
index 0000000..0d51bdb
--- /dev/null
+++ b/home/pc/modules/dev.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }: {
+  programs.man.enable = true;
+
+  home.packages = with pkgs; [
+    git
+    sops
+
+    man-pages
+    man-pages-posix
+
+    nil
+    nodePackages.bash-language-server
+  ];
+}
diff --git a/home/pc/modules/pass.nix b/home/pc/modules/pass.nix
new file mode 100644
index 0000000..9117c3a
--- /dev/null
+++ b/home/pc/modules/pass.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    (pass.withExtensions (exts: [ exts.pass-otp ]))
+  ];
+
+  services.gpg-agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-bemenu;
+  };
+}
diff --git a/home/wayland/home.nix b/home/wayland/home.nix
index a7d2186..253e4f1 100644
--- a/home/wayland/home.nix
+++ b/home/wayland/home.nix
@@ -9,13 +9,14 @@
   ];
 
   home.packages = with pkgs; [
-    mpv
-    imv
     wtype
-    qemu
     grim
     slurp
     xdg-utils
+
+    mpv
+    imv
+    qemu
     element-desktop-wayland
   ];
 }