fix: bug and sytle fix

misumisumi · Sep 30, 2024 · e7656e6 · e7656e6
1 parent 567e8e9
commit e7656e6
Show file tree

Hide file tree

Showing 47 changed files with 214 additions and 289 deletions.
diff --git a/apps/user/color-theme/catppuccin/rofi.nix b/apps/user/color-theme/catppuccin/rofi.nix
@@ -31,21 +31,13 @@ let
         text-color: @bg-col;
     }
   '';
-  rofi-catppuccin = pkgs.stdenvNoCC.mkDerivation {
-    name = "rofi-catppuccin";
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/share/rofi/themes
-      find ${
-        pkgs.catppuccin.override { variant = "${flavor}"; }
-      } -name '*.rasi' -exec cp {} $out/share/rofi/themes/ \;
-      cp ${catppuccin-custom} $out/share/rofi/themes/catppuccin-custom.rasi
-    '';
-  };
 in
 {
-  xdg.configFile."rofi/themes/catppuccin-custom.rasi".source = catppuccin-custom;
+  xdg.configFile = {
+    "rofi/themes/catppuccin-${flavor}.rasi".source = "${
+      pkgs.catppuccin.override { variant = "${flavor}"; }
+    }/rofi/catppuccin-${flavor}.rasi";
+    "rofi/themes/catppuccin-custom.rasi".source = catppuccin-custom;
+  };
   programs.rofi.theme = "catppuccin-custom";
 }
diff --git a/apps/user/color-theme/nord/rofi.nix b/apps/user/color-theme/nord/rofi.nix
@@ -2,53 +2,41 @@
 let
   nord-rasi = pkgs.writeText "nord.rasi" ''
     @theme "catppuccin-macchiato"
-
     * {
-        font: "${config.programs.rofi.font}";
-        bg-col:  #2e3440;
-        bg-col-light: #2e3440;
-        border-col: #2e3440;
-        selected-col: #2e3440;
-        blue: #81a1c1;
-        fg-col: #d8dee9;
-        fg-col2: #bf616a;
-        grey: #4c566a;
-    }
+          font: "${config.programs.rofi.font}";
+          bg-col:  #2e3440;
+          bg-col-light: #2e3440;
+          border-col: #2e3440;
+          selected-col: #2e3440;
+          blue: #81a1c1;
+          fg-col: #d8dee9;
+          fg-col2: #bf616a;
+          grey: #4c566a;
+      }
 
-    window {
-        width: 30%;
-        orientation: horizontal;
-        location: center;
-        anchor: center;
-    }
-    listview {
-        layout: vertical;
-        columns: 1;
-        lines: 7;
-        margin: 10px 20px 0px 20px;
-    }
+      window {
+          width: 30%;
+          orientation: horizontal;
+          location: center;
+          anchor: center;
+      }
+      listview {
+          layout: vertical;
+          columns: 1;
+          lines: 7;
+          margin: 10px 20px 0px 20px;
+      }
 
-    element selected {
-        background-color: @blue;
-        text-color: @bg-col;
-    }
+      element selected {
+          background-color: @blue;
+          text-color: @bg-col;
+      }
   '';
-  rofi-nord = pkgs.stdenvNoCC.mkDerivation {
-    name = "rofi-catppuccin";
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/share/rofi/themes
-      find ${pkgs.catppuccin} -name '*.rasi' -exec cp {} $out/share/rofi/themes/ \;
-      cp ${nord-rasi} $out/share/rofi/themes/nord.rasi
-    '';
-  };
 in
 {
-  xdg.configFile."rofi/themes" = {
-    "catppuccin-macchiato".source = "${pkgs.catppuccin}/rofi/catppuccin-macchiato.rasi";
-    "nord.rasi".source = nord-rasi;
+  xdg.configFile = {
+    "rofi/themes/catppuccin-macchiato.rasi".source = "${pkgs.catppuccin}/rofi/catppuccin-macchiato.rasi";
+    "rofi/themes/nord.rasi".source = nord-rasi;
   };
   programs.rofi.theme = "nord";
 }
diff --git a/apps/user/color-theme/tokyonight/default.nix b/apps/user/color-theme/tokyonight/default.nix
@@ -72,6 +72,7 @@ in
 // lib.optionalAttrs (scheme == "full") {
   imports = [ ./rofi ];
   i18n.inputMethod.fcitx5.addons = with pkgs; [ fcitx5-tokyonight ];
+  services.dunst.settings = lib.importTOML "${pack}/dunst/tokyonight_${flavor}.dunstrc";
   xdg.configFile = {
     "wezterm/color-scheme.lua".source = ./wezterm/${flavor}.lua;
     "fcitx5/conf/classicui.conf".text =
@@ -85,7 +86,6 @@ in
         };
       };
     "qtile/my_modules/colorset.py".source = ./qtile/${flavor}.py;
