formatted all files with nixfmt, added env variable to hold secrets
This commit is contained in:
pagedmov
@@ -1,10 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
{ lib, pkgs, modulesPath, inputs, ... }:
|
||||
let
|
||||
extraFigletFonts = pkgs.fetchFromGitHub {
|
||||
owner = "xero";
|
||||
repo = "figlet-fonts";
|
||||
@@ -12,7 +7,7 @@
|
||||
sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
|
||||
};
|
||||
toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
|
||||
buildInputs = oldAttrs.buildInputs or [ ] ++ [ extraFigletFonts ];
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
@@ -28,11 +23,7 @@ in {
|
||||
];
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
system.stateVersion = "24.05";
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
};
|
||||
};
|
||||
nix = { settings = { experimental-features = [ "nix-command" "flakes" ]; }; };
|
||||
|
||||
networking = {
|
||||
wireless.enable = false;
|
||||
@@ -65,11 +56,9 @@ in {
|
||||
home-manager = {
|
||||
users.root = {
|
||||
programs.home-manager.enable = true;
|
||||
home= {
|
||||
home = {
|
||||
stateVersion = "24.05";
|
||||
file = {
|
||||
"disko.nix".source = ./disko-ext4-singledisk.nix;
|
||||
};
|
||||
file = { "disko.nix".source = ./disko-ext4-singledisk.nix; };
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -81,106 +70,106 @@ in {
|
||||
|
||||
programs = {
|
||||
zsh = {
|
||||
enable = true;
|
||||
|
||||
ohMyZsh = {
|
||||
enable = true;
|
||||
plugins = ["git" "fzf"];
|
||||
};
|
||||
|
||||
enableCompletion = true;
|
||||
ohMyZsh = {
|
||||
enable = true;
|
||||
plugins = [ "git" "fzf" ];
|
||||
};
|
||||
|
||||
histFile = "$HOME/.zsh_history";
|
||||
histSize = 10000;
|
||||
enableCompletion = true;
|
||||
|
||||
autosuggestions = {
|
||||
enable = true;
|
||||
highlightStyle = "fg=#4C566A,underline";
|
||||
};
|
||||
histFile = "$HOME/.zsh_history";
|
||||
histSize = 10000;
|
||||
|
||||
shellAliases = {
|
||||
grep = "grep --color=auto";
|
||||
vi = "nvim";
|
||||
mv = "mv -v";
|
||||
cp = "cp -vr";
|
||||
".." = "cd ..";
|
||||
psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
|
||||
mkdir = "mkdir -p";
|
||||
pk = "pkill -9 -f";
|
||||
svc = "sudo systemctl";
|
||||
};
|
||||
promptInit = ''
|
||||
bindkey -v
|
||||
type starship_zle-keymap-select >/dev/null || \
|
||||
{
|
||||
eval "$(starship init zsh)"
|
||||
}
|
||||
'';
|
||||
setOptions = [
|
||||
"APPEND_HISTORY"
|
||||
"INC_APPEND_HISTORY"
|
||||
"SHARE_HISTORY"
|
||||
"CORRECT"
|
||||
"NO_NOMATCH"
|
||||
"LIST_PACKED"
|
||||
"ALWAYS_TO_END"
|
||||
"GLOB_COMPLETE"
|
||||
"COMPLETE_ALIASES"
|
||||
"COMPLETE_IN_WORD"
|
||||
"AUTO_CD"
|
||||
"AUTO_CONTINUE"
|
||||
"LONG_LIST_JOBS"
|
||||
"HIST_VERIFY"
|
||||
"SHARE_HISTORY"
|
||||
"HIST_IGNORE_SPACE"
|
||||
"HIST_SAVE_NO_DUPS"
|
||||
"HIST_IGNORE_ALL_DUPS"
|
||||
"EXTENDED_GLOB"
|
||||
"TRANSIENT_RPROMPT"
|
||||
"INTERACTIVE_COMMENTS"
|
||||
];
|
||||
shellInit = ''
|
||||
export EDITOR="nvim"
|
||||
export SUDO_EDITOR="nvim"
|
||||
export VISUAL="nvim"
|
||||
export LANG="en_US.UTF-8"
|
||||
autosuggestions = {
|
||||
enable = true;
|
||||
highlightStyle = "fg=#4C566A,underline";
|
||||
};
|
||||
|
||||
unalias ls
|
||||
ls() {
|
||||
eza -1 --group-directories-first --icons "$@"
|
||||
}
|
||||
shellAliases = {
|
||||
grep = "grep --color=auto";
|
||||
vi = "nvim";
|
||||
mv = "mv -v";
|
||||
cp = "cp -vr";
|
||||
".." = "cd ..";
|
||||
psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
|
||||
mkdir = "mkdir -p";
|
||||
pk = "pkill -9 -f";
|
||||
svc = "sudo systemctl";
|
||||
};
|
||||
promptInit = ''
|
||||
bindkey -v
|
||||
type starship_zle-keymap-select >/dev/null || \
|
||||
{
|
||||
eval "$(starship init zsh)"
|
||||
}
|
||||
'';
|
||||
setOptions = [
|
||||
"APPEND_HISTORY"
|
||||
"INC_APPEND_HISTORY"
|
||||
"SHARE_HISTORY"
|
||||
"CORRECT"
|
||||
"NO_NOMATCH"
|
||||
"LIST_PACKED"
|
||||
"ALWAYS_TO_END"
|
||||
"GLOB_COMPLETE"
|
||||
"COMPLETE_ALIASES"
|
||||
"COMPLETE_IN_WORD"
|
||||
"AUTO_CD"
|
||||
"AUTO_CONTINUE"
|
||||
"LONG_LIST_JOBS"
|
||||
"HIST_VERIFY"
|
||||
"SHARE_HISTORY"
|
||||
"HIST_IGNORE_SPACE"
|
||||
"HIST_SAVE_NO_DUPS"
|
||||
"HIST_IGNORE_ALL_DUPS"
|
||||
"EXTENDED_GLOB"
|
||||
"TRANSIENT_RPROMPT"
|
||||
"INTERACTIVE_COMMENTS"
|
||||
];
|
||||
shellInit = ''
|
||||
export EDITOR="nvim"
|
||||
export SUDO_EDITOR="nvim"
|
||||
export VISUAL="nvim"
|
||||
export LANG="en_US.UTF-8"
|
||||
|
||||
y() {
|
||||
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")"
|
||||
yazi "$@" --cwd-file="$tmp"
|
||||
if cwd="$(command cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
|
||||
builtin cd -- "$cwd"
|
||||
fi
|
||||
rm -f -- "$tmp"
|
||||
}
|
||||
unalias ls
|
||||
ls() {
|
||||
eza -1 --group-directories-first --icons "$@"
|
||||
}
|
||||
|
||||
cd() {
|
||||
export SOUNDS_ENABLED=0
|
||||
eza -1 --group-directories-first --icons "$@"
|
||||
builtin cd "$@" || exit
|
||||
export SOUNDS_ENABLED=1
|
||||
}
|
||||
if [ ! -e $HOME/.zsh_history ]; then
|
||||
touch $HOME/.zsh_history
|
||||
chmod 600 $HOME/.zsh_history
|
||||
fi
|
||||
y() {
|
||||
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")"
|
||||
yazi "$@" --cwd-file="$tmp"
|
||||
if cwd="$(command cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
|
||||
builtin cd -- "$cwd"
|
||||
fi
|
||||
rm -f -- "$tmp"
|
||||
}
|
||||
|
||||
autoload -U compinit # completion
|
||||
autoload -U terminfo # terminfo keys
|
||||
zmodload -i zsh/complist # menu completion
|
||||
autoload -U promptinit # prompt
|
||||
cd() {
|
||||
export SOUNDS_ENABLED=0
|
||||
eza -1 --group-directories-first --icons "$@"
|
||||
builtin cd "$@" || exit
|
||||
export SOUNDS_ENABLED=1
|
||||
}
|
||||
if [ ! -e $HOME/.zsh_history ]; then
|
||||
touch $HOME/.zsh_history
|
||||
chmod 600 $HOME/.zsh_history
|
||||
fi
|
||||
|
||||
autoload -U up-line-or-beginning-search; zle -N up-line-or-beginning-search
|
||||
autoload -U down-line-or-beginning-search; zle -N down-line-or-beginning-search
|
||||
autoload -U compinit # completion
|
||||
autoload -U terminfo # terminfo keys
|
||||
zmodload -i zsh/complist # menu completion
|
||||
autoload -U promptinit # prompt
|
||||
|
||||
unalias ls
|
||||
clear
|
||||
'';
|
||||
autoload -U up-line-or-beginning-search; zle -N up-line-or-beginning-search
|
||||
autoload -U down-line-or-beginning-search; zle -N down-line-or-beginning-search
|
||||
|
||||
unalias ls
|
||||
clear
|
||||
'';
|
||||
};
|
||||
starship = {
|
||||
enable = true;
|
||||
@@ -201,7 +190,9 @@ in {
|
||||
format = "[$user]($style)";
|
||||
};
|
||||
directory = {
|
||||
format = "\n[$path](bold cyan)[/](bold green) ";
|
||||
format = ''
|
||||
|
||||
[$path](bold cyan)[/](bold green) '';
|
||||
style = "bold #b4befe";
|
||||
};
|
||||
|
||||
@@ -220,7 +211,9 @@ in {
|
||||
};
|
||||
|
||||
git_branch = {
|
||||
format = "\non [$symbol$branch](bold purple)";
|
||||
format = ''
|
||||
|
||||
on [$symbol$branch](bold purple)'';
|
||||
symbol = " ";
|
||||
truncation_length = 15;
|
||||
style = "bold purple";
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
# USAGE in your configuration.nix.
|
||||
# Update devices to match your hardware.
|
||||
{
|
||||
device ? throw "Set this to your disk device, e.g. /dev/sda",
|
||||
root_size,
|
||||
nix_size,
|
||||
...
|
||||
}: {
|
||||
{ device ? throw "Set this to your disk device, e.g. /dev/sda", root_size
|
||||
, nix_size, ... }: {
|
||||
disko.devices = {
|
||||
disk = {
|
||||
main = {
|
||||
@@ -25,7 +21,7 @@
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = ["umask=0077"];
|
||||
mountOptions = [ "umask=0077" ];
|
||||
};
|
||||
};
|
||||
nix = {
|
||||
|
||||
Reference in New Issue
Block a user