0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Grisha Shipunov 2025-01-26 01:39:08 +01:00
parent f1f292bced
commit c9ddbcbc87
7 changed files with 125 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
modules/basic-tools/default.nix
View file

@ -6,6 +6,8 @@
./multiplexers.nix
./nix.nix
./nix-ld.nix
./zsh.nix
./fish.nix
];
environment.systemPackages =
@ -68,47 +70,11 @@
// editorconf;
environment.shellAliases = {
ls = "ls --color=auto";
l = "ls -l";
la = "ls -la";
ll = "ls -lah";
lt = "ls --tree";
vim = "nvim";
grep = "grep --color=auto";
e = "$EDITOR";
v = "$EDITOR";
};
users.defaultUserShell = pkgs.zsh;
programs.zsh = {
enable = true;
enableCompletion = true;
syntaxHighlighting.enable = true;
interactiveShellInit = ''
bindkey -e
export HISTFILE="$HOME/.zsh_history"
export HISTSIZE=10000000
export SAVEHIST=10000000
setopt HIST_IGNORE_ALL_DUPS
# allow comments
setopt interactivecomments
'';
promptInit = ''
source ${pkgs.liquidprompt}/share/zsh/plugins/liquidprompt/liquidprompt
'';
};
environment.etc.liquidpromptrc = {
text = ''
LP_ENABLE_SSH_COLORS=1
LP_ENABLE_TITLE=1
LP_ENABLE_SCREEN_TITLE=1
LP_ENABLE_TEMP=0
LP_ENABLE_SVN=0
LP_BATTERY_THRESHOLD=15
LP_SSH_COLORS=1
'';
};
users.defaultUserShell = (if config.networking.hostName == "toaster" then pkgs.fish else pkgs.zsh);
users.users.root.shell = pkgs.zsh; # keep root shell posix compatible
programs.iftop.enable = true;
programs.mosh.enable = true;

26
modules/basic-tools/fish.nix Normal file
View file

@ -0,0 +1,26 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
lsd
fzf
grc
fishPlugins.done
fishPlugins.fzf-fish
fishPlugins.tide
fishPlugins.grc
];
programs.fish = {
enable = true;
interactiveShellInit = ''
set fish_greeting
'';
shellAliases = {
ls = "lsd --icon=never";
l = "ls -l";
ll = "ls -la";
vim = "nvim";
grep = "grep --color=auto";
};
};
}

44
modules/basic-tools/zsh.nix Normal file
View file

@ -0,0 +1,44 @@
{ pkgs, ... }:
{
environment.shellAliases = {
ls = "ls --color=auto";
l = "ls -l";
la = "ls -la";
ll = "ls -lah";
lt = "ls --tree";
vim = "nvim";
grep = "grep --color=auto";
e = "$EDITOR";
v = "$EDITOR";
};
programs.zsh = {
enable = true;
enableCompletion = true;
syntaxHighlighting.enable = true;
interactiveShellInit = ''
bindkey -e
export HISTFILE="$HOME/.zsh_history"
export HISTSIZE=10000000
export SAVEHIST=10000000
setopt HIST_IGNORE_ALL_DUPS
# allow comments
setopt interactivecomments
'';
promptInit = ''
source ${pkgs.liquidprompt}/share/zsh/plugins/liquidprompt/liquidprompt
'';
};
environment.etc.liquidpromptrc = {
text = ''
LP_ENABLE_SSH_COLORS=1
LP_ENABLE_TITLE=1
LP_ENABLE_SCREEN_TITLE=1
LP_ENABLE_TEMP=0
LP_ENABLE_SVN=0
LP_BATTERY_THRESHOLD=15
LP_SSH_COLORS=1
'';
};
}

6
modules/devtools.nix
View file

@ -30,7 +30,7 @@
freecad-wayland
imhex
python313Full
pkgs.nixfmt-rfc-style
nixfmt-rfc-style
treefmt
android-tools
];
@ -58,6 +58,10 @@
programs.zsh.interactiveShellInit = ''
eval "$(direnv hook zsh)"
'';
programs.fish.interactiveShellInit = ''
direnv hook fish | source
'';
# nix options for derivations to persist garbage collection
nix.extraOptions = ''
keep-outputs = true

43
modules/fonts.nix Normal file
View file

@ -0,0 +1,43 @@
{ pkgs, ... }:
{
fonts.packages = with pkgs; [
monoid
font-awesome
dejavu_fonts
julia-mono
uw-ttyp0
gohufont
spleen
terminus_font
creep
corefonts
dina-font
fira
fira-mono
hack-font
liberation_ttf
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-extra
proggyfonts
symbola
open-sans
twemoji-color-font
twitter-color-emoji
iosevka-bin
(nerdfonts.override { fonts = [ "Hack" ]; })
];
fonts.enableDefaultPackages = true;
fonts.fontconfig = {
enable = true;
allowBitmaps = true;
useEmbeddedBitmaps = true;
defaultFonts.emoji = [
"Twitter Color Emoji"
"Noto Color Emoji"
];
};
}

42
modules/gnome.nix
View file

@ -1,8 +1,9 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
{
imports = [
./desktop-software.nix
./fonts.nix
];
environment.systemPackages = with pkgs; [
amberol
@ -62,45 +63,6 @@
programs.zsh.vteIntegration = true;
programs.bash.vteIntegration = true;
fonts.packages = with pkgs; [
monoid
font-awesome
dejavu_fonts
julia-mono
uw-ttyp0
gohufont
spleen
terminus_font
creep
corefonts
dina-font
fira
fira-mono
hack-font
liberation_ttf
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-extra
proggyfonts
symbola
open-sans
twemoji-color-font
twitter-color-emoji
iosevka-bin
];
fonts.enableDefaultPackages = true;
fonts.fontconfig = {
enable = true;
allowBitmaps = true;
useEmbeddedBitmaps = true;
defaultFonts.emoji = [
"Twitter Color Emoji"
"Noto Color Emoji"
];
};
hardware.bluetooth.enable = true;
}

42
modules/sway.nix
View file

@ -3,6 +3,7 @@
{
imports = [
./desktop-software.nix
./fonts.nix
];
environment.systemPackages = with pkgs; [
screen-message
@ -25,47 +26,6 @@
audacity
];
#on the desktop, we need nice fonts ^^
fonts.packages = with pkgs; [
monoid
font-awesome
dejavu_fonts
julia-mono
uw-ttyp0
gohufont
spleen
terminus_font
creep
corefonts
dina-font
fira
fira-mono
hack-font
liberation_ttf
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-extra
proggyfonts
symbola
open-sans
twemoji-color-font
twitter-color-emoji
iosevka
nerd-fonts.hack
];
fonts.enableDefaultPackages = true;
fonts.fontconfig = {
enable = true;
allowBitmaps = true;
useEmbeddedBitmaps = true;
defaultFonts.emoji = [
"Noto Color Emoji"
"Twitter Color Emoji"
];
};
# Enable sound.
security.rtkit.enable = true;