common.nix

@@ -1,6 +1,6 @@
 rec {
   default = {
-    browser = "zen";
+    browser = "io.github.zen_browser.zen";
     calculator = "gnome-calculator";
     fileManager = "nautilus";
     imageViewer = "loupe";

configuration.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  inputs,
   outputs,
   ...
 }:
@@ -46,14 +45,13 @@ in
     protonmail-desktop
     stremio
     fastfetch
+    freetube
     discord
     nix-prefetch-github # Cmd to get rev and hash from GitHub
     gimp
     vlc
-    vdhcoapp
     fortune
     cowsay
-    inputs.zen-browser.packages."${system}".default # beta
   ];
 
   nix.settings.experimental-features = [
@@ -64,7 +62,7 @@ in
   programs.kdeconnect.enable = true;
 
   services = {
-    flatpak.enable = false;
+    flatpak.enable = true;
     xserver.enable = true;
   };
 

flake.lock

@@ -726,22 +726,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -825,8 +809,7 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "spicetify-nix": "spicetify-nix",
-        "stylix": "stylix",
+        "stylix": "stylix"
-        "zen-browser": "zen-browser"
       }
     },
     "spicetify-nix": {
@@ -1000,24 +983,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1736655632,
-        "narHash": "sha256-TeA6G+BUWhOi2ZnewAEfwbsY/ku1H1sdNKfwjvH0wzM=",
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "rev": "32f3692cc4d6a1d1cb8943be7d2e712a63c4b374",
-        "type": "github"
-      },
-      "original": {
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -28,7 +28,6 @@
       url = "github:danth/stylix/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zen-browser.url = "github:0xc000022070/zen-browser-flake";
   };
 
   outputs =

home-manager/default-applications.nix

@@ -4,7 +4,7 @@
     enable = true;
     defaultApplications =
       let
-        browser = "zen.desktop";
+        browser = "io.github.zen_browser.zen.desktop";
         imageViewer = "org.gnome.Loupe.desktop";
       in
       {

home-manager/default.nix

@@ -16,9 +16,7 @@ in
     ./default-applications.nix
     ./development
     ./fish.nix
-    ./freetube.nix
     ./gtk.nix
-    ./kitty.nix
     ./mpv.nix
     ./nextcloud.nix
     ./rofi
@@ -47,6 +45,11 @@ in
 
     # Let Home Manager install and manage itself.
     home-manager.enable = true;
+
+    kitty = {
+      enable = common.terminal == "kitty";
+      settings.window_padding_width = 10;
+    };
   };
 
   services = {

home-manager/freetube.nix

@@ -1,49 +0,0 @@
-{
-  catppuccin.freetube.enable = true;
-
-  programs.freetube = {
-    enable = true;
-    settings = {
-      allowDashAv1Formats = true;
-      checkForUpdates = false;
-      currentLocale = "en-GB";
-      defaultTheatreMode = true;
-      defaultQuality = "1080";
-      region = "NO";
-      useSponsorBlock = true;
-
-      sponsorBlockSponsor = {
-        color = "CatppuccinMochaGreen";
-        skip = "autoSkip";
-      };
-      sponsorBlockSelfPromo = {
-        color = "CatppuccinMochaYellow";
-        skip = "showInSeekBar";
-      };
-      sponsorBlockInteraction = {
-        color = "CatppuccinMochaPink";
-        skip = "showInSeekBar";
-      };
-      sponsorBlockIntro = {
-        color = "CatppuccinMochaSapphire";
-        skip = "doNothing";
-      };
-      sponsorBlockOutro = {
-        color = "CatppuccinMochaBlue";
-        skip = "doNothing";
-      };
-      sponsorBlockRecap = {
-        color = "CatppuccinMochaMauve";
-        skip = "doNothing";
-      };
-      sponsorBlockMusicOffTopic = {
-        color = "CatppuccinMochaFlamingo";
-        skip = "doNothing";
-      };
-      sponsorBlockFiller = {
-        color = "CatppuccinMochaMauve";
-        skip = "doNothing";
-      };
-    };
-  };
-}

home-manager/kitty.nix

@@ -1,23 +0,0 @@
-let
-  common = import ../common.nix;
-  theme = import ../theme.nix;
-in
-{
-  catppuccin.kitty = {
-    enable = true;
-    flavor = theme.flavor;
-  };
-
-  programs.kitty = {
-    enable = common.default.terminal == "kitty";
-    font.name = theme.nerdFont;
-    settings = {
-      background_blur = 5;
-      background_opacity = 0.8;
-      confirm_os_window_close = 0;
-      window_padding_width = 10;
-    };
-  };
-
-  stylix.targets.kitty.enable = false;
-}

home-manager/mpv.nix

@@ -1,13 +1,4 @@
 {
-  catppuccin.mpv =
-    let
-      theme = import ../theme.nix;
-    in
-    {
-      enable = true;
-      flavor = theme.flavor;
-    };
-
   programs.mpv = {
     enable = true;
     config = {

modules/gnome/default.nix

@@ -14,7 +14,6 @@
     loupe
     gnome-calculator
     gnome-disk-utility
-    gnome-clocks
   ];
 
   programs.dconf.enable = true; # Required for some gnome applications