From fcc0b3608934ab968c2d96b6481f091bf5607e53 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Wed, 4 Dec 2024 22:32:57 -0600 Subject: [PATCH] - zen, other apps; + thunderbird --- flake.lock | 37 +------------------------------------ flake.nix | 1 - modules/apps/internet.nix | 14 ++++++-------- modules/apps/misc.nix | 2 -- 4 files changed, 7 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 0378cc7..443a519 100644 --- a/flake.lock +++ b/flake.lock @@ -510,22 +510,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1733344007, @@ -575,8 +559,7 @@ "nixpkgs-small": "nixpkgs-small", "nur": "nur", "sops-nix": "sops-nix", - "ucodenix": "ucodenix", - "zen-browser": "zen-browser" + "ucodenix": "ucodenix" } }, "rust-overlay": { @@ -713,24 +696,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zen-browser": { - "inputs": { - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1727721329, - "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", - "owner": "MarceColl", - "repo": "zen-browser-flake", - "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc", - "type": "github" - }, - "original": { - "owner": "MarceColl", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 693ff8d..1574a16 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ ucodenix.url = "github:e-tho/ucodenix"; nix-gaming.url = "github:fufexan/nix-gaming"; hyprland.url = "github:hyprwm/Hyprland"; - zen-browser.url = "github:MarceColl/zen-browser-flake"; home-manager.url = "github:nix-community/home-manager"; sops-nix.url = "github:Mic92/sops-nix"; nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix index cd6de7e..ec43840 100644 --- a/modules/apps/internet.nix +++ b/modules/apps/internet.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - inputs, ... }: { @@ -22,10 +21,13 @@ }; users.users.jawz.packages = let - vdhcoapp = pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { }; + otherPackages = [ + # video download helper assistant + (pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { }) + ]; packages = builtins.attrValues { inherit (pkgs) - evolution # gnome email client + thunderbird # email client warp # transfer files with based ppl brave # crypto-browser that at least somewhat integrates with gtk nextcloud-client # self-hosted google-drive alternative @@ -39,10 +41,6 @@ ; }; in - packages - ++ [ - vdhcoapp # video download helper assistant - inputs.zen-browser.packages.x86_64-linux.default - ]; + packages ++ otherPackages; }; } diff --git a/modules/apps/misc.nix b/modules/apps/misc.nix index 7e2f59a..175801c 100644 --- a/modules/apps/misc.nix +++ b/modules/apps/misc.nix @@ -9,8 +9,6 @@ config = lib.mkIf config.my.apps.misc.enable { users.users.jawz.packages = builtins.attrValues { inherit (pkgs) - celeste # sync tool for any cloud provider - czkawka # duplicate finder collector # stores things and throws them anywhere blanket # background noise metadata-cleaner # remove any metadata and geolocation from files