From 05e3996eb3013e3886d0eacc9b3b1bc121640954 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Tue, 4 Mar 2025 07:50:47 -0500 Subject: [PATCH] more changes --- flake.nix | 6 +++++ .../x86_64-linux/tempest/default.nix | 7 ------ overlays/bypass-paywalls-clean.nix | 8 ++++++- pkgs/misc/bypass-paywalls-clean/package.nix | 24 +++++++++++++++++++ platforms/home-manager/modules/nixpkgs.nix | 14 +++++------ .../nmasur/presets/programs/discord.nix | 2 +- .../nmasur/presets/programs/firefox.nix | 2 +- .../nmasur/presets/services/mbsync.nix | 4 ++-- .../nmasur/presets/services/volnoti.nix | 1 + .../modules/nmasur/profiles/linux-gui.nix | 1 + .../home-manager/modules/nmasur/settings.nix | 4 ++-- platforms/nixos/modules/nixpkgs.nix | 14 +++++------ .../nixos/modules/nmasur/profiles/home.nix | 1 + 13 files changed, 60 insertions(+), 28 deletions(-) create mode 100644 pkgs/misc/bypass-paywalls-clean/package.nix diff --git a/flake.nix b/flake.nix index 2837fc4..7301f85 100644 --- a/flake.nix +++ b/flake.nix @@ -282,6 +282,7 @@ import nixpkgs { inherit system overlays; config.permittedInsecurePackages = [ "litestream-0.3.13" ]; + config.allowUnfree = true; } ); # stablePkgsBySystem = forAllSystems (system: import nixpkgs { inherit system overlays; }); @@ -304,6 +305,11 @@ inputs.disko.nixosModules.disko inputs.wsl.nixosModules.wsl ./platforms/nixos + { + home-manager.extraSpecialArgs = { + hostnames = globals.hostnames; + }; + } ]; specialArgs = { hostnames = globals.hostnames; diff --git a/hosts-by-platform/x86_64-linux/tempest/default.nix b/hosts-by-platform/x86_64-linux/tempest/default.nix index 9120294..15f4ca6 100644 --- a/hosts-by-platform/x86_64-linux/tempest/default.nix +++ b/hosts-by-platform/x86_64-linux/tempest/default.nix @@ -8,13 +8,6 @@ rec { nmasur.settings = { username = "noah"; fullName = "Noah Masur"; - # hostnames = - # let - # baseName = "masu.rs"; - # in - # { - # prometheus = "prom.${baseName}"; - # }; }; nmasur.profiles = { diff --git a/overlays/bypass-paywalls-clean.nix b/overlays/bypass-paywalls-clean.nix index 1a6f2f1..ff29900 100644 --- a/overlays/bypass-paywalls-clean.nix +++ b/overlays/bypass-paywalls-clean.nix @@ -10,7 +10,13 @@ inputs: _final: prev: { prev.stdenv.mkDerivation rec { pname = "bypass-paywalls-clean"; version = "3.6.6.0"; - src = inputs.bypass-paywalls-clean; + src = builtins.fetchGit { + url = "https://gitflic.ru/magnolia1234/bpc_uploads"; + # owner = "magnolia1234"; + # repo = "bpc_uploads"; + rev = "365832a498fa58cb124e74e3836edc182178c6de"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + }; preferLocalBuild = true; allowSubstitutes = true; buildCommand = '' diff --git a/pkgs/misc/bypass-paywalls-clean/package.nix b/pkgs/misc/bypass-paywalls-clean/package.nix new file mode 100644 index 0000000..7486a12 --- /dev/null +++ b/pkgs/misc/bypass-paywalls-clean/package.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: + +# Based on: +# https://git.sr.ht/~rycee/nur-expressions/tree/master/item/pkgs/firefox-addons/default.nix#L34 + +pkgs.stdenv.mkDerivation rec { + pname = "bypass-paywalls-clean"; + version = "4.0.5.3"; + src = builtins.fetchGit { + url = "https://gitflic.ru/magnolia1234/bpc_uploads"; + ref = "main"; + # owner = "magnolia1234"; + # repo = "bpc_uploads"; + rev = "365832a498fa58cb124e74e3836edc182178c6de"; + # sha256 = "0000000000000000000000000000000000000000000000000000"; + }; + preferLocalBuild = true; + allowSubstitutes = true; + buildCommand = '' + dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" + mkdir -p "$dst" + install -v -m644 "${src}" "$dst/magnolia@12.34.xpi" + ''; +} diff --git a/platforms/home-manager/modules/nixpkgs.nix b/platforms/home-manager/modules/nixpkgs.nix index fda668d..899577c 100644 --- a/platforms/home-manager/modules/nixpkgs.nix +++ b/platforms/home-manager/modules/nixpkgs.nix @@ -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; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/discord.nix b/platforms/home-manager/modules/nmasur/presets/programs/discord.nix index cacf40a..64e4b5e 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/discord.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/discord.nix @@ -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; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix index 4d8202a..ace644f 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix @@ -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 diff --git a/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix b/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix index 8913ad5..5020fa4 100644 --- a/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix +++ b/platforms/home-manager/modules/nmasur/presets/services/mbsync.nix @@ -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; }; }; diff --git a/platforms/home-manager/modules/nmasur/presets/services/volnoti.nix b/platforms/home-manager/modules/nmasur/presets/services/volnoti.nix index 19f07ed..11a519e 100644 --- a/platforms/home-manager/modules/nmasur/presets/services/volnoti.nix +++ b/platforms/home-manager/modules/nmasur/presets/services/volnoti.nix @@ -43,6 +43,7 @@ in # Graphical volume notifications services.volnoti.enable = true; + services.volnoti.package = pkgs.nmasur.volnoti; xsession.windowManager.i3.config = { diff --git a/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix b/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix index 8d74aa4..d2fc6a3 100644 --- a/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix +++ b/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix @@ -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; diff --git a/platforms/home-manager/modules/nmasur/settings.nix b/platforms/home-manager/modules/nmasur/settings.nix index 03ec2ec..cfe13da 100644 --- a/platforms/home-manager/modules/nmasur/settings.nix +++ b/platforms/home-manager/modules/nmasur/settings.nix @@ -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; }; }; } diff --git a/platforms/nixos/modules/nixpkgs.nix b/platforms/nixos/modules/nixpkgs.nix index fda668d..899577c 100644 --- a/platforms/nixos/modules/nixpkgs.nix +++ b/platforms/nixos/modules/nixpkgs.nix @@ -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; }; diff --git a/platforms/nixos/modules/nmasur/profiles/home.nix b/platforms/nixos/modules/nmasur/profiles/home.nix index 45983de..12daea4 100644 --- a/platforms/nixos/modules/nmasur/profiles/home.nix +++ b/platforms/nixos/modules/nmasur/profiles/home.nix @@ -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; };