Simplify package definitions

Move included nixpkg definitions directly into collection
files, reserve imports for home-manager package configurations.
Move few remaining gui sections up a level
This commit is contained in:
Evie Litherland-Smith 2023-04-28 17:01:53 +01:00
parent 8ed8fb15d8
commit 836863040c
44 changed files with 111 additions and 190 deletions

View file

@ -0,0 +1,4 @@
{ ... }:
{
programs.librewolf.enable = true;
}

View file

@ -1,9 +1,8 @@
{ ... }:
{ pkgs, ... }:
{
imports = [
../../desktop
../../browser/librewolf.nix
../../desktop/wayland/hyprland.nix
../../env/fonts/firacode.nix
../../env/shell/bash.nix
../../env/shell/fish.nix
@ -13,20 +12,24 @@
../../env/nixpkgs.nix
../../env/ssh.nix
../../env/starship.nix
../../git/personal
../../gui/browser/chromium-wayland.nix
../../gui/dev/neovide.nix
../../gui/documents/zotero.nix
../../gui/gaming/steam.nix
../../gui/messaging/discord.nix
../../gui/messaging/element.nix
../../gui/messaging/signal.nix
../../gui/security
../../gui/terminal/foot.nix
../../gui/terminal/wezterm.nix
../../tui
../../git/personal.nix
../../terminal/foot.nix
../../terminal/wezterm.nix
../../tui/neovim.nix
../../tui/lazygit.nix
];
home.packages = with pkgs; [
bitwarden
file
marktext
mesa
neovide
nomachine-client
otpclient
silver-searcher
signal-desktop
steam
steam-run
zotero
];
}

View file

@ -1,9 +1,8 @@
{ ... }:
{ pkgs, ... }:
{
imports = [
../../desktop
../../browser/librewolf.nix
../../desktop/wayland/hyprland.nix
../../env/fonts/firacode.nix
../../env/shell/bash.nix
../../env/shell/fish.nix
@ -13,21 +12,24 @@
../../env/nixpkgs.nix
../../env/ssh.nix
../../env/starship.nix
../../git/work
../../gui/browser/chromium-wayland.nix
../../gui/dev/neovide.nix
../../gui/documents/libreoffice.nix
../../gui/documents/marktext.nix
../../gui/documents/zotero.nix
../../gui/messaging/signal.nix
../../gui/messaging/zoom.nix
../../gui/remote/nomachine.nix
../../gui/security
../../gui/terminal/wezterm.nix
../../gui/terminal/foot.nix
../../tui
../../git/work.nix
../../terminal/wezterm.nix
../../terminal/foot.nix
../../tui/neovim.nix
../../tui/lazygit.nix
];
home.packages = with pkgs; [
bitwarden
file
libreoffice-fresh
marktext
neovide
nomachine-client
otpclient
silver-searcher
signal-desktop
teams
zoom-us
zotero
];
}

View file

@ -1,8 +0,0 @@
{ ... }:
{
imports = [
./common
./wayland
./xorg
];
}

View file

@ -1,44 +1,8 @@
{ pkgs, ... }:
{
imports = [
../common/gtk.nix
../common/dunst.nix
../common/rofi.nix
./waybar.nix
];
home.packages = with pkgs; [
pipewire
wireplumber
wl-clipboard
swayimg
hyprpaper
dolphin
jq
socat
];
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
settings = {
screenshots = true;
clock = true;
indicator = true;
indicator-radius = 100;
indicator-thickness = 7;
effect-blur = "7x5";
effect-vignette = "0.5:0.5";
ring-color = "bb00cc";
key-hl-color = "00000000";
line-color = "00000088";
separator-color = "00000000";
grace = 2;
fade-in = 0.2;
};
};
programs.eww = {
enable = true;
package = pkgs.eww-wayland;
configDir = ./config/eww;
};
programs.rofi.package = pkgs.rofi-wayland;
}

View file

@ -8,8 +8,9 @@
"all-outputs": true,
"format": "{icon}",
"format-icons": {
"1": "",
"2": "󰊯",
"1:Web": "",
"2:Term": "",
"3:Code": ""
"3": "",
"4": "",
"5": "",
@ -19,6 +20,15 @@
"9": "",
"urgent": "",
"focused": "",
"default": "",
"1:web": "",
"2:code": "",
"3:term": "",
"4:work": "",
"5:music": "",
"6:docs": "",
"urgent": "",
"focused": "",
"default": ""
}
},

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ wl-clipboard ];
}

View file

@ -0,0 +1,12 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
jq
socat
];
programs.eww = {
enable = true;
package = pkgs.eww-wayland;
configDir = ./config/eww;
};
}

View file

@ -1,4 +1,4 @@
{ ... }:
{ pkgs, ... }:
let
flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
@ -10,13 +10,26 @@ in
imports = [
hyprland.homeManagerModules.default
./common.nix
./swaylock.nix
./eww.nix
./waybar.nix
../common/gtk.nix
../common/dunst.nix
../common/rofi.nix
../xorg/xresources.nix
];
home.packages = with pkgs; [
swayimg
hyprpaper
dolphin
];
programs.rofi.package = pkgs.rofi-wayland;
xdg.configFile."hypr" = {
source = ./config/hypr;
# recursive = true;
# text = "# test";
};
xsession.enable = true;
wayland.windowManager.hyprland = {
enable = true;
xwayland = {

View file

@ -0,0 +1,22 @@
{ pkgs, ... }:
{
programs.swaylock = {
enable = true;
package = pkgs.swaylock-effects;
settings = {
screenshots = true;
clock = true;
indicator = true;
indicator-radius = 100;
indicator-thickness = 7;
effect-blur = "7x5";
effect-vignette = "0.5:0.5";
ring-color = "bb00cc";
key-hl-color = "00000000";
line-color = "00000088";
separator-color = "00000000";
grace = 2;
fade-in = 0.2;
};
};
}

View file

@ -0,0 +1,2 @@
{ ... }:
{ xsession.enable = true; }

View file

@ -1,5 +0,0 @@
{ ... }:
{
imports = [ ./xresources.nix ];
xsession.enable = true;
}

View file

@ -1,7 +0,0 @@
{ ... }:
{
imports = [
./firacode.nix
./iosevka.nix
];
}

View file

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

View file

@ -1,10 +1,5 @@
{ ... }:
{
imports = [
../env/bat.nix
../env/ssh.nix
../env/shell
];
programs.git = {
enable = true;
userName = "Evie Litherland-Smith";

View file

@ -1,5 +1,5 @@
{ ... }:
{
imports = [ ../default.nix ];
imports = [ ./common.nix ];
programs.git.userEmail = "evie@xenia.me.uk";
}

View file

@ -1,5 +1,5 @@
{ ... }:
{
imports = [ ../default.nix ];
imports = [ ./common.nix ];
programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
}

View file

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

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ libreoffice-fresh ];
}

View file

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

View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
#services.nextcloud-client = {
# enable = true;
# startInBackground = true;
#};
home.packages = with pkgs; [ zotero ];
}

View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
mesa
steam
steam-run
];
}

View file

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

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ element-desktop ];
}

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ signal-desktop ];
}

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ zoom-us ];
}

View file

@ -1,6 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
nomachine-client
];
}

View file

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

View file

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ bitwarden otpclient ];
}

View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
file
silver-searcher
lynx
];
}

View file

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