update font and bash configuration
This commit is contained in:
parent
6d78ee1a97
commit
fdedda3e06
5 changed files with 53 additions and 9 deletions
|
@ -11,8 +11,14 @@ with lib;
|
||||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
|
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
|
||||||
|
|
||||||
stylix.fonts = {
|
stylix.fonts = {
|
||||||
serif = config.stylix.fonts.monospace;
|
serif = {
|
||||||
sansSerif = config.stylix.fonts.monospace;
|
package = pkgs.ubuntu_font_family;
|
||||||
|
name = "Ubuntu";
|
||||||
|
};
|
||||||
|
sansSerif = {
|
||||||
|
package = pkgs.ubuntu_font_family;
|
||||||
|
name = "Ubuntu";
|
||||||
|
};
|
||||||
monospace = {
|
monospace = {
|
||||||
package = pkgs.jetbrains-mono;
|
package = pkgs.jetbrains-mono;
|
||||||
name = "JetBrains Mono";
|
name = "JetBrains Mono";
|
||||||
|
|
38
nixos/components/terminal/bash.nix
Normal file
38
nixos/components/terminal/bash.nix
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
{ pkgs, config, lib, ... }:
|
||||||
|
with lib;
|
||||||
|
{
|
||||||
|
options.components.terminal.bash.enable = mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = config.components.terminal.enable;
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf (config.components.terminal.bash.enable) {
|
||||||
|
|
||||||
|
programs.bash = {
|
||||||
|
|
||||||
|
enable = true;
|
||||||
|
enableCompletion = true;
|
||||||
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
|
interactiveShellInit = "set -o vi";
|
||||||
|
|
||||||
|
|
||||||
|
shellAliases = {
|
||||||
|
ls = "ls --color=tty";
|
||||||
|
l = "ls -CFh";
|
||||||
|
la = "ls -Ah";
|
||||||
|
ll = "ls -lh";
|
||||||
|
lt = "ls -lct --reverse";
|
||||||
|
less = "less -S";
|
||||||
|
top = "htop";
|
||||||
|
version = "date '+%Y%m%d%H%M%S'";
|
||||||
|
vclip = "xclip -selection clipboard";
|
||||||
|
df = "df -h";
|
||||||
|
timestamp = "date +%Y%m%d%H%M%S";
|
||||||
|
nix-show-garbadge-roots = "ls -lh /nix/var/nix/gcroots/auto/";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
|
@ -18,10 +18,10 @@
|
||||||
./programs/curl-scripts.nix
|
./programs/curl-scripts.nix
|
||||||
#./programs/easytag.nix
|
#./programs/easytag.nix
|
||||||
#./programs/elm.nix
|
#./programs/elm.nix
|
||||||
./programs/espeak.nix
|
#./programs/espeak.nix
|
||||||
#./programs/ffmpeg.nix
|
#./programs/ffmpeg.nix
|
||||||
#./programs/git.nix
|
#./programs/git.nix
|
||||||
./programs/shell-bash.nix
|
#./programs/shell-bash.nix
|
||||||
#./programs/shell-tools.nix
|
#./programs/shell-tools.nix
|
||||||
#./programs/shell-zsh.nix
|
#./programs/shell-zsh.nix
|
||||||
#./programs/slack.nix
|
#./programs/slack.nix
|
||||||
|
|
|
@ -250,7 +250,7 @@ in
|
||||||
users.users = flip mapAttrs cfg.configList
|
users.users = flip mapAttrs cfg.configList
|
||||||
(name: config: {
|
(name: config: {
|
||||||
home = config.home;
|
home = config.home;
|
||||||
createHome = true;
|
createHome = false;
|
||||||
initialPassword = "${name}-browser";
|
initialPassword = "${name}-browser";
|
||||||
shell = pkgs.bashInteractive;
|
shell = pkgs.bashInteractive;
|
||||||
isNormalUser = false;
|
isNormalUser = false;
|
||||||
|
|
|
@ -31,10 +31,10 @@
|
||||||
|
|
||||||
# Shell configuration
|
# Shell configuration
|
||||||
# -------------------
|
# -------------------
|
||||||
programs.custom = {
|
#programs.custom = {
|
||||||
bash.enable = true;
|
# bash.enable = true;
|
||||||
#zsh.enable = true;
|
# #zsh.enable = true;
|
||||||
};
|
#};
|
||||||
|
|
||||||
# This value determines the NixOS release with which your system is to be
|
# This value determines the NixOS release with which your system is to be
|
||||||
# compatible, in order to avoid breaking some software such as database
|
# compatible, in order to avoid breaking some software such as database
|
||||||
|
|
Loading…
Reference in a new issue