nix: Reduce default size with options

This commit is contained in:
Geoffrey Frogeye 2023-11-21 21:01:56 +01:00
parent c7d5a229d7
commit 471966197a
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
11 changed files with 36 additions and 11 deletions

View file

@ -6,4 +6,5 @@
]; ];
networking.hostName = "curacao.geoffrey.frogeye.fr"; networking.hostName = "curacao.geoffrey.frogeye.fr";
frogeye.extra = true;
} }

View file

@ -0,0 +1,12 @@
{ ... }:
{
imports = [
./hm/loader.nix
];
home.username = "gnix";
home.homeDirectory = "/home/gnix";
frogeye.extra = true;
frogeye.desktop.nixGLIntel = true;
}

View file

@ -506,12 +506,13 @@
rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5"; rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5";
}) })
{ }; { };
nixGLIntelPrefix = "${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ";
wmPrefix = "${lib.optionalString config.frogeye.desktop.nixGLIntel nixGLIntelPrefix}";
in in
{ {
# TODO Configurable
source = pkgs.writeShellScript "xinitrc" '' source = pkgs.writeShellScript "xinitrc" ''
${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path} ${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path}
${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ${config.xsession.windowManager.command} ${wmPrefix}${config.xsession.windowManager.command}
''; '';
}; };
"rofimoji.rc" = { "rofimoji.rc" = {
@ -629,5 +630,4 @@
MPD_PORT = "${toString config.services.mpd.network.port}"; MPD_PORT = "${toString config.services.mpd.network.port}";
}; };
}; };
} }

View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, lib, config, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; lib.mkIf config.frogeye.extra [
# android tools # android tools
android-tools android-tools

View file

@ -1,6 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
../options.nix
./common.nix ./common.nix
./desktop.nix ./desktop.nix
./dev.nix ./dev.nix

View file

@ -23,15 +23,17 @@ in
terminal = 10; terminal = 10;
}; };
monospace = { monospace = {
package = pkgs.nerdfonts; package = pkgs.nerdfonts.override {
fonts = [ "DejaVuSansMono" ]; # Choose from https://github.com/NixOS/nixpkgs/blob/6ba3207643fd27ffa25a172911e3d6825814d155/pkgs/data/fonts/nerdfonts/shas.nix
};
name = "DejaVuSansM Nerd Font"; name = "DejaVuSansM Nerd Font";
}; };
}; };
targets = { targets = {
vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR) vim.enable = false; # FIXME Not compatible with nixvim for now (there's a MR)
i3.enable = false; # I prefer my own styles i3.enable = false; # I prefer my own styles
tmux.enable = false; # Using another theme tmux.enable = false; # Using another theme
}; };
}; };

7
config/nix/options.nix Normal file
View file

@ -0,0 +1,7 @@
{ lib, ... }:
{
options.frogeye = {
extra = lib.mkEnableOption "Big software";
desktop.nixGLIntel = lib.mkEnableOption "Enable nixGLIntel/nixVulkanIntel for windows manager";
};
}

View file

@ -5,7 +5,6 @@
services.xserver = { services.xserver = {
windowManager.i3.enable = true; windowManager.i3.enable = true;
desktopManager.gnome.enable = true;
displayManager.defaultSession = "none+i3"; displayManager.defaultSession = "none+i3";
# Keyboard layout # Keyboard layout

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
<home-manager/nixos> <home-manager/nixos>
@ -23,6 +23,7 @@
imports = [ imports = [
../hm/loader.nix ../hm/loader.nix
]; ];
frogeye = config.frogeye;
}; };
# Makes VMs able to re-run # Makes VMs able to re-run
useUserPackages = true; useUserPackages = true;

View file

@ -1,6 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
../options.nix
./battery.nix ./battery.nix
./geoffrey.nix ./geoffrey.nix
./common.nix ./common.nix

View file

@ -5,4 +5,5 @@
]; ];
networking.hostName = "nixos"; networking.hostName = "nixos";
frogeye.extra = true;
} }