From 6910c3c3c899ed5e9ba587895443e0cd1bd60d6a Mon Sep 17 00:00:00 2001
From: arielherself <arielherself@duck.com>
Date: Thu, 8 Aug 2024 00:39:59 +0800
Subject: [PATCH] fix tpm path

---
 contour.yml             | 2 +-
 home-manager/home.nix   | 7 ++++---
 nixos/configuration.nix | 8 ++++++++
 nvim/lua/config.lua     | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/contour.yml b/contour.yml
index a82bc0c..ff7f4c2 100644
--- a/contour.yml
+++ b/contour.yml
@@ -554,7 +554,7 @@ profiles:
 
         # When this profile is *activated*, this flag decides
         # whether or not to put the window into maximized mode.
-        maximized: true
+        maximized: false
 
         bell:
             sound: "default"
diff --git a/home-manager/home.nix b/home-manager/home.nix
index da8b4c8..bbb9e28 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -70,7 +70,7 @@ in {
     # Don't forget to change its permissions.
     cider = {
       name = "Cider";
-      genericName = "Apple Music Player";
+      comment = "Apple Music Player";
       type = "Application";
       exec = "${pkgs.appimage-run}/bin/appimage-run ${config.home.homeDirectory}/Dropbox/arch/cider/Cider-linux-appimage-x64.AppImage";
       terminal = false;
@@ -78,7 +78,7 @@ in {
     };
     thorium = {
       name = "Thorium";
-      genericName = "Web Browser";
+      comment = "Access the Internet";
       type = "Application";
       exec = "${pkgs.appimage-run}/bin/appimage-run ${config.home.homeDirectory}/Dropbox/arch/thorium/Thorium.AppImage";
       terminal = false;
@@ -314,11 +314,12 @@ in {
       set-option -g default-shell "${pkgs.zsh}/bin/zsh"
       set -g default-command "${pkgs.zsh}/bin/zsh"
       setw -g mode-keys vi
+      set-option -g status-position top
       set -g @plugin 'tmux-plugins/tpm'
       # This plugin seems to break terminfo when default shell of a terminal emulator is set to zsh.
       # set -g @plugin 'tmux-plugins/tmux-sensible'
       set -g @plugin 'erikw/tmux-powerline'
-      run '${config.xdg.configHome}/plugins/tpm/tpm'
+      run '${config.xdg.configHome}/tmux/plugins/tpm/tpm'
     '';
   };
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ed3f973..ddc8118 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -173,6 +173,14 @@ in {
     ];
   };
 
+  # Fix XDG spec
+  environment.sessionVariables = rec {
+    XDG_CACHE_HOME  = "$HOME/.cache";
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_DATA_HOME   = "$HOME/.local/share";
+    XDG_STATE_HOME  = "$HOME/.local/state";
+  };
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua
index 929d560..879cab5 100644
--- a/nvim/lua/config.lua
+++ b/nvim/lua/config.lua
@@ -732,7 +732,7 @@ vim.keymap.set('i', '<C-x>', '<ESC>ddi')
 vim.keymap.set('i', '<Home>', '<ESC>^i')
 vim.keymap.set('i', '<C-a>', '<ESC>ggVG')
 vim.keymap.set('n', '<C-a>', 'ggVG')
-vim.keymap.set('n', '<leader>`', '<Cmd>split<CR><Cmd>terminal zsh<CR>i')
+vim.keymap.set('n', '<leader>`', '<Cmd>split<CR><Cmd>terminal<CR>i')
 vim.keymap.set('n', '<leader>n', '<Cmd>tabnew<CR>')
 vim.keymap.set('n', '<leader><tab>', '<Cmd>tabnext<CR>')
 vim.keymap.set('t', '<ESC>', '<C-\\><C-n>', {noremap=true})