Organise NixOS and Home Manager modules

home/opdavies/desktop.nix

@@ -6,13 +6,13 @@
 }:
 {
   imports = [
-    ./modules/alacritty.nix
-    ./modules/copyq.nix
-    ./modules/desktop/bluetuith.nix
-    ./modules/espanso.nix
-    ./modules/gtk.nix
-    ./modules/flameshot.nix
-    ./modules/gtk.nix
-    ./modules/mpv.nix
+    ../../modules/home-manager/alacritty.nix
+    ../../modules/home-manager/copyq.nix
+    ../../modules/home-manager/bluetuith.nix
+    ../../modules/home-manager/espanso.nix
+    ../../modules/home-manager/gtk.nix
+    ../../modules/home-manager/flameshot.nix
+    ../../modules/home-manager/gtk.nix
+    ../../modules/home-manager/mpv.nix
   ];
 }

home/opdavies/modules/alacritty.nix

@@ -1,42 +0,0 @@
-{
-  lib,
-  pkgs,
-  self,
-  ...
-}:
-let
-  inherit (lib) strings;
-  inherit (strings) toInt;
-
-  theme = import "${self}/lib/theme" { inherit pkgs; };
-in
-{
-  programs.alacritty = {
-    enable = true;
-
-    settings = {
-      env = {
-        TERM = "screen-256color";
-      };
-
-      window.padding = {
-        x = 15;
-        y = 15;
-      };
-
-      font = {
-        size = toInt "${theme.fonts.monospace.size}";
-
-        bold.style = "Regular";
-        normal.family = "${theme.fonts.monospace.name}";
-
-        offset.y = 12;
-        glyph_offset.y = 6;
-      };
-
-      shell = {
-        program = "zsh";
-      };
-    };
-  };
-}

home/opdavies/modules/copyq.nix

@@ -1 +0,0 @@
-{ services.copyq.enable = true; }

home/opdavies/modules/desktop/bluetuith.nix

@@ -1,19 +0,0 @@
-{
-  xdg.configFile."bluetuith/bluetuith.conf" = {
-    text = ''
-      {
-        adapter: ""
-        adapter-states: ""
-        connect-bdaddr: ""
-        gsm-apn: ""
-        gsm-number: ""
-        keybindings: {
-          NavigateDown: j
-          NavigateUp: k
-        }
-        receive-dir: ""
-        theme: {}
-      }
-    '';
-  };
-}

home/opdavies/modules/espanso.nix

@@ -1,16 +0,0 @@
-{
-  services.espanso = {
-    enable = true;
-
-    configs = {
-      default = {
-        show_notifications = false;
-        toggle_key = "LEFT_ALT";
-      };
-    };
-
-    matches = {
-      base = import ./espanso/matches/base.nix;
-    };
-  };
-}

home/opdavies/modules/espanso/matches/base.nix

@@ -1,81 +0,0 @@
-let
-  websiteUrl = "https://www.oliverdavies.uk";
-  dailyUrl = "https://dailydrupaler.com";
-  podcastUrl = "https://beyondblockspodcast.com";
-in
-{
-  matches = [
-    {
-      trigger = ":archive";
-      replace = "${websiteUrl}/archive";
-    }
-    {
-      trigger = ":atdc";
-      replace = "${websiteUrl}/atdc";
-    }
-    {
-      trigger = ":call";
-      replace = "${websiteUrl}/call";
-    }
-    {
-      trigger = ":coaching";
-      replace = "${websiteUrl}/team-coaching";
-    }
-    {
-      trigger = ":daily";
-      replace = "${dailyUrl}";
-    }
-    {
-      trigger = ":dotfiles";
-      replace = "https://github.com/opdavies/dotfiles.nix";
-    }
-    {
-      trigger = ":dc";
-      replace = "Drupal Commerce";
-    }
-    {
-      trigger = ":dr";
-      replace = "Drupal";
-    }
-    {
-      trigger = ":gt";
-      replace = "Great, thanks!";
-    }
-    {
-      trigger = ":guest";
-      replace = "If you'd like to be a guest on ${podcastUrl} and talk about ..., I'd love to have you on the show.";
-    }
-    {
-      trigger = ":lh";
-      replace = "http://localhost";
-    }
-    {
-      trigger = ":podcast";
-      replace = "${podcastUrl}";
-    }
-    {
-      trigger = ":pricing";
-      replace = "${websiteUrl}/pricing";
-    }
-    {
-      trigger = ":record";
-      replace = "https://savvycal.com/opdavies/beyond-blocks";
-    }
-    {
-      trigger = ":talks";
-      replace = "${websiteUrl}/presentations";
-    }
-    {
-      trigger = ":website";
-      replace = "${websiteUrl}";
-    }
-    {
-      trigger = ":zet";
-      replace = "https://zet.oliverdavies.uk";
-    }
-    {
-      trigger = ":zoom";
-      replace = "https://savvycal.com/opdavies/zoom";
-    }
-  ];
-}

home/opdavies/modules/flameshot.nix

@@ -1,16 +0,0 @@
-{ username, ... }:
-{
-  services.flameshot = {
-    enable = true;
-
-    settings = {
-      General = {
-        disabledTrayIcon = false;
-        saveAfterCopy = true;
-        savePath = "/home/${username}/Pictures/Screenshots";
-        showHelp = false;
-        uiColor = "#60a5fa";
-      };
-    };
-  };
-}

home/opdavies/modules/gtk.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-  gtk = {
-    enable = true;
-    theme.package = pkgs.arc-theme;
-    theme.name = "Arc-Dark";
-    iconTheme.package = pkgs.arc-icon-theme;
-    iconTheme.name = "Arc";
-  };
-}

home/opdavies/modules/mpv.nix

@@ -1,11 +0,0 @@
-{
-  programs.mpv = {
-    enable = true;
-
-    # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
-    bindings = {
-      "DOWN" = "add volume -5";
-      "UP" = "add volume 5";
-    };
-  };
-}