more changes

This commit is contained in:
Noah Masur
2025-03-04 07:50:47 -05:00
parent eed097f270
commit 05e3996eb3
13 changed files with 60 additions and 28 deletions

View File

@ -16,13 +16,13 @@
config = {
# Allow specified unfree packages (identified elsewhere)
# Retrieves package object based on string name
nixpkgs.config.allowUnfreePredicate =
pkg: builtins.elem (lib.getName pkg) config.allowUnfreePackages;
# Allow specified insecure packages (identified elsewhere)
nixpkgs.config.permittedInsecurePackages = config.allowInsecurePackages;
# # Allow specified unfree packages (identified elsewhere)
# # Retrieves package object based on string name
# nixpkgs.config.allowUnfreePredicate =
# pkg: builtins.elem (lib.getName pkg) config.allowUnfreePackages;
#
# # Allow specified insecure packages (identified elsewhere)
# nixpkgs.config.permittedInsecurePackages = config.allowInsecurePackages;
};

View File

@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable {
allowUnfreePackages = [ "discord" ];
home.packages = [ pkgs.discord ];
xdg.configFile."discord/settings.json".text = pkgs.formats.json {
xdg.configFile."discord/settings.json".text = builtins.toJSON {
BACKGROUND_COLOR = "#202225";
IS_MAXIMIZED = false;
IS_MINIMIZED = false;

View File

@ -30,7 +30,7 @@ in
isDefault = true;
# https://nur.nix-community.org/repos/rycee/
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
bypass-paywalls-clean
pkgs.nmasur.bypass-paywalls-clean
darkreader
don-t-fuck-with-paste
export-cookies-txt

View File

@ -25,12 +25,12 @@ in
imapHost = lib.mkOption {
type = lib.types.str;
description = "Server host for IMAP (reading mail).";
default = config.hostnames.imap;
default = hostnames.imap;
};
smtpHost = lib.mkOption {
type = lib.types.str;
description = "Server host for SMTP (sending mail).";
default = config.hostnames.smtp;
default = hostnames.smtp;
};
};

View File

@ -43,6 +43,7 @@ in
# Graphical volume notifications
services.volnoti.enable = true;
services.volnoti.package = pkgs.nmasur.volnoti;
xsession.windowManager.i3.config = {

View File

@ -16,6 +16,7 @@ in
nmasur.presets = {
gtk.enable = lib.mkDefault true;
fonts.enable = lib.mkDefault true;
programs = {
_1password.enable = lib.mkDefault true;
aerc.enable = lib.mkDefault true;

View File

@ -1,4 +1,4 @@
{ lib, ... }:
{ lib, hostnames, ... }:
{
options.nmasur.settings = {
@ -13,7 +13,7 @@
hostnames = lib.mkOption {
type = lib.types.attrsOf lib.types.str;
description = "Map of service names to FQDNs";
default = { };
default = hostnames;
};
};
}

View File

@ -16,13 +16,13 @@
config = {
# Allow specified unfree packages (identified elsewhere)
# Retrieves package object based on string name
nixpkgs.config.allowUnfreePredicate =
pkg: builtins.elem (lib.getName pkg) config.allowUnfreePackages;
# Allow specified insecure packages (identified elsewhere)
nixpkgs.config.permittedInsecurePackages = config.allowInsecurePackages;
# # Allow specified unfree packages (identified elsewhere)
# # Retrieves package object based on string name
# nixpkgs.config.allowUnfreePredicate =
# pkg: builtins.elem (lib.getName pkg) config.allowUnfreePackages;
#
# # Allow specified insecure packages (identified elsewhere)
# nixpkgs.config.permittedInsecurePackages = config.allowInsecurePackages;
};

View File

@ -17,6 +17,7 @@ in
config = lib.mkIf cfg.enable {
nmasur.presets.services = {
grub.enable = lib.mkDefault true;
# Configure physical power buttons
logind.enable = lib.mkDefault true;
};