Merge pull request 'Fix Zen' (#5) from linusemr618/nixy:main into main

Reviewed-on: #5

flake.nix

@@ -28,6 +28,17 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nur = {
+      url = "github:nix-community/NUR";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs = {
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
 
 
     # Server

home/programs/group/basic-apps.nix

@@ -6,12 +6,16 @@
 }: {
   home.packages = (with pkgs-stable; [
 
+    kodi # Kodi
+    keepassxc # Passwords
 		vlc # Video player
     obsidian # Note taking app
+    cwtch-ui # messager
 
     ticktick # Todo app
     onlyoffice-desktopeditors # Office suite
     firefox # Backup browser
+    tor-browser # Tor browser
 
     # I love TUIs
     caligula # User-friendly, lightweight TUI for disk imaging (ISO, USB BOOT)
@@ -40,5 +44,6 @@
 
 	++ (with pkgs; [
 		vesktop # Vencord Discord Mod
+    tor # tor network service
 	]);
 }

home/programs/group/dev-packages.nix

@@ -6,8 +6,10 @@
   go
 	zig
 
+  claude-code # Claude Code
+
 	zed-editor #Zed
-	vscodium # VS Code
+  vscodium # VS Code
 ])
 ++ (with pkgs-stable; [
   bun

home/programs/group/music-apps.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}: {
+  home.packages = (with pkgs; [
+    ardour # DAW
+    guitarix # Digital AMP
+    carla # Hosting of VSTs
+    hydrogen# Drums
+  ]);
+}

home/programs/zen/default.nix

@@ -1,62 +1,98 @@
 {
+  inputs,
   pkgs,
-  lib,
-  config,
   ...
-}:
-{
+}: {
+  imports = [inputs.zen-browser.homeModules.beta];
   programs.zen-browser = {
     enable = true;
-
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-
-      OfferToSaveLogins = false;
-      PasswordManagerEnabled = false;
-
-      AutofillAddressEnabled = false;
-      AutofillCreditCardEnabled = false;
-
-      DontCheckDefaultBrowser = true;
-
-      DNSOverHTTPS = {
-        Enabled = true;
-        ProviderURL = "https://dns.quad9.net/dns-query";
-        Locked = true;
-      };
-    };
-
     profiles.default = {
+      extensions = {
+        packages = with pkgs.nur.repos.rycee.firefox-addons; [
+          ublock-origin
+          video-downloadhelper
+          multi-account-containers
+          noscript
+        ];
+      };
       search = {
         force = true;
-        default = "Startpage";
-      };
+        default = "startpage";
+        engines = {
+          nixos-options = {
+            name = "NixOS Options";
+            urls = [{template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";}];
+            definedAliases = ["@no"];
+          };
+          nixos-packages = {
+            name = "NixOS Packages";
+            urls = [{template = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";}];
+            definedAliases = ["@np"];
+          };
+          nixos-wiki = {
+            name = "NixOS Wiki";
+            urls = [{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}];
+            definedAliases = ["@nw"];
+          };
+          startpage = {
+            name = "Startpage";
+            urls = [
+              {
+                method = "POST";
+                template = "https://www.startpage.com/sp/search";
+                params = [
+                  {
+                    name = "query";
+                    value = "{searchTerms}";
+                  }
+                  {
+                    name = "prfe";
+                    value = "26b77e0ef13273610e32813c3233d92429c5426b277dcad41b2f2d38f94a44e839aa1abc7cf4223afd5872a185d5c9976949b9b1f0f83bbde3f9d4ac610d8fffa03947db6336c7a249ef62c2824adfd1";
+                  }
+                ];
+              }
 
+              {
+                type = "application/x-suggestions+json";
+                template = "https://www.startpage.com/osuggestions?query={searchTerms}";
+              }
+            ];
+            definedAliases = ["@sp"];
+          };
+        };
+      };
       settings = {
-        "browser.startup.homepage" = "https://duckduckgo.com";
+        "browser.download.useDownloadDir" = false;
+        "browser.ml.linkPreview.enabled" = true;
+        "browser.ml.linkPreview.optin" = true;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = true;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = true;
+        "browser.search.suggest.enabled" = true;
+        "browser.search.suggest.enabled.private" = true;
+        "browser.translations.neverTranslateLanguages" = "de";
+        "dom.security.https_only_mode" = true;
+        "network.trr.mode" = 3;
+        "network.trr.uri" = "https://mozilla.cloudflare-dns.com/dns-query";
+        "privacy.history.custom" = false;
+        "privacy.trackingprotection.allow_list.convenience.enabled" = true;
+        "zen.tabs.select-recently-used-on-close" = false;
+        "zen.tabs.show-newtab-vertical" = false;
+        "zen.view.show-newtab-button-top" = false;
+        "zen.workspaces.continue-where-left-off" = true;
 
-        "browser.newtabpage.enabled" = false;
-
-        "privacy.resistFingerprinting" = true;
+        "browser.contentblocking.category" = "strict";
+        "network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation" = true;
+        "network.lna.blocking" = true;
+        "privacy.annotate_channels.strict_list.enabled" = true;
+        "privacy.bounceTrackingProtection.mode" = 1;
+        "privacy.fingerprintingProtection" = true;
+        "privacy.query_stripping.enabled" = true;
+        "privacy.query_stripping.enabled.pbmode" = true;
+        "privacy.trackingprotection.consentmanager.skip.pbmode.enabled" = false;
+        "privacy.trackingprotection.emailtracking.enabled" = true;
         "privacy.trackingprotection.enabled" = true;
-
-        "geo.enabled" = false;
-        "dom.webnotifications.enabled" = false;
-
-        "signon.rememberSignons" = false;
-
-        "toolkit.telemetry.enabled" = false;
+        "privacy.trackingprotection.socialtracking.enabled" = true;
       };
-
-      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-        ublock-origin
-        firefox-multi-account-containers
-        noscript
-      ];
     };
   };
-
-  home.sessionVariables.BROWSER = "zen";
 }

home/programs/zen/default.nix.old

@@ -0,0 +1,62 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  programs.zen-browser = {
+    enable = true;
+
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      DisablePocket = true;
+
+      OfferToSaveLogins = false;
+      PasswordManagerEnabled = false;
+
+      AutofillAddressEnabled = false;
+      AutofillCreditCardEnabled = false;
+
+      DontCheckDefaultBrowser = true;
+
+      DNSOverHTTPS = {
+        Enabled = true;
+        ProviderURL = "https://dns.quad9.net/dns-query";
+        Locked = true;
+      };
+    };
+
+    profiles.default = {
+      search = {
+        force = true;
+        default = "Startpage";
+      };
+
+      settings = {
+        "browser.startup.homepage" = "https://duckduckgo.com";
+
+        "browser.newtabpage.enabled" = false;
+
+        "privacy.resistFingerprinting" = true;
+        "privacy.trackingprotection.enabled" = true;
+
+        "geo.enabled" = false;
+        "dom.webnotifications.enabled" = false;
+
+        "signon.rememberSignons" = false;
+
+        "toolkit.telemetry.enabled" = false;
+      };
+
+      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+        ublock-origin
+        firefox-multi-account-containers
+        noscript
+      ];
+    };
+  };
+
+  home.sessionVariables.BROWSER = "zen";
+}

home/system/hyprland/default.nix

@@ -154,7 +154,9 @@ in {
 
         kb_options = "caps:escape";
         follow_mouse = 1;
-        sensitivity = 0.5;
+        sensitivity = 0.0; # or whatever speed you prefer
+        accel_profile = "flat";
+
         repeat_delay = 300;
         repeat_rate = 50;
         numlock_by_default = true;

hosts/home-pc/configuration.nix

@@ -4,6 +4,7 @@
 		# System configuration
 		# ─────────────────────────────────────────────────────────────
     ../../nixos/audio.nix
+    ../../nixos/docker.nix
     ../../nixos/bluetooth.nix
     ../../nixos/fonts.nix
     ../../nixos/home-manager.nix
@@ -30,6 +31,7 @@
     ./variables.nix
   ];
 
+  programs.nix-ld.enable = true; #Dynamic Linking
   home-manager.users."${config.var.username}" = import ./home.nix;
 	services.flatpak.enable = true;
   # Don't touch this

hosts/home-pc/hardware-configuration.nix

@@ -1,45 +1,50 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/5dbf85d3-d236-4af8-b489-d6066bfe1eb7";
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/4eb8dac5-6a57-4cfd-a5f7-e0a74e72d9db";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/4eb8dac5-6a57-4cfd-a5f7-e0a74e72d9db";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/4eb8dac5-6a57-4cfd-a5f7-e0a74e72d9db";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/E823-261A";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  fileSystems."/mnt/hdd" = {
+    device = "/dev/disk/by-uuid/8b6e4527-2ea7-4f08-9f86-12a766e39313";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/043E-1755";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/d0243bc0-10fb-4fa6-9933-945eb2965385"; }
     ];
