diff --git a/flake.lock b/flake.lock index 17a379b..e319173 100644 --- a/flake.lock +++ b/flake.lock @@ -384,6 +384,27 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -551,6 +572,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -610,7 +647,8 @@ "nixos-cli": "nixos-cli", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", - "stylix": "stylix" + "stylix": "stylix", + "zen-browser": "zen-browser" } }, "rust-overlay": { @@ -792,6 +830,25 @@ "repo": "base16-zed", "type": "github" } + }, + "zen-browser": { + "inputs": { + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1760588585, + "narHash": "sha256-NufqXao2i6d7N1HFKp8hM8XAD8Q6s/zU2wNd065Ybus=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "5a651a6a3bb5c9bd694adbd2c34f55b4abff9a2c", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d74d9ba..4ec8da1 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,8 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/main"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + impermanence.url = "github:nix-community/impermanence"; }; diff --git a/hosts/modules/desktop/desktop.nix b/hosts/modules/desktop/desktop.nix index b046031..5012d7e 100644 --- a/hosts/modules/desktop/desktop.nix +++ b/hosts/modules/desktop/desktop.nix @@ -13,52 +13,46 @@ KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland }; - systemPackages = - with pkgs; - [ - ### Web ### - bitwarden-desktop - brave - tor-browser - qbittorrent - vesktop - ### Office & Productivity ### - aspell - aspellDicts.de - aspellDicts.en - aspellDicts.en-computers - aspellDicts.pt_BR - kwrite - libreoffice-qt - onlyoffice-desktopeditors - rnote - ### Graphics & Design ### - gimp - inkscape - plasticity - ### System Utilities ### - adwaita-icon-theme - colloid-gtk-theme - junction - kara - kde-rounded-corners - libfido2 - mission-center - p7zip - rclone - toggleaudiosink - unrar - ### Media ### - mpv - obs-studio - qview - ] - ++ (with pkgs.kdePackages; [ - ark - dolphin - dolphin-plugins - kolourpaint - ]); + systemPackages = with pkgs; [ + ### Web ### + bitwarden-desktop + brave + tor-browser + qbittorrent + vesktop + inputs.zen-browser.packages."${system}".default + ### Office & Productivity ### + aspell + aspellDicts.de + aspellDicts.en + aspellDicts.en-computers + aspellDicts.pt_BR + libreoffice + onlyoffice-desktopeditors + papers + rnote + ### Graphics & Design ### + gimp + inkscape + loupe + plasticity + ### System Utilities ### + adwaita-icon-theme + ghostty + gnome-disk-utility + junction + libfido2 + mission-center + nautilus + p7zip + rclone + toggleaudiosink + unrar + ### Media ### + mpv + obs-studio + qview + ]; }; services = { @@ -86,8 +80,6 @@ flatpak = { enable = true; packages = [ - ### Internet Browsers & Communication ### - "app.zen_browser.zen" ### Graphics & Design ### "com.boxy_svg.BoxySVG" rec { @@ -121,7 +113,6 @@ niri.enable = true; dconf.enable = true; kdeconnect.enable = true; - partition-manager.enable = true; appimage = { enable = true; binfmt = true; diff --git a/users/modules/desktop.nix b/users/modules/desktop.nix index a1f8df1..3f7545a 100644 --- a/users/modules/desktop.nix +++ b/users/modules/desktop.nix @@ -1,7 +1,10 @@ { inputs, pkgs, ... }: { - imports = [ inputs.dms.homeModules.dankMaterialShell.default ]; + imports = [ + inputs.dms.homeModules.dankMaterialShell.default + inputs.zen-browser.homeModules.beta + ]; fonts.fontconfig.enable = true; @@ -11,6 +14,11 @@ enableVPN = false; }; + zen-browser = { + enable = true; + profiles.william = { }; + }; + ghostty = { enable = true; settings = { @@ -35,9 +43,7 @@ enable = true; xdgOpenUsePortal = true; extraPortals = with pkgs; [ - kdePackages.xdg-desktop-portal-kde xdg-desktop-portal-gtk - xdg-desktop-portal-gnome ]; config.common.default = "*"; }; diff --git a/users/modules/helix.nix b/users/modules/helix.nix index e6e1cd1..a72ead3 100644 --- a/users/modules/helix.nix +++ b/users/modules/helix.nix @@ -13,7 +13,7 @@ idle-timeout = 0; line-number = "relative"; cursor-shape = { - normal = "bar"; + normal = "underline"; insert = "bar"; select = "underline"; }; diff --git a/users/modules/stylix.nix b/users/modules/stylix.nix index 5ab0431..1c3712a 100644 --- a/users/modules/stylix.nix +++ b/users/modules/stylix.nix @@ -53,5 +53,9 @@ terminal = 12; }; }; + targets.zen-browser = { + enable = true; + profileNames = [ "william" ]; + }; }; }