minor cleanup :PPP

This commit is contained in:
jacekpoz 2024-08-06 17:52:50 +02:00
parent b3d426571b
commit 94ead17371
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8
5 changed files with 7 additions and 115 deletions

View file

@ -2,109 +2,7 @@
config,
pkgs,
...
<<<<<<< HEAD
}: {
nixpkgs.config.allowUnfree = true;
||||||| parent of fa20c0c (replace all `myOptions` with `poz`)
}: let
username = config.myOptions.other.system.username;
in {
nixpkgs = {
config.allowUnfree = true;
overlays = [
inputs.nur.overlay
inputs.neovim-nightly-overlay.overlay
];
};
boot = {
loader = {
systemd-boot = {
enable = true;
memtest86.enable = true;
};
};
kernelPackages = pkgs.linuxPackages_zen;
};
documentation = {
enable = true;
dev.enable = true;
doc.enable = true;
info.enable = true;
man = {
enable = true;
generateCaches = true;
man-db.enable = false;
mandoc.enable = true;
};
nixos = {
includeAllModules = true;
};
};
networking = {
networkmanager.enable = true;
firewall.checkReversePath = "loose";
};
# don't wait for network to boot faster
# https://old.reddit.com/r/NixOS/comments/vdz86j/how_to_remove_boot_dependency_on_network_for_a
systemd = {
targets.network-online.wantedBy = lib.mkForce []; # default is [ "multi-user.target" ]
services.NetworkManager-wait-online.wantedBy = lib.mkForce []; # default is [ "network-online.target" ]
};
=======
}: let
username = config.poz.other.system.username;
in {
nixpkgs = {
config.allowUnfree = true;
overlays = [
inputs.nur.overlay
inputs.neovim-nightly-overlay.overlay
];
};
boot = {
loader = {
systemd-boot = {
enable = true;
memtest86.enable = true;
};
};
kernelPackages = pkgs.linuxPackages_zen;
};
documentation = {
enable = true;
dev.enable = true;
doc.enable = true;
info.enable = true;
man = {
enable = true;
generateCaches = true;
man-db.enable = false;
mandoc.enable = true;
};
nixos = {
includeAllModules = true;
};
};
networking = {
networkmanager.enable = true;
firewall.checkReversePath = "loose";
};
# don't wait for network to boot faster
# https://old.reddit.com/r/NixOS/comments/vdz86j/how_to_remove_boot_dependency_on_network_for_a
systemd = {
targets.network-online.wantedBy = lib.mkForce []; # default is [ "multi-user.target" ]
services.NetworkManager-wait-online.wantedBy = lib.mkForce []; # default is [ "network-online.target" ]
};
>>>>>>> fa20c0c (replace all `myOptions` with `poz`)
systemd.oomd = {
enable = true;
enableUserServices = true;
@ -141,8 +39,7 @@ in {
'';
};
<<<<<<< HEAD
myOptions = {
poz = {
other.home-manager = {
enable = true;
enableDirenv = true;
@ -150,7 +47,7 @@ in {
programs = {
agenix.enable = true;
nh = let
inherit (config.myOptions.other.system) username;
inherit (config.poz.other.system) username;
home = config.home-manager.users.${username}.home.homeDirectory;
in {
enable = true;
@ -187,11 +84,6 @@ in {
];
};
};
||||||| parent of fa20c0c (replace all `myOptions` with `poz`)
myOptions = {
=======
poz = {
>>>>>>> fa20c0c (replace all `myOptions` with `poz`)
services = {
dunst.enable = true;
greetd = {

View file

@ -2,7 +2,7 @@
pkgs,
...
}: {
myOptions.programs.firefox = {
poz.programs.firefox = {
enable = true;
defaultSearchEngine = "NotASearx";
searchEngines = {

View file

@ -4,7 +4,7 @@
pkgs,
...
}: let
inherit (config.myOptions.other.system) username;
inherit (config.poz.other.system) username;
in {
home-manager.users.${username} = {
home.packages = let

View file

@ -1,5 +1,5 @@
_: {
myOptions.other = {
{
poz.other = {
system = {
hostname = "niks";
username = "jacek";

View file

@ -2,7 +2,7 @@
pkgs,
...
}: {
myOptions.themes = {
poz.themes = {
cursor = {
enable = true;
package = pkgs.bibata-cursors;