Move fonts to be defined when needed, move program shell integration settings into shell-specific expressions

This commit is contained in:
Evie Litherland-Smith 2023-04-29 12:38:42 +01:00
parent 6d510896f6
commit 6b1a530820
21 changed files with 54 additions and 104 deletions

View file

@ -0,0 +1,25 @@
{ pkgs, ... }:
{
imports = [
../../browser/librewolf.nix
../../desktop/wayland/hyprland.nix
../../env/bash.nix
../../env/fish.nix
../../env/bat.nix
../../env/direnv.nix
../../env/keychain.nix
../../env/ssh.nix
../../env/starship.nix
../../terminal/wezterm.nix
../../tui/neovim.nix
../../tui/lazygit.nix
];
home.packages = with pkgs; [
bitwarden
file
marktext
silver-searcher
signal-desktop
zotero
];
}

View file

@ -1,35 +1,15 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
../../browser/librewolf.nix ../common/desktop.nix
../../desktop/wayland/hyprland.nix
../../env/fonts/firacode.nix
../../env/shell/bash.nix
../../env/shell/fish.nix
../../env/bat.nix
../../env/direnv.nix
../../env/keychain.nix
../../env/nixpkgs.nix
../../env/ssh.nix
../../env/starship.nix
../../git/personal.nix ../../git/personal.nix
../../terminal/foot.nix
../../terminal/wezterm.nix
../../tui/neovim.nix
../../tui/lazygit.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
bitwarden
file
marktext
mesa mesa
neovide neovide
nomachine-client nomachine-client
otpclient otpclient
silver-searcher
signal-desktop
steam steam
steam-run steam-run
zotero
]; ];
} }

View file

@ -1,35 +1,15 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
../../browser/librewolf.nix ../common/desktop.nix
../../desktop/wayland/hyprland.nix
../../env/fonts/firacode.nix
../../env/shell/bash.nix
../../env/shell/fish.nix
../../env/bat.nix
../../env/direnv.nix
../../env/keychain.nix
../../env/nixpkgs.nix
../../env/ssh.nix
../../env/starship.nix
../../git/work.nix ../../git/work.nix
../../terminal/wezterm.nix
../../terminal/foot.nix
../../tui/neovim.nix
../../tui/lazygit.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
bitwarden
file
libreoffice-fresh libreoffice-fresh
marktext
neovide neovide
nomachine-client nomachine-client
otpclient otpclient
silver-searcher
signal-desktop
teams teams
zoom-us zoom-us
zotero
]; ];
} }

View file

@ -30,6 +30,7 @@ in
# text = "# test"; # text = "# test";
}; };
xsession.enable = true; xsession.enable = true;
programs.keychain.enableXsessionIntegration = true;
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland = { xwayland = {

View file

@ -1,5 +1,9 @@
{ ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; })
bluez
];
xdg.configFile."waybar".source = ./config/waybar; xdg.configFile."waybar".source = ./config/waybar;
programs.waybar.enable = true; programs.waybar.enable = true;
} }

View file

@ -1,2 +1,5 @@
{ ... }: { ... }:
{ xsession.enable = true; } {
xsession.enable = true;
programs.keychain.enableXsessionIntegration = true;
}

View file

@ -1,5 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./common.nix ];
xresources.extraConfig = builtins.readFile xresources.extraConfig = builtins.readFile
( (
pkgs.fetchFromGitHub pkgs.fetchFromGitHub

View file

@ -11,4 +11,6 @@
xnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized"; xnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized";
}; };
}; };
programs.keychain.enableBashIntegration = true;
programs.starship.enableBashIntegration = true;
} }

View file

@ -1,6 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ../env/fonts];
programs.bat = { programs.bat = {
enable = true; enable = true;
config = { config = {

View file

@ -1,10 +1,4 @@
{...}: { ... }:
{ {
imports = [ ./shell ]; programs.direnv.enable = true;
programs.direnv = {
enable = true;
#enableBashIntegration = true;
#enableZshIntegration = true;
#enableFishIntegration = true;
};
} }

View file

@ -14,4 +14,6 @@
rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server ~/.nvim.sock"; rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server ~/.nvim.sock";
}; };
}; };
programs.keychain.enableFishIntegration = true;
programs.starship.enableFishIntegration = true;
} }

View file

@ -1,7 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
fira-code
(nerdfonts.override { fonts = [ "FiraCode" ]; })
];
}

View file

@ -1,7 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; })
];
}

View file

@ -1,12 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ ./shell ];
programs.keychain = { programs.keychain = {
enable = true; enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
enableXsessionIntegration = true;
extraFlags = [ extraFlags = [
"--quiet" "--quiet"
"--ignore-missing" "--ignore-missing"

View file

@ -1,4 +0,0 @@
{ ... }:
{
nixpkgs.config.allowUnfree = true;
}

View file

@ -1,8 +0,0 @@
{ ... }:
{
imports = [
./bash.nix
./zsh.nix
./fish.nix
];
}

View file

@ -1,6 +1,5 @@
{ ... }: { ... }:
{ {
imports = [ ./shell ];
programs.ssh = { programs.ssh = {
enable = true; enable = true;
includes = [ "config.d/*" ]; includes = [ "config.d/*" ];

View file

@ -1,11 +1,6 @@
{ ... }: { pkgs, ... }:
{ {
imports = [ ./shell ]; home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
xdg.configFile."starship.toml".source = ./config/starship.toml; xdg.configFile."starship.toml".source = ./config/starship.toml;
programs.starship = { programs.starship.enable = true;
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
};
} }

View file

@ -17,4 +17,6 @@
path = "${config.xdg.dataHome}/zsh/history"; path = "${config.xdg.dataHome}/zsh/history";
}; };
}; };
programs.keychain.enableZshIntegration = true;
programs.starship.enableZshIntegration = true;
} }

View file

@ -1,6 +1,6 @@
{ ... }: { pkgs, ... }:
{ {
fonts.fontconfig.enable = true; home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
programs.foot = { programs.foot = {
enable = true; enable = true;
settings = { settings = {
@ -9,9 +9,6 @@
font = "FiraCode Nerd Font:size=12"; font = "FiraCode Nerd Font:size=12";
dpi-aware = "yes"; dpi-aware = "yes";
}; };
mouse = {
hide-when-typing = true;
};
colors = { colors = {
# Catppuccin Macchiato # Catppuccin Macchiato
foreground = "cad3f5"; # Text foreground = "cad3f5"; # Text

View file

@ -1,11 +1,8 @@
{ ... }: { pkgs, ... }:
{ {
imports = [ ../env/fonts ]; home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
programs.urxvt = { programs.urxvt = {
enable = true; enable = true;
fonts = [ fonts = [ "xft:FiraCode Nerd Font Mono:pixelsize=16" ];
"xft:FiraCode Nerd Font Mono:pixelsize=16"
"xft:Iosevka Nerd Font Mono:pixelsize=16"
];
}; };
} }