materus/nixos-config
1
0
Fork 0
mirror of https://github.com/materusPL/nixos-config synced 2026-07-02 12:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

code: nixpkgs-fmt to format code

Browse Source
This commit is contained in:
Mateusz Słodkowicz
2024-03-11 16:19:31 +01:00
parent 8ecb892244
commit 04ad6ac1cd
46 changed files with 544 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configurations/profile/home/shell/bash.nix
+11 -11
View File
@@ -1,20 +1,20 @@
{ config, pkgs, lib, materusArg, ... }:
let
cfg = config.materus.profile.bash;
let
cfg = config.materus.profile.bash;
in
{
options.materus.profile.bash.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminal "Enable materus bash config";
options.materus.profile.bash.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminal "Enable materus bash config";
config = lib.mkIf cfg.enable {
config = lib.mkIf cfg.enable {
programs.bash = {
enable = lib.mkDefault true;
enableCompletion = lib.mkDefault true;
enableVteIntegration = lib.mkDefault true;
historyControl = lib.mkDefault ["erasedups" "ignorespace"];
shellOptions = lib.mkDefault [ "autocd" "checkwinsize" "cmdhist" "expand_aliases" "extglob" "globstar" "checkjobs" "nocaseglob" ];
};
programs.bash = {
enable = lib.mkDefault true;
enableCompletion = lib.mkDefault true;
enableVteIntegration = lib.mkDefault true;
historyControl = lib.mkDefault [ "erasedups" "ignorespace" ];
shellOptions = lib.mkDefault [ "autocd" "checkwinsize" "cmdhist" "expand_aliases" "extglob" "globstar" "checkjobs" "nocaseglob" ];
};
};
}
configurations/profile/home/shell/default.nix
+3 -3
View File
@@ -1,9 +1,9 @@
{
imports = [
imports = [
./zsh.nix
./bash.nix
./fish.nix
./starship.nix
];
}
];
}
configurations/profile/home/shell/fish.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ config, pkgs, lib, materusArg, ... }:
let
cfg = config.materus.profile.fish;
let
cfg = config.materus.profile.fish;
in
{
options.materus.profile.fish.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus fish config";
@@ -9,4 +9,4 @@ in
enable = lib.mkDefault true;
};
};
}
}
configurations/profile/home/shell/starship.nix
+3 -3
View File
@@ -17,7 +17,7 @@ in
format = "$username@$hostname$all";
right_format = "$cmd_duration $time";
time = {
disabled = false;
style = "bold bright-black";
@@ -28,8 +28,8 @@ in
shell = {
disabled = false;
fish_indicator = "fish";
bash_indicator= "bash";
zsh_indicator= "zsh";
bash_indicator = "bash";
zsh_indicator = "zsh";
style = "blue bold";
};
configurations/profile/home/shell/zsh.nix
+23 -22
View File
@@ -2,8 +2,9 @@
let
relToDotDir = file: (lib.optionalString (config.programs.zsh.dotDir != null) (config.programs.zsh.dotDir + "/")) + file;
pluginsDir = if config.programs.zsh.dotDir != null then
relToDotDir "plugins" else ".zsh/plugins";
pluginsDir =
if config.programs.zsh.dotDir != null then
relToDotDir "plugins" else ".zsh/plugins";
@@ -14,16 +15,16 @@ let
makeEnv = name: val: ''${name}=''${${name}:-"${val}"}'';
makeIfVar = var: val: ret: ''
if [ ''$${var} = "${val}" ]; then
${ret}
fi'';
if [ ''$${var} = "${val}" ]; then
${ret}
fi'';
makePlugin = nameArg: fileArg: srcArg: rec {
makePlugin = nameArg: fileArg: srcArg: rec {
name = nameArg;
src = srcArg;
path = pluginsDir + "/" + name;
@@ -33,20 +34,20 @@ let
extraPlugins = {
powerlevel10k = makePlugin "powerlevel10k" "powerlevel10k.zsh-theme" (pkgs.fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
rev = "v1.20.0";
sha256 = "sha256-ES5vJXHjAKw/VHjWs8Au/3R+/aotSbY7PWnWAMzCR8E=";
});
owner = "romkatv";
repo = "powerlevel10k";
rev = "v1.20.0";
sha256 = "sha256-ES5vJXHjAKw/VHjWs8Au/3R+/aotSbY7PWnWAMzCR8E=";
});
};
in
{
options.materus.profile.zsh.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus zsh config";
options.materus.profile.zsh.prompt = lib.mkOption {
type = lib.types.enum ["p10k" "starship"];
example = "p10k";
default = "p10k";
type = lib.types.enum [ "p10k" "starship" ];
example = "p10k";
default = "p10k";
};
@@ -54,8 +55,8 @@ in
home.packages = [
pkgs.ripgrep
];
home.file = builtins.foldl' (a: b: a // b) {} (builtins.map (plugin: {${plugin.path}.source = plugin.src;})(builtins.attrValues extraPlugins));
home.file = builtins.foldl' (a: b: a // b) { } (builtins.map (plugin: { ${plugin.path}.source = plugin.src; }) (builtins.attrValues extraPlugins));
programs.zsh = {
enable = true;
@@ -68,8 +69,8 @@ in
envExtra = ''
${makeEnv "__MATERUS_HM_ZSH" "1"}
${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt}
${makeEnv "__MATERUS_HM_ZSH" "1"}
${makeEnv "__MATERUS_HM_ZSH_PROMPT" cfg.prompt}
'';
@@ -88,7 +89,7 @@ in
plugins = [
];
history = {
extended = true;
save = 100000;
@@ -106,8 +107,8 @@ in
bindkey -r "^["
bindkey ";5C" forward-word
bindkey ";5D" backward-word
'' +
makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" ''
'' +
makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" ''
if zmodload zsh/terminfo && (( terminfo[colors] >= 256 )); then
[[ ! -f ${p10kcfg}/fullcolor.zsh ]] || source ${p10kcfg}/fullcolor.zsh
else
@@ -117,7 +118,7 @@ in
};
programs.starship.enableZshIntegration = lib.mkForce false;
programs.starship.enableZshIntegration = lib.mkForce false;
};