mirror of
https://codeberg.org/muon/home.git
synced 2026-03-08 03:25:16 +00:00
Update nix
This commit is contained in:
parent
ae89fe77ca
commit
600496e419
4 changed files with 253 additions and 252 deletions
36
flake.lock
generated
36
flake.lock
generated
|
|
@ -233,11 +233,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765980955,
|
||||
"narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
|
||||
"lastModified": 1766553851,
|
||||
"narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
|
||||
"rev": "7eca7f7081036a7b740090994c9ec543927f89a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -410,11 +410,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1765779637,
|
||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
||||
"lastModified": 1766309749,
|
||||
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
||||
"rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -493,11 +493,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765894398,
|
||||
"narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=",
|
||||
"lastModified": 1766596669,
|
||||
"narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=",
|
||||
"owner": "NotAShelf",
|
||||
"repo": "nvf",
|
||||
"rev": "cd81bbb904571b538397d72a29e4c84b98480ee1",
|
||||
"rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -527,11 +527,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765836173,
|
||||
"narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
|
||||
"lastModified": 1766289575,
|
||||
"narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
|
||||
"rev": "9836912e37aef546029e48c8749834735a6b9dad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -580,11 +580,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765897595,
|
||||
"narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=",
|
||||
"lastModified": 1766603026,
|
||||
"narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "e6829552d4bb659ebab00f08c61d8c62754763f3",
|
||||
"rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -748,11 +748,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766032508,
|
||||
"narHash": "sha256-7MHR94mOoa5/s4NBrpsXWaNNzrZyRC0OwRwEobp1wzI=",
|
||||
"lastModified": 1766614843,
|
||||
"narHash": "sha256-upUQfQv7Xiy5IZzfsVOL0lH4A/wuUQjG2jlzmBmVuwU=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "a7f58a9e3481804915d75a9c86527bca6d9dafb3",
|
||||
"rev": "b01d17acbec3d1b76fecf500289d8509da202585",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
# laptop
|
||||
muop = utils.mkHost ./hosts/muop/configuration.nix;
|
||||
|
||||
# vps
|
||||
# server
|
||||
muho = utils.mkHost ./hosts/muho/configuration.nix;
|
||||
|
||||
# vps
|
||||
|
|
|
|||
|
|
@ -2,255 +2,250 @@
|
|||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osConfig,
|
||||
system,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
color = config.lib.stylix.colors.withHashtag;
|
||||
in
|
||||
with lib; {
|
||||
options.mods.zen.enable =
|
||||
lib.mkEnableOption "enables zen browser";
|
||||
}:
|
||||
with lib; {
|
||||
options.mods.zen.enable = mkEnableOption "enables zen browser";
|
||||
|
||||
imports = [
|
||||
inputs.zen-browser.homeModules.beta
|
||||
# or inputs.zen-browser.homeModules.twilight
|
||||
# or inputs.zen-browser.homeModules.twilight-official
|
||||
];
|
||||
imports = [
|
||||
inputs.zen-browser.homeModules.beta
|
||||
# or inputs.zen-browser.homeModules.twilight
|
||||
# or inputs.zen-browser.homeModules.twilight-official
|
||||
];
|
||||
|
||||
config = lib.mkIf config.mods.zen.enable {
|
||||
stylix.targets.zen-browser.profileNames = [];
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
config = mkIf config.mods.zen.enable {
|
||||
programs.zen-browser = {
|
||||
enable = true;
|
||||
|
||||
policies = let
|
||||
mkLockedAttrs = builtins.mapAttrs (_: value: {
|
||||
Value = value;
|
||||
Status = "locked";
|
||||
});
|
||||
policies = let
|
||||
mkLockedAttrs = builtins.mapAttrs (_: value: {
|
||||
Value = value;
|
||||
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 = {
|
||||
id,
|
||||
pinned ? false,
|
||||
}: let
|
||||
base = {
|
||||
install_url = mkPluginUrl id;
|
||||
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;
|
||||
mkExtensionEntry = {
|
||||
id,
|
||||
pinned ? false,
|
||||
}: let
|
||||
base = {
|
||||
install_url = mkPluginUrl id;
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
ExtensionSettings = mkExtensionSettings {
|
||||
"uBlock0@raymondhill.net" = mkExtensionEntry {
|
||||
id = "ublock-origin";
|
||||
pinned = true;
|
||||
};
|
||||
"{85860b32-02a8-431a-b2b1-40fbd64c9c69}" = "github-file-icons";
|
||||
"{74145f27-f039-47ce-a470-a662b129930a}" = "clearurls";
|
||||
"github-no-more@ihatereality.space" = "github-no-more";
|
||||
"github-repository-size@pranavmangal" = "gh-repo-size";
|
||||
"@searchengineadremover" = "searchengineadremover";
|
||||
"jid1-BoFifL9Vbdl2zQ@jetpack" = "decentraleyes";
|
||||
"{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
|
||||
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 {
|
||||
"uBlock0@raymondhill.net" = mkExtensionEntry {
|
||||
id = "ublock-origin";
|
||||
pinned = true;
|
||||
};
|
||||
Preferences = mkLockedAttrs {
|
||||
"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;
|
||||
"{85860b32-02a8-431a-b2b1-40fbd64c9c69}" = "github-file-icons";
|
||||
"{74145f27-f039-47ce-a470-a662b129930a}" = "clearurls";
|
||||
"github-no-more@ihatereality.space" = "github-no-more";
|
||||
"github-repository-size@pranavmangal" = "gh-repo-size";
|
||||
"@searchengineadremover" = "searchengineadremover";
|
||||
"jid1-BoFifL9Vbdl2zQ@jetpack" = "decentraleyes";
|
||||
"{d7742d87-e61d-4b78-b8a1-b469842139fa}" = "vimium-ff";
|
||||
};
|
||||
Preferences = mkLockedAttrs {
|
||||
"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.firstparty.isolate" = true;
|
||||
"network.cookie.cookieBehavior" = 5;
|
||||
"dom.battery.enabled" = false;
|
||||
"privacy.resistFingerprinting" = true;
|
||||
"privacy.firstparty.isolate" = true;
|
||||
"network.cookie.cookieBehavior" = 5;
|
||||
"dom.battery.enabled" = false;
|
||||
|
||||
"gfx.webrender.all" = true;
|
||||
"network.http.http3.enabled" = true;
|
||||
"gfx.webrender.all" = 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 {
|
||||
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;
|
||||
containersForce = true;
|
||||
containers = {
|
||||
Work = {
|
||||
color = "blue";
|
||||
icon = "briefcase";
|
||||
id = 2;
|
||||
};
|
||||
};
|
||||
|
||||
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/";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
spacesForce = true;
|
||||
spaces = {
|
||||
"Personal" = {
|
||||
id = "572910e1-4468-4832-a869-0b3a93e2f165";
|
||||
# icon = "";
|
||||
position = 1000;
|
||||
};
|
||||
|
||||
pinsForce = true;
|
||||
pins = {
|
||||
"GitHub" = {
|
||||
id = "48e8a119-5a14-4826-9545-91c8e8dd3bf6";
|
||||
workspace = spaces."Work".id;
|
||||
url = "https://github.com";
|
||||
position = 101;
|
||||
isEssential = false;
|
||||
};
|
||||
"Work" = {
|
||||
id = "ec287d7f-d910-4860-b400-513f269dee77";
|
||||
# icon = "briefcase";
|
||||
position = 1001;
|
||||
container = containers."Work".id;
|
||||
};
|
||||
};
|
||||
|
||||
containersForce = true;
|
||||
containers = {
|
||||
Work = {
|
||||
color = "blue";
|
||||
icon = "briefcase";
|
||||
id = 2;
|
||||
search = {
|
||||
force = true;
|
||||
default = "searx";
|
||||
engines = let
|
||||
nixSnowflakeIcon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
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"];
|
||||
};
|
||||
};
|
||||
|
||||
spacesForce = true;
|
||||
spaces = {
|
||||
"Personal" = {
|
||||
id = "572910e1-4468-4832-a869-0b3a93e2f165";
|
||||
# icon = "";
|
||||
position = 1000;
|
||||
"Nix Options" = {
|
||||
urls = [
|
||||
{
|
||||
template = "https://search.nixos.org/options";
|
||||
params = [
|
||||
{
|
||||
name = "channel";
|
||||
value = "unstable";
|
||||
}
|
||||
{
|
||||
name = "query";
|
||||
value = "{searchTerms}";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
icon = nixSnowflakeIcon;
|
||||
definedAliases = ["nop"];
|
||||
};
|
||||
"Work" = {
|
||||
id = "ec287d7f-d910-4860-b400-513f269dee77";
|
||||
# icon = "briefcase";
|
||||
position = 1001;
|
||||
container = containers."Work".id;
|
||||
"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"];
|
||||
};
|
||||
};
|
||||
|
||||
search = {
|
||||
force = true;
|
||||
default = "searx";
|
||||
engines = let
|
||||
nixSnowflakeIcon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
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 = [
|
||||
{
|
||||
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";
|
||||
"searx" = {
|
||||
urls = [
|
||||
{
|
||||
template = "https://search.muon.host/search";
|
||||
params = [
|
||||
{
|
||||
name = "q";
|
||||
value = "{searchTerms}";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
icon = "magnifying-glass";
|
||||
definedAliases = ["srx"];
|
||||
};
|
||||
bing.metaData.hidden = "true";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
stylix.targets.zen-browser.profileNames = ["default"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.mods.desktop;
|
||||
in {
|
||||
imports = [
|
||||
|
|
@ -17,11 +20,14 @@ in {
|
|||
mods.xorg.enable = true;
|
||||
mods.sound.enable = true;
|
||||
mods.desktop.wayland.enable = lib.mkDefault false;
|
||||
programs.hyprland = if cfg.wayland.enable then {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
} else {
|
||||
enable = false;
|
||||
};
|
||||
programs.hyprland =
|
||||
if cfg.wayland.enable
|
||||
then {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
}
|
||||
else {
|
||||
enable = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue