pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move common package options into common.nix files, all files include common, all common include parent directory common. default.nix now includes everything in respective directories

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-04-12 13:18:03 +01:00
parent 3612ca49df
commit f370b79769
27 changed files with 159 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/home-manager/northstar-xenia.nix
View file

@ -1,8 +1,12 @@
{ ... }: {
imports = [
./common.nix
./packages
./packages/gui
./env/sway.nix
./packages/env
./packages/tui
./packages/gui/browser.nix
./packages/gui/dunst.nix
./packages/gui/foot.nix
./packages/gui/kitty.nix
];
# Home Manager needs a bit of information about you and the
# paths it should manage.

52
nixos/home-manager/packages/common.nix Normal file
View file

@ -0,0 +1,52 @@
{ ... }:
{
imports = [ ../common.nix ];
programs.ssh = {
enable = true;
includes = [ "config.d/*" ];
forwardAgent = true;
serverAliveInterval = 15;
serverAliveCountMax = 3;
controlMaster = "auto";
controlPersist = "5s";
};
programs.keychain = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
enableXsessionIntegration = true;
extraFlags = [
"--quiet"
"--ignore-missing"
];
keys = [
"id_rsa"
"id_ed25519"
];
};
programs.git = {
enable = true;
userName = "Evie Litherland-Smith";
delta.enable = true;
extraConfig = {
pull = {
rebase = false;
};
};
};
programs.starship = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
};
programs.direnv = {
enable = true;
#enableBashIntegration = true;
#enableZshIntegration = true;
#enableFishIntegration = true;
};
}

49
nixos/home-manager/packages/default.nix
View file

@ -1,55 +1,8 @@
{ ... }:
{
imports = [
./env
./gui
./tui
];
programs.ssh = {
enable = true;
includes = [ "config.d/*" ];
forwardAgent = true;
serverAliveInterval = 15;
serverAliveCountMax = 3;
controlMaster = "auto";
controlPersist = "5s";
};
programs.keychain = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
enableXsessionIntegration = true;
extraFlags = [
"--quiet"
"--ignore-missing"
];
keys = [
"id_rsa"
"id_ed25519"
];
};
programs.git = {
enable = true;
userName = "Evie Litherland-Smith";
delta.enable = true;
extraConfig = {
pull = {
rebase = false;
};
};
};
programs.starship = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
enableFishIntegration = true;
settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
};
programs.direnv = {
enable = true;
#enableBashIntegration = true;
#enableZshIntegration = true;
#enableFishIntegration = true;
};
}

1
nixos/home-manager/packages/env/bash.nix vendored
View file

@ -1,5 +1,6 @@
{ ... }:
{
imports = [ ./common.nix ];
programs.bash.enable = true;
}

4
nixos/home-manager/packages/env/common.nix vendored Normal file
View file

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ../common.nix ];
}

1
nixos/home-manager/packages/env/fish.nix vendored
View file

@ -1,6 +1,7 @@
{ ... }:
{
imports = [ ./common.nix ];
programs.fish = {
enable = true;
shellAbbrs = {

5
nixos/home-manager/packages/env/qemu.nix vendored
View file

@ -1,7 +1,6 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
qemu
];
imports = [ ./common.nix ];
home.packages = with pkgs; [ qemu ];
}

1
nixos/home-manager/packages/env/zsh.nix vendored
View file

@ -1,6 +1,7 @@
{ config, ... }:
{
imports = [ ./common.nix ];
programs.zsh = {
enable = true;
shellAliases = {

5
nixos/home-manager/packages/gui/browser.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
home.packages = with pkgs; [ firefox ];
}

2
nixos/home-manager/packages/gui/cloud.nix
View file

@ -1,11 +1,13 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
#services.nextcloud-client = {
# enable = true;
# startInBackground = true;
#};
home.packages = with pkgs; [
bitwarden
zotero
];
}

4
nixos/home-manager/packages/gui/common.nix Normal file
View file

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ../common.nix ];
}

11
nixos/home-manager/packages/gui/default.nix
View file

@ -2,12 +2,15 @@
{
imports = [
./browser.nix
./cloud.nix
./dunst.nix
./foot.nix
./gaming.nix
./kitty.nix
./foot.nix
];
home.packages = with pkgs; [
firefox
# bitwarden
./messaging.nix
./nomachine.nix
./ukaea.nix
];
}

1
nixos/home-manager/packages/gui/dunst.nix
View file

