Distuingish between configurations and program modifications

configurations/ssh/default.nix

@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  home-manager.users.charlotte = { ... }: {
+    programs.ssh = {
+      enable = true;
+      compression = true;
+      hashKnownHosts = true;
+      serverAliveInterval = 300;
+      extraConfig = ''
+        HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
+      '';
+    };
+  };
+}

configurations/sway/default.nix

@@ -1,7 +1,7 @@
 with import <nixpkgs> { };
 { pkgs, ... }:
 let
-  firefox = import ../firefox/default.nix { inherit pkgs; };
+  firefox = import ../../programs/firefox/default.nix { inherit pkgs; };
   launcher = import ./launcher.nix { inherit pkgs stdenv; };
   color-picker = import ./color-picker.nix { inherit pkgs; };
   screenshot = import ./screenshot.nix { inherit pkgs; };

configurations/sway/launcher.nix

@@ -1,6 +1,6 @@
 { pkgs, stdenv }:
 let
-  pass = import ../pass/default.nix { inherit pkgs; };
+  pass = import ../../programs/pass/default.nix { inherit pkgs; };
   gemoji = pkgs.buildRubyGem {
     pname = "gemoji";
     gemName = "gemoji";

profiles/common/default.nix

@@ -3,12 +3,12 @@
 {
   imports = [
     ./secret.nix
-    ../../programs/direnv/default.nix
-    ../../programs/git/default.nix
-    ../../programs/neovim/default.nix
-    ../../programs/ssh/default.nix
-    ../../programs/tmux/default.nix
-    ../../programs/zsh/default.nix
+    ../../configurations/direnv/default.nix
+    ../../configurations/git/default.nix
+    ../../configurations/neovim/default.nix
+    ../../configurations/ssh/default.nix
+    ../../configurations/tmux/default.nix
+    ../../configurations/zsh/default.nix
   ];
 
   # Use latest kernel
@@ -44,23 +44,8 @@
       htop
       inotify-tools
       ncdu
-      (
-        symlinkJoin {
-          name = "openssh";
-          paths = [
-            (
-              pkgs.writeScriptBin "ssh" ''
-                #!${zsh}/bin/zsh
-
-                export TERM=xterm-256color
-                ${openssh}/bin/ssh $@
-              ''
-            )
-            openssh
-          ];
-        }
-      )
       (import ../../programs/pass/default.nix { inherit pkgs; })
+      (import ../../programs/ssh/default.nix { inherit pkgs; })
       ripgrep
       unzip
     ];

profiles/graphical/default.nix

@@ -3,11 +3,11 @@
 {
   imports = [
     ./secret.nix
-    ../../programs/dropbox/default.nix
-    ../../programs/i3/default.nix
-    ../../programs/kitty/default.nix
-    ../../programs/syncthing/default.nix
-    ../../programs/sway/default.nix
+    ../../configurations/dropbox/default.nix
+    ../../configurations/i3/default.nix
+    ../../configurations/kitty/default.nix
+    ../../configurations/syncthing/default.nix
+    ../../configurations/sway/default.nix
   ];
 
   services.pcscd = {
@@ -71,8 +71,8 @@
         citrix_workspace
         deluge
         (import ../../programs/firefox/default.nix { inherit pkgs; })
+        (import ../../programs/gnupg/default.nix { inherit pkgs; })
         google-chrome
-        (gnupg.override { guiSupport = true; })
         hledger
         joplin-desktop
         libreoffice

programs/firefox/default.nix

@@ -2,6 +2,6 @@
 
 (pkgs.firefox.override {
   extraNativeMessagingHosts = [
-    (pkgs.passff-host.override { pass = (import ../pass/default.nix { inherit pkgs; }); })
+    (pkgs.passff-host.override { pass = (import ../../programs/pass/default.nix { inherit pkgs; }); })
   ];
 })

programs/gnupg/default.nix

@@ -0,0 +1,3 @@
+{ pkgs }:
+
+pkgs.gnupg.override { guiSupport = true; }

programs/ssh/default.nix

@@ -1,15 +1,16 @@
-{ ... }:
+{ pkgs }:
 
-{
-  home-manager.users.charlotte = { ... }: {
-    programs.ssh = {
-      enable = true;
-      compression = true;
-      hashKnownHosts = true;
-      serverAliveInterval = 300;
-      extraConfig = ''
-        HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
-      '';
-    };
-  };
+pkgs.symlinkJoin {
+  name = "openssh";
+  paths = [
+    (
+      pkgs.writeScriptBin "ssh" ''
+        #!${pkgs.zsh}/bin/zsh
+
+        export TERM=xterm-256color
+        ${pkgs.openssh}/bin/ssh $@
+      ''
+    )
+    pkgs.openssh
+  ];
 }