ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more changes to the x1 system config & added font home-manager module credit to misterio77

Browse source
This commit is contained in:
ooks-io 2023-07-30 23:10:36 +12:00
parent 04ec7debc9
commit cd8b4270f4
6 changed files with 63 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/ooks/modules/feature/desktop/common/fonts.nix
View file

@ -2,7 +2,7 @@
fontProfiles = {
enable = true;
monospace = {
family = "JetBrains Nerd Font";
family = "JetBrainsMono Nerd Font";
package = pkgs.nerdfonts.override { fonts = [ "JetBrains" ]; };
};
regular = {

2
home/ooks/modules/feature/desktop/common/gtk.nix
View file

@ -15,7 +15,7 @@ rec {
package = gtkThemeFromScheme { scheme = config.colorscheme; };
};
iconTheme = {
name = "Papirus";
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
};
};

32
modules/home-manager/fonts.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib, config, ... }:
let
mkFontOption = kind: {
family = lib.mkOption {
type = lib.types.str;
default = null;
description = "Family name for ${kind} font profile";
example = "Fira Code";
};
package = lib.mkOption {
type = lib.types.package;
default = null;
description = "Package for ${kind} font profile";
example = "pkgs.fira-code";
};
};
cfg = config.fontProfiles;
in
{
options.fontProfiles = {
enable = lib.mkEnableOption "Whether to enable font profiles";
monospace = mkFontOption "monospace";
regular = mkFontOption "regular";
};
config = lib.mkIf cfg.enable {
fonts.fontconfig.enable = true;
home.packages = [ cfg.monospace.package cfg.regular.package ];
};
}

1
system/common/global/systemdboot.nix
View file

@ -2,6 +2,7 @@
boot.loader = {
systemd-boot = {
enable = true;
consoleMode = "max";
};
efi.canTouchEfiVariables = true;
};

6
system/common/opt/bluetooth.nix Normal file
View file

@ -0,0 +1,6 @@
{ config, lib, pkgs, ... }:
{
hardware.bluetooth.enable = true;
services.blueman.enable = true;
}

112
system/ooksx1/ooksx1.nix
View file

@ -2,7 +2,7 @@
{ config, pkgs, ... }:
{ config, inputs, pkgs, ... }:
# Imports
# -------------------------------------------------------------------------------------------------
@ -10,94 +10,38 @@
{
imports = [
inputs.hardware.nixosModules.common-pc-ssd
inputs.hardware.nixosModules.common-cpu-intel
inputs.hardware.nixosModules.common-gpu-intel
./hardware-configuration.nix
../common/user/ooks
../common/global/
../common/opt/bluetooth.nix
];
# Bootloader
# -------------------------------------------------------------------------------------------------
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Nix Settings
# -------------------------------------------------------------------------------------------------
nix = {
settings = {
auto-optimise-store = true;
experimental-features = "nix-command flakes";
};
# Garbage Collection
# -------------------------------------------------------------------------------------------------
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 2d";
};
};
# System Architecture
# -------------------------------------------------------------------------------------------------
nixpkgs.system = "x86_64-linux";
# Hostname and networking
# -------------------------------------------------------------------------------------------------
networking = {
hostName = "ooksthink";
hostName = "ooksx1";
networkmanager.enable = true;
};
# X Server
# -------------------------------------------------------------------------------------------------
services.xserver = {
enable = true;
displayManager = {
defaultSession = null;
startx.enable = true;
};
# displayManager.gdm = {
# enable = true;
# wayland = true;
# };
};
# X11 Keymap
# -------------------------------------------------------------------------------------------------
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e,caps:escape";
# Printing
# -------------------------------------------------------------------------------------------------
services.printing.enable = true;
# Sound
# -------------------------------------------------------------------------------------------------
# Kernel
# ------------------------------------------------------------------------------------------------
sound.enable = false;
hardware.pulseaudio.enable = false;
boot = {
kernelPackages = pkgs.linuxKernel.packages.linux_zen;
};
# Touchpad
# -------------------------------------------------------------------------------------------------
# services.xserver.libinput.enable = true;
# Laptop Programs
# -------------------------------------------------------------------------------------------------
@ -112,32 +56,26 @@
# XDG Portal
# ------------------------------------------------------------------------------------------------
xdg.portal = {
enable = true;
wlr.enable = true;
};
xdg.portal = {
enable = true;
wlr.enable = true;
};
# Fonts
# gnupg
# -------------------------------------------------------------------------------------------------
fonts.fonts = with pkgs; [
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];
# Programs
# -------------------------------------------------------------------------------------------------
programs.mtr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
};
# Services
# -------------------------------------------------------------------------------------------------
services = {
};
logind = {
lidSwitch = "suspend";
};
dbus = {
enable = true;
packages = [ pkgs.gcr ];
@ -152,11 +90,10 @@ fonts.fonts = with pkgs; [
charger = {
governor = "performance";
turbo = "auto";
};
};
};
};
};
};
systemd = {
user.services.polkit-gnome-authentication-agent-1 = {
@ -170,14 +107,9 @@ fonts.fonts = with pkgs; [
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
};
# D-Bus
# -------------------------------------------------------------------------------------------------
services.dbus.enable = true;
};
# Firewall
# -------------------------------------------------------------------------------------------------