-  };
-
-  swapDevices = [];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/home-pc/home.nix

@@ -28,6 +28,7 @@
     ../../home/programs/group/dev.nix
     ../../home/programs/group/misc.nix
 		../../home/programs/group/gaming-apps.nix
+    ../../home/programs/group/music-apps.nix
 
     # ─────────────────────────────────────────────────────────────
     # System

hosts/laptop/configuration.nix

@@ -25,6 +25,7 @@
 
 	];
 
+	programs.nix-ld.enable = true; #Dynamic Linking
 	home-manager.users."${config.var.username}" = import ./home.nix;
 	services.flatpak.enable = true;
 	# Don't touch this

hosts/laptop/home.nix

@@ -14,6 +14,7 @@
     ../../home/programs/nix-utils
     ../../home/programs/spotatui
     ../../home/programs/yazi
+    ../../home/programs/zen
 
 		# ─────────────────────────────────────────────────────────────
     # Gaming

nixos/nix.nix

@@ -22,9 +22,12 @@ in {
       ];
     }
   ];
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowBroken = false;
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      allowBroken = false;
+    };
+    overlays = [inputs.nur.overlays.default];
   };
   nix = {
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];

nixos/users.nix

@@ -16,6 +16,8 @@ in {
       extraGroups = [
         "networkmanager"
         "wheel"
+        "video"
+        "render"
       ];
     };
   };