@ -1,5 +1,6 @@
{ ... }:
{
imports = [ ./common.nix ];
services.dunst = {
enable = true;
settings = {

1
nixos/home-manager/packages/gui/foot.nix
View file

@ -1,5 +1,6 @@
{ ... }:
{
imports = [ ./common.nix ];
fonts.fontconfig.enable = true;
programs.foot = {
enable = true;

1
nixos/home-manager/packages/gui/gaming.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
home.packages = with pkgs; [
mesa
steam

1
nixos/home-manager/packages/gui/kitty.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
programs.kitty = {
enable = true;
font = {

1
nixos/home-manager/packages/gui/messaging.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
home.packages = with pkgs; [
signal-desktop
element-desktop

1
nixos/home-manager/packages/gui/nomachine.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }:
{
imports = [ ./common.nix ];
home.packages = with pkgs; [
nomachine-client
];

1
nixos/home-manager/packages/gui/ukaea.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
home.packages = with pkgs; [
teams
zoom-us

7
nixos/home-manager/packages/gui/zotero.nix
View file

@ -1,7 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
zotero
];
}

33
nixos/home-manager/packages/tui/common.nix Normal file
View file

@ -0,0 +1,33 @@
{ pkgs, ... }:
{
imports = [ ../common.nix ];
programs.neovim.defaultEditor = true;
programs.bat = {
enable = true;
config = {
theme = "Catppuccin-macchiato";
};
themes = {
Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
{
owner = "catppuccin";
repo = "bat";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
} + "/Catppuccin-macchiato.tmTheme");
};
};
home.packages = with pkgs; [
fira-code
iosevka
(nerdfonts.override {
fonts = [
"FiraCode"
"Iosevka"
];
})
file
silver-searcher
];
}

35
nixos/home-manager/packages/tui/default.nix
View file

@ -1,37 +1,8 @@
{ pkgs, ... }:
{ ... }:
{
imports = [
./tmux.nix
./neovim.nix
./lazygit.nix
];
programs.neovim.defaultEditor = true;
programs.bat = {
enable = true;
config = {
theme = "Catppuccin-macchiato";
};
themes = {
Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
{
owner = "catppuccin";
repo = "bat";
rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
} + "/Catppuccin-macchiato.tmTheme");
};
};
home.packages = with pkgs; [
fira-code
iosevka
(nerdfonts.override {
fonts = [
"FiraCode"
"Iosevka"
];
})
file
silver-searcher
./neovim.nix
./tmux.nix
];
}

1
nixos/home-manager/packages/tui/lazygit.nix
View file

@ -1,6 +1,7 @@
{ ... }:
{
imports = [ ./common.nix ];
programs.lazygit = {
enable = true;
settings = import ./config/lazygit.nix;

1
nixos/home-manager/packages/tui/neovim.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
programs.neovim = {
enable = true;
defaultEditor = true;

14
nixos/home-manager/packages/tui/tmux.nix
View file

@ -1,15 +1,17 @@
{ pkgs, ... }:
{
imports = [ ./common.nix ];
programs.tmux = {
enable = true;
clock24 = true;
extraConfig = builtins.readFile (./config/tmux.conf) + "\n" + builtins.readFile (
pkgs.fetchFromGitHub {
owner = "catppuccin";
repo = "tmux";
rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
} + "/catppuccin-macchiato.tmuxtheme"
pkgs.fetchFromGitHub
{
owner = "catppuccin";
repo = "tmux";
rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
} + "/catppuccin-macchiato.tmuxtheme"
);
};
}

15
nixos/home-manager/ukaea-elitherl.nix
View file

@ -1,12 +1,17 @@
{ ... }: {
imports = [
./common.nix
./env
./env/hyprland.nix
./packages
./packages/gui
./packages/gui/ukaea.nix
./env/sway.nix
./packages/env
./packages/tui
./packages/gui/browser.nix
./packages/gui/cloud.nix
./packages/gui/dunst.nix
./packages/gui/foot.nix
./packages/gui/kitty.nix
./packages/gui/messaging.nix
./packages/gui/nomachine.nix
./packages/gui/ukaea.nix
];
# Home Manager needs a bit of information about you and the
# paths it should manage.

13
nixos/home-manager/vanguard-xenia.nix
View file

@ -1,10 +1,15 @@
{ pkgs, ... }: {
imports = [
./common.nix
./env
./packages
./packages/gui
./env/hyprland.nix
./packages/env
./packages/tui
./packages/gui/browser.nix
./packages/gui/cloud.nix
./packages/gui/dunst.nix
./packages/gui/foot.nix
./packages/gui/gaming.nix
./packages/gui/kitty.nix
./packages/gui/messaging.nix
./packages/gui/nomachine.nix
];
# Home Manager needs a bit of information about you and the