refactor(home-manager): migrate to xdg.configFile and improve configurations

takeokunn · takeokunn · commit 1a560d02fa39 · 2025-07-31T16:17:26.000+09:00
- Updated all file paths to use `xdg.configFile` for better XDG compliance
- Enhanced Rofi theme with Dracula color palette and improved styling
- Simplified Swaylock configuration by removing unnecessary packages
- Refactored Sway and Kitty configurations for clarity and maintainability
- Improved Mako notification settings with urgency-specific border colors
diff --git a/home-manager/programs/kitty/default.nix b/home-manager/programs/kitty/default.nix
@@ -65,12 +65,9 @@
     };
   };
 
-  home.file.".config/kitty/emacsclient_transparent.conf" = {
-    text = ''
-      # メインのKitty設定を読み込む（キーバインドなど共通設定が必要な場合）
+  xdg.configFile = {
+    ".config/kitty/emacsclient_transparent.conf".text = ''
       include ~/.config/kitty/kitty.conf
-
-      # 背景の透過度を設定 (0.0: 完全透明, 1.0: 完全不透明)
       background_opacity 0.8
     '';
   };
diff --git a/home-manager/programs/rofi/default.nix b/home-manager/programs/rofi/default.nix
@@ -1,19 +1,18 @@
 { pkgs }:
 {
-  home.file.".config/rofi/themes/dracula.rasi".source = ./themes/dracula.rasi;
+  xdg.configFile = {
+    "rofi/themes/dracula.rasi".source = ./themes/dracula.rasi;
+  };
+
   programs.rofi = {
     enable = pkgs.stdenv.isLinux;
+    theme = "dracula";
     font = "HackGenNerd 16";
     plugins = with pkgs; [
       rofi-calc
       rofi-power-menu
     ];
 
-    pass = {
-      enable = pkgs.stdenv.isLinux;
-      stores = [ "$HOME/ghq/github.com/takeokunn/private/password-store" ];
-    };
-
     extraConfig = {
       modi = "window,run,drun";
       show-icons = true;
@@ -23,16 +22,7 @@
       display-run = "  Run";
       display-drun = " Application";
       display-filebrowser = " Filebrowser";
-      # timeout = {
-      #   action = "kb-cancel";
-      #   delay = 60;
-      # };
-      # filebrowser = {
-      #   directory = "$HOME";
-      #   directories-first = true;
-      #   sorting-method = "name";
-      # };
+      disable-history= false;
     };
-    theme = "dracula";
   };
 }
diff --git a/home-manager/programs/rofi/themes/dracula.rasi b/home-manager/programs/rofi/themes/dracula.rasi
@@ -1,23 +1,30 @@
-/*Dracula theme based on the Purple official rofi theme*/
-
-configuration {
-    show-icons:      true;
-    display-drun:    "";
-    disable-history: false;
-}
-
 * {
+    /* Dracula theme colour palette */
+    drac-bgd: #282a36;
+    drac-cur: #44475a;
+    drac-fgd: #f8f8f2;
+    drac-cmt: #6272a4;
+    drac-cya: #8be9fd;
+    drac-grn: #50fa7b;
+    drac-ora: #ffb86c;
+    drac-pnk: #ff79c6;
+    drac-pur: #bd93f9;
+    drac-red: #ff5555;
+    drac-yel: #f1fa8c;
+
     font: "Jetbrains Mono 12";
-    foreground: #f8f8f2;
-    background-color: #282a36;
-    active-background: #6272a4;
-    urgent-background: #ff5555;
-    urgent-foreground: #282a36;
+
+    foreground: @drac-fgd;
+    background-color: @drac-bgd;
+    active-background: @drac-pnk;
+    urgent-background: @drac-red;
+    urgent-foreground: @drac-bgd;
+
     selected-background: @active-background;
     selected-urgent-background: @urgent-background;
     selected-active-background: @active-background;
     separatorcolor: @active-background;
-    bordercolor: @active-background;
+    bordercolor: #6272a4;
 }
 
 #window {
@@ -27,18 +34,22 @@ configuration {
     border-color:     @bordercolor;
     padding:          15;
 }
+
 #mainbox {
     border:  0;
     padding: 0;
 }
+
 #message {
     border:       0px;
     border-color: @separatorcolor;
-    padding:      1px;
+    padding:      1px ;
 }
+
 #textbox {
     text-color: @foreground;
 }
+
 #listview {
     fixed-height: 0;
     border:       0px;
@@ -47,86 +58,106 @@ configuration {
     scrollbar:    false;
     padding:      2px 0px 0px ;
 }
+
 #element {
     border:  0;
     padding: 3px ;
 }
+
 #element.normal.normal {
     background-color: @background-color;
     text-color:       @foreground;
 }
+
 #element.normal.urgent {
     background-color: @urgent-background;
     text-color:       @urgent-foreground;
 }
+
 #element.normal.active {
     background-color: @active-background;
-    text-color:       @foreground;
+    text-color:       @background-color;
 }
+
 #element.selected.normal {
     background-color: @selected-background;
     text-color:       @foreground;
 }
+
 #element.selected.urgent {
     background-color: @selected-urgent-background;
     text-color:       @foreground;
 }
+
 #element.selected.active {
     background-color: @selected-active-background;
-    text-color:       @foreground;
+    text-color:       @background-color;
 }
+
 #element.alternate.normal {
     background-color: @background-color;
     text-color:       @foreground;
 }
+
 #element.alternate.urgent {
     background-color: @urgent-background;
     text-color:       @foreground;
 }
+
 #element.alternate.active {
     background-color: @active-background;
     text-color:       @foreground;
 }
