reduce browser options and refactor bookmarks

This commit is contained in:
Tyler Starr 2024-09-30 12:36:46 -07:00
parent b62990f0c9
commit 024370803b
7 changed files with 11 additions and 19 deletions

View File

@ -19,10 +19,7 @@
# Modules # Modules
modules = { modules = {
desktop = { desktop = {
browser = { browser.enable = true;
chrome.enable = true;
firefox.enable = true;
};
gnome = { gnome = {
enable = true; enable = true;
wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/bulwark.png}"; wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/bulwark.png}";

View File

@ -35,10 +35,7 @@
# Modules # Modules
modules = { modules = {
desktop = { desktop = {
browser = { browser.enable = true;
chrome.enable = true;
firefox.enable = true;
};
gnome = { gnome = {
enable = true; enable = true;
wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/kestrel.png}"; wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/kestrel.png}";

View File

@ -22,10 +22,7 @@
# Modules # Modules
modules = { modules = {
desktop = { desktop = {
browser = { browser.enable = true;
chrome.enable = true;
firefox.enable = true;
};
gnome = { gnome = {
enable = true; enable = true;
# TODO: Add Shivan wallpaper # TODO: Add Shivan wallpaper

View File

@ -1,16 +1,16 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
let cfg = config.modules.desktop.browser.chrome; let cfg = config.modules.desktop.browser;
in { in {
options.modules.desktop.browser.chrome.enable = lib.mkEnableOption "chrome"; # Enable option declared in firefox.nix
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
google-chrome # Web browser developed by Google. google-chrome # Web browser developed by Google.
]; ];
programs.chromium = { programs.chromium = {
enable = true; enable = true;
extraOpts = { extraOpts = {
# Disable all manner of account-related things. # Disable all manner of account-related things.
"BrowserSignin" = 0; # disable "BrowserSignin" = 0; # disable
"BrowserAddPersonEnabled" = false; "BrowserAddPersonEnabled" = false;
@ -46,10 +46,11 @@ in {
# Setup bookmarks # Setup bookmarks
"BookmarkBarEnabled" = true; "BookmarkBarEnabled" = true;
"ShowAppsShortcutInBookmarkBar" = false; "ShowAppsShortcutInBookmarkBar" = false;
"ManagedBookmarks" = import ./chrome-bookmarks.nix; "ManagedBookmarks" = import ./bookmarks/chrome.nix;
}; };
}; };
# Host blank webpage for default new-tab
networking.firewall.allowedTCPPorts = [ 8080 ]; networking.firewall.allowedTCPPorts = [ 8080 ];
services.static-web-server = { services.static-web-server = {
enable = true; enable = true;

View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, ... }:
let cfg = config.modules.desktop.browser.firefox; let cfg = config.modules.desktop.browser;
in { in {
options.modules.desktop.browser.firefox.enable = lib.mkEnableOption "firefox"; options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Install applications for CAC # Install applications for CAC
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -15,7 +15,7 @@ in {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
profiles.default = { profiles.default = {
bookmarks = import ./firefox-bookmarks.nix; bookmarks = import ./bookmarks/firefox.nix;
isDefault = true; isDefault = true;
name = "default"; name = "default";
settings = { settings = {