Update nix

This commit is contained in:
muon 2025-12-25 15:13:58 +00:00
parent ae89fe77ca
commit 600496e419
4 changed files with 253 additions and 252 deletions

36
flake.lock generated
View file

@ -233,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765980955, "lastModified": 1766553851,
"narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", "narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "rev": "7eca7f7081036a7b740090994c9ec543927f89a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,11 +410,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766309749,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -493,11 +493,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1765894398, "lastModified": 1766596669,
"narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=", "narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=",
"owner": "NotAShelf", "owner": "NotAShelf",
"repo": "nvf", "repo": "nvf",
"rev": "cd81bbb904571b538397d72a29e4c84b98480ee1", "rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +527,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765836173, "lastModified": 1766289575,
"narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", "rev": "9836912e37aef546029e48c8749834735a6b9dad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -580,11 +580,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1765897595, "lastModified": 1766603026,
"narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,11 +748,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766032508, "lastModified": 1766614843,
"narHash": "sha256-7MHR94mOoa5/s4NBrpsXWaNNzrZyRC0OwRwEobp1wzI=", "narHash": "sha256-upUQfQv7Xiy5IZzfsVOL0lH4A/wuUQjG2jlzmBmVuwU=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "a7f58a9e3481804915d75a9c86527bca6d9dafb3", "rev": "b01d17acbec3d1b76fecf500289d8509da202585",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -52,7 +52,7 @@
# laptop # laptop
muop = utils.mkHost ./hosts/muop/configuration.nix; muop = utils.mkHost ./hosts/muop/configuration.nix;
# vps # server
muho = utils.mkHost ./hosts/muho/configuration.nix; muho = utils.mkHost ./hosts/muho/configuration.nix;
# vps # vps

View file

@ -2,255 +2,250 @@
pkgs, pkgs,
lib, lib,
config, config,
osConfig,
system,
inputs, inputs,
... ...
}: let }:
color = config.lib.stylix.colors.withHashtag; with lib; {
in options.mods.zen.enable = mkEnableOption "enables zen browser";
with lib; {
options.mods.zen.enable =
lib.mkEnableOption "enables zen browser";
imports = [ imports = [
inputs.zen-browser.homeModules.beta inputs.zen-browser.homeModules.beta
# or inputs.zen-browser.homeModules.twilight # or inputs.zen-browser.homeModules.twilight
# or inputs.zen-browser.homeModules.twilight-official # or inputs.zen-browser.homeModules.twilight-official
]; ];
config = lib.mkIf config.mods.zen.enable { config = mkIf config.mods.zen.enable {
stylix.targets.zen-browser.profileNames = []; programs.zen-browser = {
programs.zen-browser = { enable = true;
enable = true;
policies = let policies = let
mkLockedAttrs = builtins.mapAttrs (_: value: { mkLockedAttrs = builtins.mapAttrs (_: value: {
Value = value; Value = value;
Status = "locked"; Status = "locked";
}); });
mkPluginUrl = id: "https://addons.mozilla.org/firefox/downloads/latest/${id}/latest.xpi"; mkPluginUrl = id: "https://addons.mozilla.org/firefox/downloads/latest/${id}/latest.xpi";
mkExtensionEntry = { mkExtensionEntry = {
id, id,
pinned ? false, pinned ? false,
}: let }: let
base = { base = {
install_url = mkPluginUrl id; install_url = mkPluginUrl id;
installation_mode = "force_installed"; installation_mode = "force_installed";
};
in
if pinned
then base // {default_area = "navbar";}
else base;
mkExtensionSettings = builtins.mapAttrs (_: entry:
if builtins.isAttrs entry
then entry
else mkExtensionEntry {id = entry;});
in {
AutofillAddressEnabled = false;
AutofillCreditCardEnabled = false;
DisableAppUpdate = true;
DisableFeedbackCommands = true;
DisableFirefoxStudies = true;
DisablePocket = true;
DisableTelemetry = true;
DontCheckDefaultBrowser = true;
OfferToSaveLogins = false;
EnableTrackingProtection = {
Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
}; };
ExtensionSettings = mkExtensionSettings { in
"uBlock0@raymondhill.net" = mkExtensionEntry { if pinned
id = "ublock-origin"; then base // {default_area = "navbar";}
pinned = true; else base;
};
"{85860b32-02a8-431a-b2b1-40fbd64c9c69}" = "github-file-icons"; mkExtensionSettings = builtins.mapAttrs (_: entry:
"{74145f27-f039-47ce-a470-a662b129930a}" = "clearurls"; if builtins.isAttrs entry
"github-no-more@ihatereality.space" = "github-no-more"; then entry
"github-repository-size@pranavmangal" = "gh-repo-size"; else mkExtensionEntry {id = entry;});
"@searchengineadremover" = "searchengineadremover"; in {
"jid1-BoFifL9Vbdl2zQ@jetpack" = "decentraleyes"; AutofillAddressEnabled = false;
"{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff"; AutofillCreditCardEnabled = false;
DisableAppUpdate = true;
DisableFeedbackCommands = true;
DisableFirefoxStudies = true;
DisablePocket = true;
DisableTelemetry = true;
DontCheckDefaultBrowser = true;
OfferToSaveLogins = false;
EnableTrackingProtection = {
Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
};
ExtensionSettings = mkExtensionSettings {
"uBlock0@raymondhill.net" = mkExtensionEntry {
id = "ublock-origin";
pinned = true;
}; };
Preferences = mkLockedAttrs { "{85860b32-02a8-431a-b2b1-40fbd64c9c69}" = "github-file-icons";
"browser.aboutConfig.showWarning" = false; "{74145f27-f039-47ce-a470-a662b129930a}" = "clearurls";
"browser.tabs.warnOnClose" = false; "github-no-more@ihatereality.space" = "github-no-more";
"media.videocontrols.picture-in-picture.video-toggle.enabled" = true; "github-repository-size@pranavmangal" = "gh-repo-size";
# Disable swipe gestures (Browser:BackOrBackDuplicate, Browser:ForwardOrForwardDuplicate) "@searchengineadremover" = "searchengineadremover";
"browser.gesture.swipe.left" = ""; "jid1-BoFifL9Vbdl2zQ@jetpack" = "decentraleyes";
"browser.gesture.swipe.right" = ""; "{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
"browser.tabs.hoverPreview.enabled" = true; };
"browser.newtabpage.activity-stream.feeds.topsites" = false; Preferences = mkLockedAttrs {
"browser.topsites.contile.enabled" = false; "browser.aboutConfig.showWarning" = false;
"browser.tabs.warnOnClose" = false;
"media.videocontrols.picture-in-picture.video-toggle.enabled" = true;
# Disable swipe gestures (Browser:BackOrBackDuplicate, Browser:ForwardOrForwardDuplicate)
"browser.gesture.swipe.left" = "";
"browser.gesture.swipe.right" = "";
"browser.tabs.hoverPreview.enabled" = true;
"browser.newtabpage.activity-stream.feeds.topsites" = false;
"browser.topsites.contile.enabled" = false;
"privacy.resistFingerprinting" = true; "privacy.resistFingerprinting" = true;
"privacy.firstparty.isolate" = true; "privacy.firstparty.isolate" = true;
"network.cookie.cookieBehavior" = 5; "network.cookie.cookieBehavior" = 5;
"dom.battery.enabled" = false; "dom.battery.enabled" = false;
"gfx.webrender.all" = true; "gfx.webrender.all" = true;
"network.http.http3.enabled" = true; "network.http.http3.enabled" = true;
};
};
profiles.default = rec {
settings = {
"zen.workspaces.continue-where-left-off" = true;
"zen.workspaces.natural-scroll" = true;
"zen.view.compact.hide-tabbar" = true;
"zen.view.compact.hide-toolbar" = true;
"zen.view.compact.animate-sidebar" = false;
"zen.welcome-screen.seen" = true;
};
bookmarks = {
force = true;
settings = [
{
name = "Nix sites";
toolbar = true;
bookmarks = [
{
name = "homepage";
url = "https://nixos.org/";
}
{
name = "wiki";
tags = ["wiki" "nix"];
url = "https://wiki.nixos.org/";
}
];
}
];
};
pinsForce = true;
pins = {
"GitHub" = {
id = "48e8a119-5a14-4826-9545-91c8e8dd3bf6";
workspace = spaces."Work".id;
url = "https://github.com";
position = 101;
isEssential = false;
}; };
}; };
profiles.default = rec { containersForce = true;
settings = { containers = {
"zen.workspaces.continue-where-left-off" = true; Work = {
"zen.workspaces.natural-scroll" = true; color = "blue";
"zen.view.compact.hide-tabbar" = true; icon = "briefcase";
"zen.view.compact.hide-toolbar" = true; id = 2;
"zen.view.compact.animate-sidebar" = false;
"zen.welcome-screen.seen" = true;
}; };
};
bookmarks = { spacesForce = true;
force = true; spaces = {
settings = [ "Personal" = {
{ id = "572910e1-4468-4832-a869-0b3a93e2f165";
name = "Nix sites"; # icon = "";
toolbar = true; position = 1000;
bookmarks = [
{
name = "homepage";
url = "https://nixos.org/";
}
{
name = "wiki";
tags = ["wiki" "nix"];
url = "https://wiki.nixos.org/";
}
];
}
];
}; };
"Work" = {
pinsForce = true; id = "ec287d7f-d910-4860-b400-513f269dee77";
pins = { # icon = "briefcase";
"GitHub" = { position = 1001;
id = "48e8a119-5a14-4826-9545-91c8e8dd3bf6"; container = containers."Work".id;
workspace = spaces."Work".id;
url = "https://github.com";
position = 101;
isEssential = false;
};
}; };
};
containersForce = true; search = {
containers = { force = true;
Work = { default = "searx";
color = "blue"; engines = let
icon = "briefcase"; nixSnowflakeIcon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
id = 2; in {
"Nix Packages" = {
urls = [
{
template = "https://search.nixos.org/packages";
params = [
{
name = "type";
value = "packages";
}
{
name = "channel";
value = "unstable";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = nixSnowflakeIcon;
definedAliases = ["np"];
}; };
}; "Nix Options" = {
urls = [
spacesForce = true; {
spaces = { template = "https://search.nixos.org/options";
"Personal" = { params = [
id = "572910e1-4468-4832-a869-0b3a93e2f165"; {
# icon = ""; name = "channel";
position = 1000; value = "unstable";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = nixSnowflakeIcon;
definedAliases = ["nop"];
}; };
"Work" = { "Home Manager Options" = {
id = "ec287d7f-d910-4860-b400-513f269dee77"; urls = [
# icon = "briefcase"; {
position = 1001; template = "https://home-manager-options.extranix.com/";
container = containers."Work".id; params = [
{
name = "query";
value = "{searchTerms}";
}
{
name = "release";
value = "master"; # unstable
}
];
}
];
icon = nixSnowflakeIcon;
definedAliases = ["hm"];
}; };
}; "searx" = {
urls = [
search = { {
force = true; template = "https://search.muon.host/search";
default = "searx"; params = [
engines = let {
nixSnowflakeIcon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; name = "q";
in { value = "{searchTerms}";
"Nix Packages" = { }
urls = [ ];
{ }
template = "https://search.nixos.org/packages"; ];
params = [ icon = "magnifying-glass";
{ definedAliases = ["srx"];
name = "type";
value = "packages";
}
{
name = "channel";
value = "unstable";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = nixSnowflakeIcon;
definedAliases = ["np"];
};
"Nix Options" = {
urls = [
{
template = "https://search.nixos.org/options";
params = [
{
name = "channel";
value = "unstable";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = nixSnowflakeIcon;
definedAliases = ["nop"];
};
"Home Manager Options" = {
urls = [
{
template = "https://home-manager-options.extranix.com/";
params = [
{
name = "query";
value = "{searchTerms}";
}
{
name = "release";
value = "master"; # unstable
}
];
}
];
icon = nixSnowflakeIcon;
definedAliases = ["hm"];
};
"searx" = {
urls = [
{
template = "https://search.muon.host/search";
params = [
{
name = "q";
value = "{searchTerms}";
}
];
}
];
icon = "magnifying-glass";
definedAliases = ["srx"];
};
bing.metaData.hidden = "true";
}; };
bing.metaData.hidden = "true";
}; };
}; };
}; };
}; };
} stylix.targets.zen-browser.profileNames = ["default"];
};
}

View file

@ -1,5 +1,8 @@
{ pkgs, lib, config, ... }: {
let lib,
config,
...
}: let
cfg = config.mods.desktop; cfg = config.mods.desktop;
in { in {
imports = [ imports = [
@ -17,11 +20,14 @@ in {
mods.xorg.enable = true; mods.xorg.enable = true;
mods.sound.enable = true; mods.sound.enable = true;
mods.desktop.wayland.enable = lib.mkDefault false; mods.desktop.wayland.enable = lib.mkDefault false;
programs.hyprland = if cfg.wayland.enable then { programs.hyprland =
enable = true; if cfg.wayland.enable
xwayland.enable = true; then {
} else { enable = true;
enable = false; xwayland.enable = true;
}; }
else {
enable = false;
};
}; };
} }