Compare commits

..

5 commits

6 changed files with 105 additions and 39 deletions

24
config/fastfetch.jsonc Normal file
View file

@ -0,0 +1,24 @@
{
"$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"
]
}

View file

@ -2,8 +2,10 @@
home.username = "cswimr"; home.username = "cswimr";
home.homeDirectory = "/home/cswimr"; home.homeDirectory = "/home/cswimr";
home.file = { home.file = {
".face.icon".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/assets/img/clownfish.png"; ".face.icon".source =
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
@ -38,23 +40,19 @@
extraConfig = { extraConfig = {
user = { signingkey = "0EC431A8DA8F8087"; }; user = { signingkey = "0EC431A8DA8F8087"; };
commit = { gpgsign = true; }; commit = { gpgsign = true; };
signing = { signByDefault = true; key = "0EC431A8DA8F8087"; }; signing = {
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/" [ "https://www.coastalcommits.com/" "cc:" "coastalcommits:" ];
"cc:"
"coastalcommits:"
];
}; };
"git@github.com:" = { "git@github.com:" = {
insteadOf = [ insteadOf = [ "https://github.com/" "gh:" "github:" ];
"https://github.com/"
"gh:"
"github:"
];
}; };
}; };
}; };

View file

@ -38,6 +38,7 @@
# 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;

View file

@ -2,7 +2,12 @@
# 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 = { settings.experimental-features = [ "nix-command" "flakes" ]; }; nix = {
settings = {
experimental-features = [ "nix-command" "flakes" ];
trusted-users = [ "root" "@wheel" ];
};
};
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

View file

@ -1,10 +1,8 @@
{ pkgs, ... }: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ direnv devenv ];
services.lorri = { nix.extraOptions = ''
enable = true; extra-substituters = https://devenv.cachix.org
}; extra-trusted-public-keys = devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=
'';
environment.systemPackages = with pkgs; [
direnv
];
} }

View file

@ -1,16 +1,62 @@
{ pkgs, ... }: { { pkgs, ... }: {
# starship - an customizable prompt for any shell # starship - a customizable prompt for any shell
#programs.starship = { programs.starship = {
#enable = true; enable = true;
# custom settings # custom settings
#settings = { settings = {
#format = "$all$nix_shell$python$nodejs$lua$golang$rust$php$git_branch$git_commit$git_state$git_status\n$username$hostname$directory"; format =
#add_newline = true; "[](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";
#aws.disabled = true; username = {
#gcloud.disabled = true; show_always = true;
#line_break.disabled = true; format = "[ $user@]($style)";
#}; 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;
@ -25,12 +71,6 @@
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";