fix: fix shellll
This commit is contained in:
parent
1f5442a4af
commit
d80bbce9da
6 changed files with 57 additions and 149 deletions
|
|
@ -1,6 +1,4 @@
|
|||
{ config, pkgs, lib, ... }: {
|
||||
imports = [ ./oh-my-posh ];
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
interactiveShellInit = ''
|
||||
|
|
@ -10,8 +8,6 @@
|
|||
'';
|
||||
};
|
||||
|
||||
programs.oh-my-posh.enableFishIntegration = lib.mkDefault true;
|
||||
|
||||
# Ensure fish is available for login shells on Linux hosts.
|
||||
home.packages = lib.mkAfter [ pkgs.fish ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
profileBin = "${config.home.profileDirectory}/bin";
|
||||
# System binaries path - same on both NixOS and Darwin
|
||||
systemBin = "/run/current-system/sw/bin";
|
||||
defaultBin = "/nix/var/nix/profiles/default/bin";
|
||||
darwinHomebrewDir = if pkgs.stdenv.hostPlatform.isAarch64 then
|
||||
|
|
@ -25,50 +26,53 @@ let
|
|||
formatPathList = paths:
|
||||
lib.concatMapStrings (path: " \"${path}\"\n") paths;
|
||||
in {
|
||||
imports = [ ./oh-my-posh ];
|
||||
|
||||
programs.nushell.enable = lib.mkDefault true;
|
||||
|
||||
programs.nushell.extraConfig = ''
|
||||
# Dotfiles QA validation command
|
||||
def dotfiles-qa [] {
|
||||
let dotfiles_dir = "${config.home.homeDirectory}/Development/dotfiles"
|
||||
def dotfiles-qa [] {
|
||||
let dotfiles_dir = "${config.home.homeDirectory}/Development/dotfiles"
|
||||
|
||||
print $"(ansi green_bold)Running dotfiles QA validation...(ansi reset)\n"
|
||||
print $"(ansi green_bold)Running dotfiles QA validation...(ansi reset)\n"
|
||||
|
||||
# Step 1: Format check
|
||||
print $"(ansi blue)1. Formatting nix files...(ansi reset)"
|
||||
cd $dotfiles_dir
|
||||
nix fmt .
|
||||
if $env.LAST_EXIT_CODE != 0 {
|
||||
print $"(ansi red_bold)✗ Formatting failed(ansi reset)"
|
||||
return
|
||||
# Step 1: Format check
|
||||
print $"(ansi blue)1. Formatting nix files...(ansi reset)"
|
||||
cd $dotfiles_dir
|
||||
nix fmt .
|
||||
if $env.LAST_EXIT_CODE != 0 {
|
||||
print $"(ansi red_bold)✗ Formatting failed(ansi reset)"
|
||||
return
|
||||
}
|
||||
print $"(ansi green)✓ Formatting complete(ansi reset)\n"
|
||||
|
||||
# Step 2: Flake check
|
||||
print $"(ansi blue)2. Running flake check...(ansi reset)"
|
||||
nix flake check
|
||||
if $env.LAST_EXIT_CODE != 0 {
|
||||
print $"(ansi red_bold)✗ Flake check failed(ansi reset)"
|
||||
return
|
||||
}
|
||||
print $"(ansi green)✓ Flake check passed(ansi reset)\n"
|
||||
|
||||
# Step 3: Build (without activation)
|
||||
print $"(ansi blue)3. Building darwin configuration (no activation)...(ansi reset)"
|
||||
darwin-rebuild build --flake $"($dotfiles_dir)#macbook-pro"
|
||||
if $env.LAST_EXIT_CODE != 0 {
|
||||
print $"(ansi yellow)⚠ Build had warnings, but may still work(ansi reset)\n"
|
||||
} else {
|
||||
print $"(ansi green)✓ Build successful(ansi reset)\n"
|
||||
}
|
||||
|
||||
print $"(ansi green_bold)✓ Core QA checks passed!(ansi reset)"
|
||||
}
|
||||
print $"(ansi green)✓ Formatting complete(ansi reset)\n"
|
||||
|
||||
# Step 2: Flake check
|
||||
print $"(ansi blue)2. Running flake check...(ansi reset)"
|
||||
nix flake check
|
||||
if $env.LAST_EXIT_CODE != 0 {
|
||||
print $"(ansi red_bold)✗ Flake check failed(ansi reset)"
|
||||
return
|
||||
}
|
||||
print $"(ansi green)✓ Flake check passed(ansi reset)\n"
|
||||
|
||||
# Step 3: Build (without activation)
|
||||
print $"(ansi blue)3. Building darwin configuration (no activation)...(ansi reset)"
|
||||
darwin-rebuild build --flake $"($dotfiles_dir)#macbook-pro"
|
||||
if $env.LAST_EXIT_CODE != 0 {
|
||||
print $"(ansi yellow)⚠ Build had warnings, but may still work(ansi reset)\n"
|
||||
} else {
|
||||
print $"(ansi green)✓ Build successful(ansi reset)\n"
|
||||
}
|
||||
|
||||
print $"(ansi green_bold)✓ Core QA checks passed!(ansi reset)"
|
||||
}
|
||||
'';
|
||||
|
||||
programs.nushell.envFile.text = ''
|
||||
# Set XDG Base Directory environment variables
|
||||
$env.XDG_CONFIG_HOME = "${config.xdg.configHome}"
|
||||
$env.XDG_DATA_HOME = "${config.xdg.dataHome}"
|
||||
$env.XDG_CACHE_HOME = "${config.xdg.cacheHome}"
|
||||
|
||||
let nix_paths = [
|
||||
${formatPathList [ profileBin systemBin defaultBin ]} ]
|
||||
|
||||
|
|
@ -113,6 +117,4 @@ in {
|
|||
load-secret "groq-api-key" "GROQ_API_KEY"
|
||||
load-secret "firecrawl-api-key" "FIRECRAWL_API_KEY"
|
||||
'';
|
||||
|
||||
programs.oh-my-posh.enableNushellIntegration = lib.mkDefault true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
|
||||
"blocks": [
|
||||
{
|
||||
"alignment": "right",
|
||||
"segments": [
|
||||
{
|
||||
"background": "#003543",
|
||||
"foreground": "#ffffff",
|
||||
"style": "plain",
|
||||
"template": " \ue641 {{ .CurrentDate | date .Format }} ",
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"background": "#83769c",
|
||||
"foreground": "#ffffff",
|
||||
"properties": {
|
||||
"always_enabled": true
|
||||
},
|
||||
"style": "plain",
|
||||
"template": " \ueba2 {{ .FormattedMs }} ",
|
||||
"type": "executiontime"
|
||||
}
|
||||
],
|
||||
"type": "rprompt"
|
||||
},
|
||||
{
|
||||
"alignment": "left",
|
||||
"segments": [
|
||||
{
|
||||
"background": "#61AFEF",
|
||||
"foreground": "#ffffff",
|
||||
"properties": {
|
||||
"display_host": false
|
||||
},
|
||||
"style": "diamond",
|
||||
"template": "{{if .Root}} \uf0e7 {{.UserName}} {{else}} {{.UserName}} {{end}}",
|
||||
"trailing_diamond": "\ue0b0",
|
||||
"type": "session"
|
||||
},
|
||||
{
|
||||
"background": "#C678DD",
|
||||
"foreground": "#ffffff",
|
||||
"powerline_symbol": "\ue0b0",
|
||||
"properties": {
|
||||
"folder_icon": "\uf115",
|
||||
"folder_separator_icon": " \ue0b1 ",
|
||||
"max_depth": 2,
|
||||
"style": "agnoster_short"
|
||||
},
|
||||
"style": "powerline",
|
||||
"template": " {{ .Path }} ",
|
||||
"type": "path"
|
||||
},
|
||||
{
|
||||
"background": "#95ffa4",
|
||||
"foreground": "#193549",
|
||||
"powerline_symbol": "\ue0b0",
|
||||
"properties": {
|
||||
"fetch_status": true
|
||||
},
|
||||
"style": "powerline",
|
||||
"template": " {{ .HEAD }}{{ if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{- $staged := add .Staging.Added (add .Staging.Modified (add .Staging.Deleted .Staging.Unmerged)) -}}{{ if gt $staged 0 }} ^{{$staged}}{{ end }}{{ if gt .Working.Modified 0 }} ~{{ .Working.Modified }}{{ end }}{{ if gt .Working.Deleted 0 }} -{{ .Working.Deleted }}{{ end }}{{ if gt .Working.Untracked 0 }} +{{ .Working.Untracked }}{{ end }} ",
|
||||
"type": "git"
|
||||
}
|
||||
],
|
||||
"type": "prompt"
|
||||
},
|
||||
{
|
||||
"alignment": "left",
|
||||
"newline": true,
|
||||
"segments": [
|
||||
{
|
||||
"foreground": "#61AFEF",
|
||||
"style": "plain",
|
||||
"template": "❯ ",
|
||||
"type": "text"
|
||||
}
|
||||
],
|
||||
"type": "prompt"
|
||||
}
|
||||
],
|
||||
"console_title_template": "{{if .Root}} \u26a1 {{end}}{{.UserName}} \u2794 📁{{.Folder}}",
|
||||
"final_space": true,
|
||||
"version": 3
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
let
|
||||
themeName = "capr4n.omp.json";
|
||||
themeSource = ./capr4n.omp.json;
|
||||
themeConfigPath = "${config.xdg.configHome}/oh-my-posh/${themeName}";
|
||||
in {
|
||||
programs.oh-my-posh = {
|
||||
enable = lib.mkDefault true;
|
||||
configFile = themeConfigPath;
|
||||
};
|
||||
|
||||
xdg.configFile."oh-my-posh/${themeName}".source = themeSource;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue