Skip to content

Commit

Permalink
fixup! WIP: Add new configuration for rin
Browse files Browse the repository at this point in the history
  • Loading branch information
tlater-famedly authored and TLATER committed Mar 3, 2024
1 parent bf2ce47 commit dff2baa
Show file tree
Hide file tree
Showing 9 changed files with 258 additions and 107 deletions.
194 changes: 102 additions & 92 deletions home-config/config/applications/graphical/firefox.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
lib,
config,
pkgs,
flake-inputs,
Expand All @@ -21,107 +22,116 @@
settings-file = runCommandNoCC "firefox-settings" {} ''
cat '${firefox-ui-fix}/user.js' '${settings}' > $out
'';
in {
xdg.configFile."tridactyl/tridactylrc".text = ''
source ${tlaterpkgs.tridactyl-emacs}/share/tridactyl/emacs_bindings
# Remove the update function; Really don't want this since it's nix-packaged
comclear emacs-bindings-update
# Remove annoying pre-defined "searchurls" - duckduckgo is just better
jsb Object.keys(tri.config.get("searchurls")).reduce((prev, u) => prev.then(_ => tri.config.set("searchurls", u, null)), Promise.resolve())
'';

home.file.".mozilla/firefox/tlater/chrome/icons" = {
source = "${firefox-ui-fix}/icons";
};
thirdParty = config.programs.firefox.enableThirdPartyRepositories;
in {
options.programs.firefox.enableThirdPartyRepositories = lib.mkEnableOption "third party repositories";

programs.firefox = {
enable = true;
package = pkgs.firefox.override {
nativeMessagingHosts = [
pkgs.tridactyl-native
];
};
profiles."tlater" = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
aria2-integration
buster-captcha-solver
clearurls
decentraleyes
indie-wiki-buddy
keepassxc-browser
libredirect
no-pdf-download
react-devtools
reduxdevtools
tridactyl
ublock-origin
config = {
programs.firefox = {
enable = true;
package = lib.mkIf thirdParty (pkgs.firefox.override {
nativeMessagingHosts = [
pkgs.tridactyl-native
];
});
profiles."tlater" = {
extensions = with pkgs.nur.repos.rycee.firefox-addons;
lib.mkIf thirdParty [
aria2-integration
buster-captcha-solver
clearurls
decentraleyes
indie-wiki-buddy
keepassxc-browser
libredirect
no-pdf-download
react-devtools
reduxdevtools
tridactyl
ublock-origin

# # Missing:
# cloudhole
# devtools-adb-extension
# firefox-sticky-window-containers
# warframe-reliquary-prime
];
# # Missing:
# cloudhole
# devtools-adb-extension
# firefox-sticky-window-containers
# warframe-reliquary-prime
];

userChrome =
builtins.readFile "${firefox-ui-fix}/css/leptonChrome.css";
userContent =
builtins.readFile "${firefox-ui-fix}/css/leptonContent.css";
settings = {
# Re-bind ctrl to super (would interfere with tridactyl otherwise)
"ui.key.accelKey" = 91;
userChrome =
lib.mkIf thirdParty
(builtins.readFile "${firefox-ui-fix}/css/leptonChrome.css");
userContent =
lib.mkIf thirdParty
(builtins.readFile "${firefox-ui-fix}/css/leptonContent.css");
settings = {
# Re-bind ctrl to super (would interfere with tridactyl otherwise)
"ui.key.accelKey" = 91;

# Keep the reader button enabled at all times; really don't
# care if it doesn't work 20% of the time, most websites are
# crap and unreadable without this
"reader.parse-on-load.force-enabled" = true;
# Keep the reader button enabled at all times; really don't
# care if it doesn't work 20% of the time, most websites are
# crap and unreadable without this
"reader.parse-on-load.force-enabled" = true;

# Hide the "sharing indicator", it's especially annoying
# with tiling WMs on wayland
"privacy.webrtc.legacyGlobalIndicator" = false;
# Hide the "sharing indicator", it's especially annoying
# with tiling WMs on wayland
"privacy.webrtc.legacyGlobalIndicator" = false;

# Actual settings
"app.shield.optoutstudies.enabled" = false;
"app.update.auto" = false;
"browser.bookmarks.restore_default_bookmarks" = false;
"browser.contentblocking.category" = "strict";
"browser.ctrlTab.recentlyUsedOrder" = false;
"browser.discovery.enabled" = false;
"browser.laterrun.enabled" = false;
"browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" =
false;
"browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" =
false;
"browser.newtabpage.activity-stream.feeds.snippets" = false;
"browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
"browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "";
"browser.newtabpage.activity-stream.section.highlights.includePocket" =
false;
"browser.newtabpage.activity-stream.showSponsored" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
"browser.newtabpage.pinned" = false;
"browser.protections_panel.infoMessage.seen" = true;
"browser.quitShortcut.disabled" = true;
"browser.shell.checkDefaultBrowser" = false;
"browser.ssb.enabled" = true;
"browser.toolbars.bookmarks.visibility" = "never";
"browser.urlbar.placeholderName" = "DuckDuckGo";
"browser.urlbar.suggest.openpage" = false;
"datareporting.policy.dataSubmissionEnable" = false;
"datareporting.policy.dataSubmissionPolicyAcceptedVersion" = 2;
"dom.security.https_only_mode" = true;
"dom.security.https_only_mode_ever_enabled" = true;
"extensions.getAddons.showPane" = false;
"extensions.htmlaboutaddons.recommendations.enabled" = false;
"extensions.pocket.enabled" = false;
"identity.fxaccounts.enabled" = false;
"privacy.trackingprotection.enabled" = true;
"privacy.trackingprotection.socialtracking.enabled" = true;
# Actual settings
"app.shield.optoutstudies.enabled" = false;
"app.update.auto" = false;
"browser.bookmarks.restore_default_bookmarks" = false;
"browser.contentblocking.category" = "strict";
"browser.ctrlTab.recentlyUsedOrder" = false;
"browser.discovery.enabled" = false;
"browser.laterrun.enabled" = false;
"browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" =
false;
"browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" =
false;
"browser.newtabpage.activity-stream.feeds.snippets" = false;
"browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
"browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "";
"browser.newtabpage.activity-stream.section.highlights.includePocket" =
false;
"browser.newtabpage.activity-stream.showSponsored" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
"browser.newtabpage.pinned" = false;
"browser.protections_panel.infoMessage.seen" = true;
"browser.quitShortcut.disabled" = true;
"browser.shell.checkDefaultBrowser" = false;
"browser.ssb.enabled" = true;
"browser.toolbars.bookmarks.visibility" = "never";
"browser.urlbar.placeholderName" = "DuckDuckGo";
"browser.urlbar.suggest.openpage" = false;
"datareporting.policy.dataSubmissionEnable" = false;
"datareporting.policy.dataSubmissionPolicyAcceptedVersion" = 2;
"dom.security.https_only_mode" = true;
"dom.security.https_only_mode_ever_enabled" = true;
"extensions.getAddons.showPane" = false;
"extensions.htmlaboutaddons.recommendations.enabled" = false;
"extensions.pocket.enabled" = false;
"identity.fxaccounts.enabled" = false;
"privacy.trackingprotection.enabled" = true;
"privacy.trackingprotection.socialtracking.enabled" = true;
};
};
};
};

home.file.".mozilla/firefox/${config.programs.firefox.profiles.tlater.path}/user.js" = {
source = settings-file;
home.file.".mozilla/firefox/${config.programs.firefox.profiles.tlater.path}/user.js" =
lib.mkIf thirdParty
{source = settings-file;};

xdg.configFile."tridactyl/tridactylrc" = lib.mkIf thirdParty {
text = ''
source ${tlaterpkgs.tridactyl-emacs}/share/tridactyl/emacs_bindings
# Remove the update function; Really don't want this since it's nix-packaged
comclear emacs-bindings-update
# Remove annoying pre-defined "searchurls" - duckduckgo is just better
jsb Object.keys(tri.config.get("searchurls")).reduce((prev, u) => prev.then(_ => tri.config.set("searchurls", u, null)), Promise.resolve())
'';
};

home.file.".mozilla/firefox/tlater/chrome/icons" = lib.mkIf thirdParty {source = "${firefox-ui-fix}/icons";};
};
}
1 change: 1 addition & 0 deletions home-config/config/shell/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
fd
ouch
ripgrep
screen
];

programs.ssh.enable = true;
Expand Down
24 changes: 19 additions & 5 deletions home-config/config/work/famedly.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{lib, flake-inputs, ...}: {
{
lib,
flake-inputs,
...
}: {
programs.git = {
userEmail = "t.maat@famedly.com";

Expand All @@ -11,6 +15,11 @@
extraConfig.github.user = "famedly-tlater";
};

home.packages = with pkgs; [
bitwarden
pre-commit
];

home.file.".ssh/famedly-tlater.pub".source = "${flake-inputs.self}/keys/famedly-tlater.pub";

programs.ssh.matchBlocks = {
Expand All @@ -20,9 +29,14 @@
};
};

programs.firefox.webapps = {
discord.enable = lib.mkForce false;
whatsapp.enable = lib.mkForce false;
element.enable = lib.mkForce false;
programs.firefox = {
enableThirdPartyRepositories = false;

# Disable the webapps that shouldn't be on a work computer
webapps = {
discord.enable = lib.mkForce false;
whatsapp.enable = lib.mkForce false;
element.enable = lib.mkForce false;
};
};
}
1 change: 1 addition & 0 deletions home-config/hosts/rin/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
imports = [
../../config
../../config/applications/graphical
../../config/applications/tty
../../config/desktop
../../config/services
Expand Down
1 change: 1 addition & 0 deletions keys/famedly-tlater.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFtWLp6Hoqr3izbm+J7PUOLLI+6xoZ05T/7jMJITjrQH openpgp:0x4991CF06
2 changes: 1 addition & 1 deletion nixos-config/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

sops = {
gnupg = {
home = "/var/lib/sops";
# home = "/var/lib/sops";
sshKeyPaths = [];
};

Expand Down
58 changes: 54 additions & 4 deletions nixos-config/hosts/rin/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{lib, flake-inputs, ...}: {
{
pkgs,
config,
lib,
flake-inputs,
...
}: {
imports = [
flake-inputs.disko.nixosModules.disko

../../networks/personal.nix

./hardware-configuration.nix
./disko.nix

./firefox.nix
./hardware-policy.nix
];

Expand All @@ -15,12 +20,51 @@
sops = {
gnupg = lib.mkForce {};
age.keyFile = "/var/lib/sops/host.age";
secrets.wireless-env = {};
};

networking = {
hostName = "rin";
hostId = "e6aaf496";
wireless.interfaces = ["wlp2s0"];
wireless = {
enable = lib.mkForce false;
allowAuxiliaryImperativeNetworks = lib.mkForce false;
userControlled.enable = lib.mkForce false;
};

networkmanager = {
enable = true;
dns = "systemd-resolved";

ensureProfiles = {
environmentFiles = [config.sops.secrets.wireless-env.path];

profiles = {
mikan-guest = {
connection = {
id = "mikan-guest";
type = "wifi";
};

wifi = {
mode = "infrastructure";
ssid = "mikan-guest";
};

wifi-security = {
key-mgmt = "wpa-psk";
psk = "$PSK_MIKAN_GUEST";
};

ipv4.method = "auto";
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
};
};
};
};
};

systemd.network = {
Expand All @@ -32,4 +76,10 @@
};
};
};

# Used extensively for testing at work
virtualisation.docker.enable = true;
users.users.tlater.extraGroups = ["docker"];
# Install rustup system-wide for convenience
environment.systemPackages = [pkgs.rustup];
}
16 changes: 16 additions & 0 deletions nixos-config/hosts/rin/firefox.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
programs.firefox = {
enable = true;

policies.preferences.ExtensionSettings = {
"uBlock0@raymondhill.net" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
installation_mode = "force_installed";
};
"{74145f27-f039-47ce-a470-a662b129930a}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/clearurls/latest.xpi";
installation_mode = "force_installed";
};
};
};
}
Loading

0 comments on commit dff2baa

Please sign in to comment.