From 0d7027182caa1a0401b689bc5f8d79fcc8622b62 Mon Sep 17 00:00:00 2001 From: Alex van de Sandt Date: Thu, 14 May 2026 17:48:36 -0500 Subject: [PATCH] Add firefox and zen aspects --- flake.lock | 23 ++++++++++++++++++++++- flake.nix | 4 ++++ modules/defaults.nix | 34 +++++++++++++++++++--------------- modules/dendritic.nix | 8 +++++++- modules/firefox.nix | 7 +++++++ modules/users/igneous.nix | 7 +++---- modules/zen.nix | 12 ++++++++++++ 7 files changed, 74 insertions(+), 21 deletions(-) create mode 100644 modules/firefox.nix create mode 100644 modules/zen.nix diff --git a/flake.lock b/flake.lock index a772623..c835eb8 100644 --- a/flake.lock +++ b/flake.lock @@ -579,7 +579,8 @@ "hyprland": "hyprland", "import-tree": "import-tree", "nixpkgs": "nixpkgs_2", - "nixvim": "nixvim" + "nixvim": "nixvim", + "zen-browser": "zen-browser" } }, "systems": { @@ -652,6 +653,26 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1778303188, + "narHash": "sha256-zXFSvK80qpI91B7DU9QSExAtafSrz6vzormh2kUi6kQ=", + "owner": "youwen5", + "repo": "zen-browser-flake", + "rev": "9346c84657a9cab472bc4ee5a2d65d42a72d5346", + "type": "github" + }, + "original": { + "owner": "youwen5", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 747ad64..5463d1a 100644 --- a/flake.nix +++ b/flake.nix @@ -21,5 +21,9 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/modules/defaults.nix b/modules/defaults.nix index 5f0513e..1868b4c 100644 --- a/modules/defaults.nix +++ b/modules/defaults.nix @@ -3,26 +3,30 @@ let stateVersion = "25.05"; in { - den.default.nixos = { - system.stateVersion = stateVersion; + den.default.nixos = + { pkgs, ... }: + { + system.stateVersion = stateVersion; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; - # Enable networking - networking.networkmanager.enable = true; + # Enable networking + networking.networkmanager.enable = true; - # Set your time zone. - time.timeZone = "America/Chicago"; + # Set your time zone. + time.timeZone = "America/Chicago"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - }; + environment.systemPackages = with pkgs; [ nh ]; + + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + }; den.default.homeManager.home.stateVersion = stateVersion; diff --git a/modules/dendritic.nix b/modules/dendritic.nix index ec5ca3d..9e47d96 100644 --- a/modules/dendritic.nix +++ b/modules/dendritic.nix @@ -1,4 +1,4 @@ -{ den, inputs, ... }: +{ inputs, ... }: { imports = [ (inputs.flake-file.flakeModules.dendritic or { }) @@ -9,14 +9,20 @@ flake-file.inputs = { den.url = "github:denful/den"; flake-file.url = "github:vic/flake-file"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland.url = "github:hyprwm/Hyprland"; nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/modules/firefox.nix b/modules/firefox.nix new file mode 100644 index 0000000..71a3df7 --- /dev/null +++ b/modules/firefox.nix @@ -0,0 +1,7 @@ +{ + den.aspects.firefox = { + homeManager = { + programs.firefox.enable = true; + }; + }; +} diff --git a/modules/users/igneous.nix b/modules/users/igneous.nix index dd15db8..70e2eb6 100644 --- a/modules/users/igneous.nix +++ b/modules/users/igneous.nix @@ -6,15 +6,14 @@ den.batteries.define-user den.batteries.primary-user + firefox git git.verification - hyprland - + nixvim shell shell.zsh - - nixvim + zen ]; homeManager = diff --git a/modules/zen.nix b/modules/zen.nix new file mode 100644 index 0000000..5092089 --- /dev/null +++ b/modules/zen.nix @@ -0,0 +1,12 @@ +{ inputs, ... }: +{ + den.aspects.zen = { + homeManager = + { system, ... }: + { + home.packages = [ + inputs.zen-browser.packages.${system}.default + ]; + }; + }; +} -- 2.51.2