noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-03-06 19:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

more changes

Browse Source
This commit is contained in:
Noah Masur 2025-03-04 07:50:47 -05:00
parent eed097f270
commit 05e3996eb3
No known key found for this signature in database
13 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -282,6 +282,7 @@
import nixpkgs { import nixpkgs {
inherit system overlays; inherit system overlays;
config.permittedInsecurePackages = [ "litestream-0.3.13" ]; config.permittedInsecurePackages = [ "litestream-0.3.13" ];
config.allowUnfree = true;
} }
); );
# stablePkgsBySystem = forAllSystems (system: import nixpkgs { inherit system overlays; }); # stablePkgsBySystem = forAllSystems (system: import nixpkgs { inherit system overlays; });
@ -304,6 +305,11 @@
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.wsl.nixosModules.wsl inputs.wsl.nixosModules.wsl
./platforms/nixos ./platforms/nixos
{
home-manager.extraSpecialArgs = {
hostnames = globals.hostnames;
};
}
]; ];
specialArgs = { specialArgs = {
hostnames = globals.hostnames; hostnames = globals.hostnames;

7
hosts-by-platform/x86_64-linux/tempest/default.nix
View File

@ -8,13 +8,6 @@ rec {
nmasur.settings = { nmasur.settings = {
username = "noah"; username = "noah";
fullName = "Noah Masur"; fullName = "Noah Masur";
# hostnames =
# let
# baseName = "masu.rs";
# in
# {
# prometheus = "prom.${baseName}";
# };
}; };
nmasur.profiles = { nmasur.profiles = {

8
overlays/bypass-paywalls-clean.nix
View File

@ -10,7 +10,13 @@ inputs: _final: prev: {
prev.stdenv.mkDerivation rec { prev.stdenv.mkDerivation rec {
pname = "bypass-paywalls-clean"; pname = "bypass-paywalls-clean";
version = "3.6.6.0"; 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; preferLocalBuild = true;
allowSubstitutes = true; allowSubstitutes = true;
buildCommand = '' buildCommand = ''

24
pkgs/misc/bypass-paywalls-clean/package.nix Normal file
View 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"
'';
}

14
platforms/home-manager/modules/nixpkgs.nix
View File

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

2
platforms/home-manager/modules/nmasur/presets/programs/discord.nix
View File

@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
allowUnfreePackages = [ "discord" ]; allowUnfreePackages = [ "discord" ];
home.packages = [ pkgs.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"; BACKGROUND_COLOR = "#202225";
IS_MAXIMIZED = false; IS_MAXIMIZED = false;
IS_MINIMIZED = false; IS_MINIMIZED = false;

2
platforms/home-manager/modules/nmasur/presets/programs/firefox.nix
View File

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

4
platforms/home-manager/modules/nmasur/presets/services/mbsync.nix
View File

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

1
platforms/home-manager/modules/nmasur/presets/services/volnoti.nix
View File

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

1
platforms/home-manager/modules/nmasur/profiles/linux-gui.nix
View File

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

4
platforms/home-manager/modules/nmasur/settings.nix
View File

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

14
platforms/nixos/modules/nixpkgs.nix
View File

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

1
platforms/nixos/modules/nmasur/profiles/home.nix
View File

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