Compare commits
No commits in common. "6f468d2d0ff422850b458df966d798d3303928bf" and "9f5bae49e4d7cc8aa054435d522a3d31ee2bfcf1" have entirely different histories.
6f468d2d0f
...
9f5bae49e4
6 changed files with 39 additions and 105 deletions
|
@ -1,24 +0,0 @@
|
||||||
{
|
|
||||||
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
|
|
||||||
"modules": [
|
|
||||||
"title",
|
|
||||||
"separator",
|
|
||||||
"os",
|
|
||||||
"host",
|
|
||||||
"kernel",
|
|
||||||
"uptime",
|
|
||||||
"packages",
|
|
||||||
"shell",
|
|
||||||
"display",
|
|
||||||
"de",
|
|
||||||
"wm",
|
|
||||||
"terminal",
|
|
||||||
"cpu",
|
|
||||||
"gpu",
|
|
||||||
"memory",
|
|
||||||
"swap",
|
|
||||||
"disk",
|
|
||||||
"break",
|
|
||||||
"colors"
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -2,10 +2,8 @@
|
||||||
home.username = "cswimr";
|
home.username = "cswimr";
|
||||||
home.homeDirectory = "/home/cswimr";
|
home.homeDirectory = "/home/cswimr";
|
||||||
|
|
||||||
home.file = {
|
home.file = {
|
||||||
".face.icon".source =
|
".face.icon".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/assets/img/clownfish.png";
|
||||||
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/assets/img/clownfish.png";
|
|
||||||
".config/fastfetch/config.jsonc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/fastfetch.jsonc";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# link the configuration file in current directory to the specified location in home directory
|
# link the configuration file in current directory to the specified location in home directory
|
||||||
|
@ -40,19 +38,23 @@
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
user = { signingkey = "0EC431A8DA8F8087"; };
|
user = { signingkey = "0EC431A8DA8F8087"; };
|
||||||
commit = { gpgsign = true; };
|
commit = { gpgsign = true; };
|
||||||
signing = {
|
signing = { signByDefault = true; key = "0EC431A8DA8F8087"; };
|
||||||
signByDefault = true;
|
|
||||||
key = "0EC431A8DA8F8087";
|
|
||||||
};
|
|
||||||
init = { defaultBranch = "master"; };
|
init = { defaultBranch = "master"; };
|
||||||
safe = { directory = "/etc/nixos"; };
|
safe = { directory = "/etc/nixos"; };
|
||||||
url = {
|
url = {
|
||||||
"git@coastalcommits.com:" = {
|
"git@coastalcommits.com:" = {
|
||||||
insteadOf =
|
insteadOf = [
|
||||||
[ "https://www.coastalcommits.com/" "cc:" "coastalcommits:" ];
|
"https://www.coastalcommits.com/"
|
||||||
|
"cc:"
|
||||||
|
"coastalcommits:"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
"git@github.com:" = {
|
"git@github.com:" = {
|
||||||
insteadOf = [ "https://github.com/" "gh:" "github:" ];
|
insteadOf = [
|
||||||
|
"https://github.com/"
|
||||||
|
"gh:"
|
||||||
|
"github:"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.br-a1d891ddb0a1.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
||||||
|
|
|
@ -2,12 +2,7 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
{
|
{
|
||||||
nix = {
|
nix = { settings.experimental-features = [ "nix-command" "flakes" ]; };
|
||||||
settings = {
|
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
trusted-users = [ "root" "@wheel" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
environment.systemPackages = with pkgs; [ direnv devenv ];
|
|
||||||
|
|
||||||
nix.extraOptions = ''
|
services.lorri = {
|
||||||
extra-substituters = https://devenv.cachix.org
|
enable = true;
|
||||||
extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
|
};
|
||||||
'';
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
direnv
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,62 +1,16 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
# starship - a customizable prompt for any shell
|
# starship - an customizable prompt for any shell
|
||||||
programs.starship = {
|
#programs.starship = {
|
||||||
enable = true;
|
#enable = true;
|
||||||
# custom settings
|
# custom settings
|
||||||
settings = {
|
#settings = {
|
||||||
format =
|
#format = "$all$nix_shell$python$nodejs$lua$golang$rust$php$git_branch$git_commit$git_state$git_status\n$username$hostname$directory";
|
||||||
"[](bg:#1e1e2e fg:#a6e3a1)$username$hostname[](fg:#a6e3a1 bg:#89b4fa)$directory[](fg:#89b4fa bg:#cba6f7)$direnv[](fg:#cba6f7 bg:#f9e2af)$git_branch$git_status[](fg:#f9e2af bg:#1e1e2e)$character";
|
#add_newline = true;
|
||||||
username = {
|
#aws.disabled = true;
|
||||||
show_always = true;
|
#gcloud.disabled = true;
|
||||||
format = "[ $user@]($style)";
|
#line_break.disabled = true;
|
||||||
style_user = "fg:#313244 bg:#a6e3a1";
|
#};
|
||||||
style_root = "fg:#313244 bg:#a6e3a1";
|
#};
|
||||||
};
|
|
||||||
hostname = {
|
|
||||||
ssh_only = false;
|
|
||||||
format = "[$hostname $ssh_symbol]($style)";
|
|
||||||
style = "fg:#313244 bg:#a6e3a1";
|
|
||||||
};
|
|
||||||
directory = {
|
|
||||||
format = "[ $path ]($style)";
|
|
||||||
style = "fg:#313244 bg:#89b4fa";
|
|
||||||
};
|
|
||||||
git_branch = {
|
|
||||||
format = "[ $symbol$branch(:$remote_branch) ]($style)";
|
|
||||||
symbol = " ";
|
|
||||||
style = "fg:#313244 bg:#f9e2af";
|
|
||||||
};
|
|
||||||
direnv = {
|
|
||||||
symbol = " ";
|
|
||||||
format = "[ $symbol$loaded/$allowed ]($style)";
|
|
||||||
disabled = false;
|
|
||||||
style = "fg:#313244 bg:#cba6f7";
|
|
||||||
};
|
|
||||||
git_status = {
|
|
||||||
format = "[$all_status]($style)";
|
|
||||||
style = "fg:#313244 bg:#f9e2af";
|
|
||||||
};
|
|
||||||
git_metrics = {
|
|
||||||
format = "([+$added]($added_style))[]($added_style)";
|
|
||||||
added_style = "fg:#313244 bg:#f9e2af";
|
|
||||||
deleted_style = "fg:bright-red bg:235";
|
|
||||||
disabled = false;
|
|
||||||
};
|
|
||||||
hg_branch = {
|
|
||||||
format = "[ $symbol$branch ]($style)";
|
|
||||||
symbol = " ";
|
|
||||||
};
|
|
||||||
cmd_duration = {
|
|
||||||
format = "[ $duration ]($style)";
|
|
||||||
style = "fg:bright-white bg:18";
|
|
||||||
};
|
|
||||||
character = {
|
|
||||||
success_symbol = "[ ](#a6e3a1) ";
|
|
||||||
error_symbol = "[ ✗](#f38ba8) ";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
users.defaultUserShell = pkgs.zsh;
|
users.defaultUserShell = pkgs.zsh;
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -71,6 +25,12 @@
|
||||||
histSize = 10000;
|
histSize = 10000;
|
||||||
histFile = "$HOME/.zsh_history";
|
histFile = "$HOME/.zsh_history";
|
||||||
|
|
||||||
|
ohMyZsh = {
|
||||||
|
enable = true;
|
||||||
|
theme = "agnoster";
|
||||||
|
plugins = [ "git" "direnv"];
|
||||||
|
};
|
||||||
|
|
||||||
shellAliases = let ezaArgs = "--time-style='+%Y-%m-%d %H:%M' --icons";
|
shellAliases = let ezaArgs = "--time-style='+%Y-%m-%d %H:%M' --icons";
|
||||||
in {
|
in {
|
||||||
ff = "fastfetch";
|
ff = "fastfetch";
|
||||||
|
|
Loading…
Reference in a new issue