diff --git a/flake.nix b/flake.nix index f1081c4..a2e966d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,10 +15,6 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - #inputs.sops-nix = { - # url = "github:Mic92/sops-nix"; - # inputs.nixpkgs.follows = "nixpkgs"; - #}; }; outputs = { self, nixpkgs, home-manager, nixos-wsl, disko }: @@ -39,15 +35,8 @@ inherit system pkgs; modules = [ ./src/system/machines/desktop - { - home-manager = { - nixosModules.home-manager = - (import ./src/system/machines/desktop/modules/home-manager); - #sharedModules = [ - # sops-nix.homeManagerModules.sops - #]; - }; - } + home-manager.nixosModules.home-manager + (import ./src/system/machines/desktop/modules/home-manager) #disko.nixosModules.disko # (import ./src/system/machines/desktop/modules/disko) ]; diff --git a/src/user/configs/bookmarks/default.nix b/src/user/configs/bookmarks/default.nix new file mode 100644 index 0000000..8ca2f21 --- /dev/null +++ b/src/user/configs/bookmarks/default.nix @@ -0,0 +1,23 @@ +[ + { + name = "Toolbar"; + toolbar = true; + bookmarks = [ + { + name = "NixOS"; + bookmarks = [ + { + name = "Nixpkgs"; + tags = [ "nix" "dev" ]; + url = "https://search.nixos.org/packages"; + } + { + name = "Home Manager Options"; + tags = [ "nix" "dev" ]; + url = "https://nix-community.github.io/home-manager/options.xhtml"; + } + ]; + } + ]; + } +] diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index edefe64..092bfe4 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -24,6 +24,8 @@ userConfigs = rec { signByDefault = true; }; }; + + bookmarks = import ./bookmarks; }; in diff --git a/src/user/configs/secrets/bookmarks.nix b/src/user/configs/secrets/bookmarks.nix deleted file mode 100644 index e69de29..0000000 diff --git a/src/user/modules/gui/modules/browsers/firefox/default.nix b/src/user/modules/gui/modules/browsers/firefox/default.nix index d05cfa7..8c1ef9f 100644 --- a/src/user/modules/gui/modules/browsers/firefox/default.nix +++ b/src/user/modules/gui/modules/browsers/firefox/default.nix @@ -14,9 +14,7 @@ in ]; profiles = { "${config.user.name}" = { - bookmarks = [ - (import ../../../../../configs/bookmarks) - ]; + bookmarks = config.user.bookmarks; }; }; };