diff --git a/flake.lock b/flake.lock index fdb2f5f..a53238b 100644 --- a/flake.lock +++ b/flake.lock @@ -1123,11 +1123,11 @@ "locked": { "lastModified": 0, "narHash": "sha256-Cc8Y37NuVzPRWEYKOembvCwX9F+vgOluhoPzVfEtafw=", - "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/home-manager", + "path": "/nix/store/gaalmwagkhnbz69i0zbivpdi9i48dlcz-source/home-manager", "type": "path" }, "original": { - "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/home-manager", + "path": "/nix/store/gaalmwagkhnbz69i0zbivpdi9i48dlcz-source/home-manager", "type": "path" } }, @@ -1827,11 +1827,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-Ipi9gad6XxzVUDHKVSWXrLRgkeEh7DWqVAhWYPHfiAc=", - "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/system-config", + "path": "/nix/store/gaalmwagkhnbz69i0zbivpdi9i48dlcz-source/system-config", "type": "path" }, "original": { - "path": "/nix/store/nb42ly509ihncgr1jkv1cx0pdr15091s-source/system-config", + "path": "/nix/store/gaalmwagkhnbz69i0zbivpdi9i48dlcz-source/system-config", "type": "path" } }, diff --git a/flake.nix b/flake.nix index 09ed030..7af1f91 100644 --- a/flake.nix +++ b/flake.nix @@ -9,15 +9,18 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - impermanence = { - url = "github:nix-community/impermanence"; - }; + impermanence.url = "github:nix-community/impermanence"; home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + system.url = "./system-config"; nixvim.url = "/ssd1/Projects/Nixvim"; diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix index 7ede6f2..1e9ade7 100644 --- a/home-manager/packages/default.nix +++ b/home-manager/packages/default.nix @@ -23,7 +23,6 @@ lxqt.lxqt-policykit blueberry wl-clipboard - firefox-wayland xfce.thunar grim slurp diff --git a/home-manager/programs/firefox/default.nix b/home-manager/programs/firefox/default.nix new file mode 100644 index 0000000..717e6e4 --- /dev/null +++ b/home-manager/programs/firefox/default.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, inputs, ... }: { + + options.homeconfig.firefox.enable = lib.options.mkOption { + type = lib.types.bool; + default = false; + }; + + config = lib.mkIf config.homeconfig.firefox.enable { + + programs.firefox = { + + enable = true; + package = pkgs.firefox-wayland; + + profiles.nathan = { + + bookmarks = [ + + { + name = "NixOS Search - Packages"; + url = "https://search.nixos.org/packages"; + } + ]; + + extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ + ublock-origin + keepassxc-browser + ]; + }; + }; + }; +} diff --git a/home-manager/programs/flake.nix b/home-manager/programs/flake.nix index 502a7c0..9d89696 100644 --- a/home-manager/programs/flake.nix +++ b/home-manager/programs/flake.nix @@ -21,12 +21,13 @@ imports = [ inputs.ags.hmModule inputs.hyprland.hmModule - ./terminal + ./terminal inputs.rofi.hmModule inputs.pywal.hmModule ./swaylock ./calcurse ./wayvnc + ./firefox ]; home.packages = [ diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix index c249a47..4424c30 100644 --- a/system-config/configuration/homebox/default.nix +++ b/system-config/configuration/homebox/default.nix @@ -179,6 +179,7 @@ ags.enable = true; calcurse.enable = true; rofi.enable = true; + firefox.enable = true; }; } ];