mirror of
https://github.com/nmasur/dotfiles
synced 2025-03-06 14:02:04 +00:00
more changes
This commit is contained in:
parent
eed097f270
commit
05e3996eb3
@ -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;
|
||||
|
@ -8,13 +8,6 @@ rec {
|
||||
nmasur.settings = {
|
||||
username = "noah";
|
||||
fullName = "Noah Masur";
|
||||
# hostnames =
|
||||
# let
|
||||
# baseName = "masu.rs";
|
||||
# in
|
||||
# {
|
||||
# prometheus = "prom.${baseName}";
|
||||
# };
|
||||
};
|
||||
|
||||
nmasur.profiles = {
|
||||
|
@ -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 = ''
|
||||
|
24
pkgs/misc/bypass-paywalls-clean/package.nix
Normal file
24
pkgs/misc/bypass-paywalls-clean/package.nix
Normal file
@ -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"
|
||||
'';
|
||||
}
|
@ -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;
|
||||
|
||||
};
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -43,6 +43,7 @@ in
|
||||
|
||||
# Graphical volume notifications
|
||||
services.volnoti.enable = true;
|
||||
services.volnoti.package = pkgs.nmasur.volnoti;
|
||||
|
||||
xsession.windowManager.i3.config = {
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
};
|
||||
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user