pray

common/users/meyer/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, inputs, systemImports, ... }:
 let
   NAME = "meyer";
 in

common/users/meyer/git.nix

@@ -1,35 +0,0 @@
-{ ... }: {
-  programs = {
-    git = {
-      enable = true;
-      userName = "sadan";
-      userEmail = "117494111+sadan4@users.noreply.github.com";
-      extraConfig = {
-        gpg = {
-          format = "ssh";
-        };
-        user = {
-          signingkey = "~/.ssh/id_ed25519";
-        };
-        commit = {
-          gpgsign = true;
-        };
-        core = {
-          autocrlf = "input";
-        };
-        pull = {
-          rebase = true;
-        };
-        push = {
-          autoSetupRemote = true;
-        };
-        init = {
-          defaultBranch = "main";
-        };
-        rerere = {
-          enabled = true;
-        };
-      };
-    };
-  };
-}

common/users/meyer/home.nix

@@ -3,35 +3,40 @@
   pkgs,
   inputs,
   ...
-}:
-
-let
-  file = import ../../files.nix { inherit config cpkg; };
-  shell = import ../../shell.nix { inherit config pkgs cpkg; };
-  cpkg = import ../../../customPackages { inherit pkgs inputs; };
-  pkgTypes = import ../../pkgs.nix {
-    inherit
-      pkgs
-      config
-      inputs
-      cpkg
-      ;
-  };
-  packages = pkgTypes.dev ++ pkgTypes.gui ++ pkgTypes.general ++ pkgTypes.scripts ++ pkgTypes.gaming;
-in
-{
+}: let
+  pinned = import ./pinned.nix { inherit pkgs config; };
+in {
   nixpkgs.config.allowInsecurePredicate = (pkg: true);
   nixpkgs.config.allowUnfreePredicate = (pkg: true);
+
   imports = [
+    ../homeModules/util.nix
+    ../homeModules/dev
+    ../homeModules/dev/ide
+    ../homeModules/dev/ide/jb/idea.nix
+    ../homeModules/dev/javascript.nix
+    ../homeModules/dev/cpp.nix
+    ../homeModules/dev/jvm.nix
+    ../homeModules/dev/python.nix
+    ../homeModules/media
+    ../homeModules/scripts
+    ../homeModules/audio.nix
+    ../homeModules/btop.nix
     ../homeModules/flameshot.nix
-    ../homeModules/arrpc.nix
+    ../homeModules/frog.nix
+    ../homeModules/gaming.nix
+    ../homeModules/git.nix
+    ../homeModules/kde.nix
+    ../homeModules/networking.nix
+    ../homeModules/nvim.nix
+    ../homeModules/obsidian.nix
+    ../homeModules/rofi.nix
+    ../homeModules/social.nix
+    ../homeModules/sops.nix
+    ../homeModules/terminal.nix
+    ../homeModules/virt.nix
+    ../homeModules/web.nix
     ../homeModules/zsh.nix
-    ../homeModules/desktopEntries.nix
-    ../homeModules/java.nix
-    ../homeModules/jetbrains
-    ../homeModules/notion.nix
-    ./sops.nix
-    ./git.nix
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
@@ -43,11 +48,13 @@ in
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home = {
-    inherit packages file;
+    packages = with pkgs; [
+      pinned.etcher
+    ]
+  };
+  home.shellAliases = {
+    sd = ''lsusb | grep Elgato | grep --perl-regexp "(?<=Device 0{0,10})[1-9]+" --only-matching | xargs printf "usb.device_address eq %s" | copy'';
   };
-  home.shellAliases = shell.dev.aliases;
-  home.sessionPath = shell.dev.path;
-  home.sessionVariables = shell.dev.env;
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
 

common/users/meyer/sops.nix

@@ -1,15 +0,0 @@
-{ config, inputs, ... }:
-{
-  imports = [
-    inputs.sops-nix.homeManagerModules.sops
-  ];
-  sops = {
-    age.keyFile = "/home/${config.home.username}/.config/sops/age/keys.txt";
-    defaultSopsFile = ../../../secrets.yaml;
-    secrets.hosts = {
-      format = "binary";
-      sopsFile = ../../../secrets/hosts;
-      path = "/home/${config.home.username}/.config/gh/hosts.yml";
-    };
-  };
-}