some more organizing

home/laptop/packages/default.nix

@@ -1,39 +1,41 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
+    # wayland/sway stuff
     bemenu
+    wl-clipboard
+    wayland
+    mako
+    grim
+    slurp
+    # programs
     brave
+    firefox-devedition-bin
+    tor-browser-bundle-bin
+    gnome.cheese
+    gimp
+    # cli utils
     direnv
+    ripgrep
+    mupdf
     gopass
     gopass-jsonapi
     pavucontrol
+    # programming
     nixfmt
     sqlite
-    ripgrep
-    xdg-user-dirs
-    wl-clipboard
-    wayland
     tectonic
-    slurp
-    pinentry-qt
-    mupdf
-    mako
-    grim
-    gnome.cheese
-    gimp
-    firefox-devedition-bin
     ffmpeg
     nodePackages_latest.pnpm
     rustup
+    poetry
     lolcat
     deno
     nodejs_20
     python311
     python311Packages.pip
+    # misc
     piper
-    poetry
-    thunderbird
-    tor-browser-bundle-bin
-    ungoogled-chromium
     xdg-utils
+    xdg-user-dirs
   ];
 }

home/laptop/programs/default.nix

@@ -1,3 +1,27 @@
-{ ... }: {
+{ pkgs, ... }: {
-  imports = [ ./neovim ./doom-emacs ./git.nix ./tmux.nix ./kitty.nix ./swaylock.nix ./zsh.nix ./obs.nix ];
+  imports = [
+    ./neovim
+    ./doom-emacs
+    ./git.nix
+    ./tmux.nix
+    ./kitty.nix
+    ./swaylock.nix
+    ./zsh.nix
+    ./obs.nix
+  ];
+
+  programs = {
+    thunderbird = {
+      enable = true;
+      profiles = {
+        ivan = {
+          isDefault = true;
+        };
+      };
+    };
+    chromium = {
+      enable = true;
+      package = pkgs.ungoogled-chromium;
+    };
+  };
 }

sys/laptop/configuration.nix

@@ -1,7 +1,4 @@
-{ config
+{ config, pkgs, ... }: {
-, pkgs
-, ...
-}: {
   system.stateVersion = "23.05";
 
   nix = {
@@ -33,11 +30,7 @@
   security = {
     polkit.enable = true;
     rtkit.enable = true;
-    pam = {
+    pam = { services = { swaylock = { }; }; };
-      services = {
-        swaylock = { };
-      };
-    };
   };
 
   xdg = {
@@ -70,6 +63,7 @@
       vim
       wget
       zip
+      pinentry-qt
     ];
     variables = {
       EDITOR = "nvim";
@@ -83,14 +77,12 @@
     };
   };
 
-  networking.extraHosts = builtins.readFile (pkgs.fetchFromGitHub
+  networking.extraHosts = builtins.readFile (pkgs.fetchFromGitHub {
-    {
+    owner = "StevenBlack";
-      owner = "StevenBlack";
+    repo = "hosts";
-      repo = "hosts";
+    rev = "5bf0802369cd74796bc5c4194c46ddc019541877";
-      rev = "5bf0802369cd74796bc5c4194c46ddc019541877";
+    sha256 = "sha256-4CXI2vu/zBQeSzLKelaey/5WEjfroRs7LP9BvZ4CsTQ=";
-      sha256 = "sha256-4CXI2vu/zBQeSzLKelaey/5WEjfroRs7LP9BvZ4CsTQ=";
+  } + "/hosts");
-    }
-  + "/hosts");
 
   programs = {
     gnupg.agent = {
@@ -105,11 +97,19 @@
     defaultUserShell = pkgs.zsh;
     users.ivand = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "adm" "audio" "video" "kvm" "render" "flatpak" "bluetooth" "mlocate" ];
+      extraGroups = [
-    };
+        "wheel"
-    extraGroups = {
+        "adm"
-      mlocate = { };
+        "audio"
+        "video"
+        "kvm"
+        "render"
+        "flatpak"
+        "bluetooth"
+        "mlocate"
+      ];
     };
+    extraGroups = { mlocate = { }; };
   };
 
   services = {