modules: Add mkHost

modules/programs/emacs/default.nix

@@ -1,7 +1,9 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
-  config.home-manager.users."${config.system.singleUser}".home.file = {
+  services.emacs.package = pkgs.emacsPgtkGcc;
+
+  home-manager.users."${config.system.singleUser}".home.file = {
     ".emacs".source = ./dotemacs;
     ".emacs.d/early-init.el".source = ./early-init.el;
     ".emacs.d/mu4e.el".source = ./mu4e.el;

modules/programs/emacs/dotemacs

@@ -259,12 +259,29 @@
 	      (setq mode-line-format saved-mode-line-format)
 	      (redraw-display))))
 
+;; Development
+(use-package tide
+  :straight t
+  :config
+  (defun setup-tide-mode ()
+    (interactive)
+    (tide-setup)
+    (tide-hl-identifier-mode +1))
+  (add-hook 'typescript-mode-hook #'setup-tide-mode)
+  (add-hook 'web-mode-hook
+	    (lambda ()
+	      (when (string-equal "tsx" (file-name-extension buffer-file-name))
+		(setup-tide-mode))))
+  (add-to-list 'auto-mode-alist '("\\.tsx\\'" . web-mode)))
 (use-package nix-mode
   :straight t)
 
 (use-package json-mode
   :straight t)
 
+(use-package rust-mode
+  :straight t)
+
 ;; Debugging
 (use-package explain-pause-mode
   :straight

modules/programs/music/default.nix

@@ -1,24 +1,28 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
-{
-  environment.systemPackages = with pkgs; [
-    mpdevil
-    mopidy mopidy-mpd mopidy-funkwhale
-  ];
+let
+  secrets = import ../../../secrets;
+  funkwhale = secrets.funkwhale.applications."${config.networking.hostName}";
+in {
+  config = {
+    environment.systemPackages = with pkgs; [ cantata ];
 
-  # TODO
-  services.mopidy = {
-    enable = true;
-    configuration = ''
-[funkwhale]
-enabled = true
-url = https://audio.polynom.me
-client_id =
-client_secret =
-cache_duration = 600
+    services.mopidy = {
+      #enable = true;
+      configuration = ''
+      [funkwhale]
+      enabled = true
+      url = https://audio.polynom.me
+      client_id = ${funkwhale.client_id}
+      client_secret = ${funkwhale.client_secret}
+      cache_duration = 600
+
+      [mpd]
+      enabled = true;
     '';
-    extensionPackages = with pkgs; [
-      mopidy-mpd mopidy-funkwhale
-    ];
+      extensionPackages = with pkgs; [
+        mopidy-mpd mopidy-funkwhale
+      ];
+    };
   };
 }