-    "dunst/dunstrc.d/00-${flavor}.dunstrc".source = "${pack}/themes/dunst/tokyonight_${flavor}.dunstrc";
   };
   gtk = {
     theme =

diff --git a/apps/user/color-theme/tokyonight/rofi/tokyonight.rasi b/apps/user/color-theme/tokyonight/rofi/tokyonight.rasi
diff --git a/apps/user/core/fzf/default.nix b/apps/user/core/fzf/default.nix
@@ -6,6 +6,10 @@
     zsh.initExtra = ''
       bindkey '^[g' fzf-file-widget
     '';
+
+    fd.enable = true;
+    ripgrep.enable = true;
+
     fzf = {
       enable = true;
       enableZshIntegration = false; # Confilict "jeffreytse/zsh-vi-mode" so init my self

diff --git a/apps/user/core/man/default.nix b/apps/user/core/man/default.nix
@@ -1,8 +1,18 @@
 {
-  home.shellAliases = {
-    MANPAGER = "sh -c 'col -bx | bat -l man -p'";
-  };
+  #NOTE: https://github.com/sharkdp/bat/issues/2568
+  home.sessionVariablesExtra = ''
+    export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'";
+  '';
+
   programs = {
+    bat = {
+      enable = true;
+      config = {
+        map-syntax = [ ];
+        style = "numbers,changes,header";
+        pager = "less -FR";
+      };
+    };
     man = {
       enable = true;
       generateCaches = true;

diff --git a/apps/user/core/programs/default.nix b/apps/user/core/programs/default.nix
@@ -1,16 +1,6 @@
 {
   programs = {
-    bat = {
-      enable = true;
-      config = {
-        map-syntax = [ ];
-        style = "numbers,changes,header";
-        pager = "less -FR";
-      };
-    };
     dircolors.enable = true;
-    fd.enable = true;
     jq.enable = true;
-    ripgrep.enable = true;
   };
 }
diff --git a/apps/user/core/session/default.nix b/apps/user/core/session/default.nix
diff --git a/apps/user/core/xdg/default.nix b/apps/user/core/xdg/default.nix
@@ -7,9 +7,7 @@
       enable = true;
       createDirectories = true;
       extraConfig = {
-        XDG_GAME_DIR = "${config.home.homeDirectory}/Game";
         XDG_WORKSPACE_DIR = "${config.home.homeDirectory}/workspace";
-        XDG_SCREENSHOTS_DIR = "${config.home.homeDirectory}/Pictures/Screenshots";
       };
     };
   };

diff --git a/apps/user/small/zsh/default.nix → apps/user/core/zsh/default.nix b/apps/user/small/zsh/default.nix → apps/user/core/zsh/default.nix
@@ -142,14 +142,6 @@
 
         set vi-cmd-mode-string "\1\e[?8c\2"
         set vi-ins-mode-string "\1\e[?0c\2"
-        # qtileやkittyなどwrap環境内で作業することが必要な時に依存関係のPATHを外す処理
-        # (依存関係のPATHが追記された状態を解消してクリーンな状態に戻す)
-        # direnvでは問題なかったがnix-shellやnix shellでパスが追記されない
-        # (PATH追記後にSHELLが起動するため)問題があったため、シェルの深さで実行の有無を決める
-        if [ -n "$DESKTOP_SESSION" ] && [ "$SHLVL" -eq 2 ] || [ "$SHLVL" -eq 1 ]; then
-        	PATH=$(echo "$PATH" | sed 's/\/nix\/store\/[a-zA-Z._0-9-]\+\/bin:\?//g' | sed 's/:$//')
-        	export PATH="$PATH"
-        fi
         # For marlonrichert/zsh-autocomplete
         zstyle -e ':autocomplete:history-search-backward:*' list-lines 'reply=$(( LINES / 2 ))'
         zstyle ':autocomplete:*' min-delay 0.05

diff --git a/apps/user/small/zsh/user-abbreviations → apps/user/core/zsh/user-abbreviations b/apps/user/small/zsh/user-abbreviations → apps/user/core/zsh/user-abbreviations
diff --git a/apps/user/full/theme/theme.nix b/apps/user/full/theme/theme.nix
@@ -4,6 +4,7 @@ let
   extraConfig = { };
 in
 {
+  home.pointerCursor.gtk.enable = true;
   gtk = {
     enable = true;
     font = {