diff --git a/config.local.nix b/config.local.nix index 6042dc6..cc30ad4 100644 --- a/config.local.nix +++ b/config.local.nix @@ -1,6 +1,6 @@ { - hostname = "MacBook-Nix"; - username = "lsoriano"; + hostname = "nixos"; + username = "biscuit"; timezone = "America/Chicago"; vpn = { @@ -9,8 +9,8 @@ }; terminal = { - termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font - termSize = "24"; + termFont = "Monolisa"; # e.g., JetBrainsMono Nerd Font + termSize = "18"; termShell = "fish"; shellAliases = { @@ -32,10 +32,20 @@ touchpadSupport = false; # Custom Applications - linux-apps = pkgs: - with pkgs; [ - delfin + linux-apps = { + gamingDesktop = true; # adds steam + my-apps = pkgs: + with pkgs; [ + jellyfin-media-player + ]; + }; + + hyprconf = { + monitor = [ + "DP-1,highres@highrr,0x1080,auto" + "HDMI-A-2,highres@highrr,0x0,auto" ]; + }; sshExtraConfig = '' Host macair diff --git a/modules/app.nix b/modules/app.nix index 35be3bf..a6d287d 100644 --- a/modules/app.nix +++ b/modules/app.nix @@ -5,7 +5,6 @@ }: { imports = [ - ../pkgs/firefox/default.nix ] ++ lib.optionals (linux-apps.gamingDesktop == true) [ ../pkgs/steam/default.nix diff --git a/modules/desktop/app.nix b/modules/desktop/app.nix index 65f2dbe..319c9ef 100644 --- a/modules/desktop/app.nix +++ b/modules/desktop/app.nix @@ -2,4 +2,7 @@ info = import ../../config.nix; in { home.packages = info.linux-apps.my-apps pkgs; + import = [ + ../../pkgs/firefox/default.nix + ]; } diff --git a/pkgs/firefox/default.nix b/pkgs/firefox/default.nix index 6455fc0..079c4e8 100644 --- a/pkgs/firefox/default.nix +++ b/pkgs/firefox/default.nix @@ -61,7 +61,7 @@ in { "tridactyl.vim@cmcaine.co.uk" = { install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi"; installation_mode = "force_installed"; - }; + } # Privacy Badger: # "jid1-MnnxcxisBPnSXQ@jetpack" = { # install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; @@ -71,35 +71,36 @@ in { # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = { # install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi"; # installation_mode = "force_installed"; + }; }; - }; - /* - ---- PREFERENCES ---- - */ - # Check about:config for options. - Preferences = { - "browser.contentblocking.category" = { - Value = "strict"; - Status = "locked"; + /* + ---- PREFERENCES ---- + */ + # Check about:config for options. + Preferences = { + "browser.contentblocking.category" = { + Value = "strict"; + Status = "locked"; + }; + "extensions.pocket.enabled" = lock-false; + "extensions.screenshots.disabled" = lock-true; + "browser.topsites.contile.enabled" = lock-false; + "browser.formfill.enable" = lock-false; + "browser.search.suggest.enabled" = lock-false; + "browser.search.suggest.enabled.private" = lock-false; + "browser.urlbar.suggest.searches" = lock-false; + "browser.urlbar.showSearchSuggestionsFirst" = lock-false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; + "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; + "browser.newtabpage.activity-stream.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; }; - "extensions.pocket.enabled" = lock-false; - "extensions.screenshots.disabled" = lock-true; - "browser.topsites.contile.enabled" = lock-false; - "browser.formfill.enable" = lock-false; - "browser.search.suggest.enabled" = lock-false; - "browser.search.suggest.enabled.private" = lock-false; - "browser.urlbar.suggest.searches" = lock-false; - "browser.urlbar.showSearchSuggestionsFirst" = lock-false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; - "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; - "browser.newtabpage.activity-stream.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; }; }; };