+
 #scrollbar {
     width:        2px ;
     border:       0;
     handle-width: 8px ;
     padding:      0;
 }
+
 #sidebar {
     border:       2px dash 0px 0px ;
     border-color: @separatorcolor;
 }
+
 #button.selected {
     background-color: @selected-background;
     text-color:       @foreground;
 }
+
 #inputbar {
     spacing:    0;
     text-color: @foreground;
     padding:    1px ;
 }
+
 #case-indicator {
     spacing:    0;
     text-color: @foreground;
 }
+
 #entry {
     spacing:    0;
-    text-color: @foreground;
+    text-color: @drac-cya;
 }
+
 #prompt {
     spacing:    0;
-    text-color: @foreground;
+    text-color: @drac-grn;
 }
+
 #inputbar {
     children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
+
 #textbox-prompt-colon {
     expand:     false;
     str:        ">";
     margin:     0px 0.3em 0em 0em ;
-    text-color: @foreground;
+    text-color: @drac-pur;
 }
+
 element-text, element-icon {
     background-color: inherit;
     text-color: inherit;
diff --git a/home-manager/programs/sway/default.nix b/home-manager/programs/sway/default.nix
@@ -1,16 +1,16 @@
 {
-  home.file = {
-    ".config/sway/wallpaper.png".source = ./wallpaper.png;
-    ".config/sway/config".source = ./config;
-    ".config/sway/ime.sh" = {
+  xdg.configFile = {
+    "sway/wallpaper.png".source = ./wallpaper.png;
+    "sway/config".source = ./config;
+    "sway/ime.sh" = {
       source = ./ime.sh;
       executable = true;
     };
-    ".config/sway/emacs-ime.sh" = {
+    "sway/emacs-ime.sh" = {
       source = ./emacs-ime.sh;
       executable = true;
     };
-    ".config/sway/config.d/" = {
+    "sway/config.d/" = {
       source = ./config.d;
       recursive = true;
     };
diff --git a/home-manager/programs/sway/emacs-ime.sh b/home-manager/programs/sway/emacs-ime.sh
@@ -4,23 +4,27 @@ TEMP_FILE=$(mktemp)
 
 # Kittyを起動し、専用の設定ファイルを適用し、タイトルを設定
 # -c は --config の短縮形
-kitty -c ~/.config/kitty/emacsclient_transparent.conf --title "Temporary Editor" sh -c "
-  emacsclient -c --eval \
-    \"(progn
-       (setq initial-buffer-choice nil)
-       (let ((file \"$TEMP_FILE\"))
-         (find-file file)
-         (add-hook 'after-save-hook
-                   (lambda ()
-                     (when (eq (buffer-file-name) file)
-                       (with-current-buffer (current-buffer)
-                         (shell-command-on-region (point-min) (point-max) \"wl-copy\"))))
-                   nil 'local)
-         (add-hook 'kill-buffer-hook
-                   (lambda ()
-                     (when (eq (buffer-file-name) file)
-                       (delete-file file)
-                       (message \"Temporary file deleted: %s\" file)
-                       (delete-frame))))
-         ))
-     \""
+kitty \
+    -c ~/.config/kitty/emacsclient_transparent.conf \
+    --title "Temporary Editor" \
+    sh -c "
+emacsclient -c --eval \
+  \"(progn
+     (setq initial-buffer-choice nil)
+     (let ((file \"$TEMP_FILE\"))
+       (find-file file)
+       (add-hook 'after-save-hook
+                 (lambda ()
+                   (when (eq (buffer-file-name) file)
+                     (with-current-buffer (current-buffer)
+                       (shell-command-on-region (point-min) (point-max) \"wl-copy\"))))
+                 nil 'local)
+       (add-hook 'kill-buffer-hook
+                 (lambda ()
+                   (when (eq (buffer-file-name) file)
+                     (delete-file file)
+                     (message \"Temporary file deleted: %s\" file)
+                     (delete-frame))))
+       ))
+   \"
+"
diff --git a/home-manager/programs/swaylock/default.nix b/home-manager/programs/swaylock/default.nix
@@ -1,7 +1,5 @@
 { lib, pkgs }:
 {
-  home.packages = with pkgs; lib.optionals pkgs.stdenv.isLinux [ swayidle ];
-
   programs.swaylock = {
     enable = pkgs.stdenv.isLinux;
     settings = {
diff --git a/home-manager/services/mako/default.nix b/home-manager/services/mako/default.nix
@@ -2,20 +2,19 @@
 {
   services.mako = {
     enable = pkgs.stdenv.isLinux;
-    settings = {
-      backgroundColor = "#282a36";
-      textColor = "#44475a";
-      borderColor = "#282a36";
-    };
-    # settings = ''
-    #   [urgency=low]
-    #   border-color=#282a36
+    extraConfig = ''
+      background-color=#282a36
+      text-color=#44475a
+      border-color=#282a36
 
-    #   [urgency=normal]
-    #   border-color=#f1fa8c
+      [urgency=low]
+      border-color=#282a36
 
-    #   [urgency=high]
-    #   border-color=#ff5555
-    # '';
+      [urgency=normal]
+      border-color=#f1fa8c
+
+      [urgency=high]
+      border-color=#ff5555
+    '';
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`{ lib, pkgs }:`
`2`	`2`	`{`
`3`		`- home.packages = with pkgs; lib.optionals pkgs.stdenv.isLinux [ swayidle ];`
`4`		`-`
`5`	`3`	`programs.swaylock = {`
`6`	`4`	`enable = pkgs.stdenv.isLinux;`
`7`	`5`	`settings = {`