Corrected path to kitty.conf

This commit is contained in:
2026-02-25 21:33:02 +01:00
parent 1732f519a8
commit aec799281c
6 changed files with 33 additions and 47 deletions
+1 -1
View File
@@ -2185,7 +2185,7 @@ Kitty gets installed and configured
#+begin_src nix :tangle home/dev/kitty.nix :noweb tangle :mkdirp yes. #+begin_src nix :tangle home/dev/kitty.nix :noweb tangle :mkdirp yes.
{ config, pkgs, lib, flakeRoot, ... }: { config, pkgs, lib, flakeRoot, ... }:
let let
repoKittyConf = flakeRoot + "/assets/conf/dev/kitty.conf"; repoKittyConf = flakeRoot + "/assets/conf/dev/terminal/kitty.conf";
in in
{ {
xdg.enable = true; xdg.enable = true;
+5 -4
View File
@@ -1,5 +1,5 @@
{ pkgs, user, ... }: { pkgs, user, ... } :
{ {
imports = [ imports = [
./apps/ai.nix ./apps/ai.nix
#./apps/default-apps.nix #./apps/default-apps.nix
@@ -16,7 +16,6 @@
./dev/dev.nix ./dev/dev.nix
./dev/shells.nix ./dev/shells.nix
./dev/starship.nix ./dev/starship.nix
./dev/zsh.nix
./dev/emacs ./dev/emacs
]; ];
@@ -24,5 +23,7 @@
home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}"; home.homeDirectory = pkgs.lib.mkDefault "/home/${user.username}";
home.stateVersion = user.stateVersion; home.stateVersion = user.stateVersion;
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }
+1 -1
View File
@@ -124,7 +124,7 @@
(use-package nerd-icons (use-package nerd-icons
:custom :custom
;; disable bright icon colors ;; disable bright icon colors
(nerd-icons-color-icons nil)) (nerd-icons-color-icons nil))hells.nix
(use-package doom-modeline (use-package doom-modeline
:custom :custom
+1 -1
View File
@@ -1,6 +1,6 @@
{ config, pkgs, lib, flakeRoot, ... }: { config, pkgs, lib, flakeRoot, ... }:
let let
repoKittyConf = flakeRoot + "/assets/conf/dev/kitty.conf"; repoKittyConf = flakeRoot + "/assets/conf/dev/terminal/kitty.conf";
in in
{ {
xdg.enable = true; xdg.enable = true;
+1 -7
View File
@@ -1,7 +1,7 @@
# shells.nix — Home-Manager module # shells.nix — Home-Manager module
# #
# Reads: # Reads:
# ${flakeRoot}/assets/conf/dev/terminal/enabled_shells.conf # ${flakeRoot}/assets/conf/shells.nixdev/terminal/enabled_shells.conf
# ${flakeRoot}/assets/conf/dev/terminal/aliases.conf # ${flakeRoot}/assets/conf/dev/terminal/aliases.conf
# #
# For each enabled shell in [enabled_shells]: # For each enabled shell in [enabled_shells]:
@@ -89,7 +89,6 @@ let
zshSeed = '' zshSeed = ''
# Created once from: ${toString aliasesFile} # Created once from: ${toString aliasesFile}
# Edit freely; Home Manager will not overwrite this file. # Edit freely; Home Manager will not overwrite this file.
#
${secText "bash_zsh"} ${secText "bash_zsh"}
${secText "zsh_specific"} ${secText "zsh_specific"}
''; '';
@@ -125,10 +124,8 @@ let
# Created once from: ${toString aliasesFile} # Created once from: ${toString aliasesFile}
# Edit freely; Home Manager will not overwrite this file. # Edit freely; Home Manager will not overwrite this file.
status is-interactive; or exit status is-interactive; or exit
# Translated from [bash_zsh]: # Translated from [bash_zsh]:
${fishTranslated} ${fishTranslated}
# From [fish_specific]: # From [fish_specific]:
${secText "fish_specific"} ${secText "fish_specific"}
''; '';
@@ -169,7 +166,6 @@ in
# Create/remove alias files based on enabled shells # Create/remove alias files based on enabled shells
home.activation.shellAliasesFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] '' home.activation.shellAliasesFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
set -euo pipefail set -euo pipefail
# bash ------------------------------------------------------- # bash -------------------------------------------------------
if ${if shellEnabled "bash" then "true" else "false"}; then if ${if shellEnabled "bash" then "true" else "false"}; then
cat > "${bashAliasesPath}" <<'EOF' cat > "${bashAliasesPath}" <<'EOF'
@@ -178,7 +174,6 @@ EOF
else else
rm -f "${bashAliasesPath}" rm -f "${bashAliasesPath}"
fi fi
# zsh ------------------------------------------------------- # zsh -------------------------------------------------------
if ${if shellEnabled "zsh" then "true" else "false"}; then if ${if shellEnabled "zsh" then "true" else "false"}; then
cat > "${zshAliasesPath}" <<'EOF' cat > "${zshAliasesPath}" <<'EOF'
@@ -187,7 +182,6 @@ EOF
else else
rm -f "${zshAliasesPath}" rm -f "${zshAliasesPath}"
fi fi
# fish ------------------------------------------------------- # fish -------------------------------------------------------
if ${if shellEnabled "fish" then "true" else "false"}; then if ${if shellEnabled "fish" then "true" else "false"}; then
mkdir -p "$(dirname "${fishAliasesPath}")" mkdir -p "$(dirname "${fishAliasesPath}")"
+1 -10
View File
@@ -1,19 +1,11 @@
{ { config, pkgs, lib, flakeRoot, ... }:
config,
pkgs,
lib,
flakeRoot,
...
}:
{ {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
autocd = true; autocd = true;
# Optional but recommended: keep zsh config in one dir (relative to $HOME) # Optional but recommended: keep zsh config in one dir (relative to $HOME)
dotDir = ".config/zsh"; dotDir = ".config/zsh";
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
theme = ""; theme = "";
@@ -28,7 +20,6 @@
"kubectl" "kubectl"
]; ];
}; };
autosuggestion.enable = true; autosuggestion.enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
}; };