Nettoyage et mise à jour
This commit is contained in:
@@ -21,11 +21,10 @@ in
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
languagePacks = [ "fr-FR" ];
|
||||
policies = {
|
||||
DisablePocket = true;
|
||||
ExtensionSettings =
|
||||
{ }
|
||||
+ mkif cfg.privacy {
|
||||
policies = mkMerge [
|
||||
{
|
||||
DisablePocket = true;
|
||||
ExtensionSettings = mkIf cfg.privacy {
|
||||
"uBlock0@raymondhill.net" = {
|
||||
default_area = "menupanel";
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
|
||||
@@ -33,70 +32,73 @@ in
|
||||
private_browsing = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
+ mkif cfg.privacy {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
EnableTrackingProtection = true;
|
||||
};
|
||||
}
|
||||
(mkIf cfg.privacy {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
EnableTrackingProtection = true;
|
||||
})
|
||||
];
|
||||
profiles.default = {
|
||||
settings = {
|
||||
# Vertical tabs
|
||||
"sidebar.revamp" = true;
|
||||
"sidebar.verticalTabs" = true;
|
||||
"sidebar.new-sidebar.has-used" = true;
|
||||
"sidebar.main.tools" = "history,passwords";
|
||||
"sidebar.backupState" = {
|
||||
"panelOpen" = true;
|
||||
"launcherExpanded" = false;
|
||||
"launcherVisible" = true;
|
||||
};
|
||||
# No bookmarks
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
# New tab page
|
||||
"browser.newtabpage.activity-stream.feeds.topsites" = false;
|
||||
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
|
||||
"browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false;
|
||||
}
|
||||
+ mkif cfg.privacy {
|
||||
# Disable some telemetry
|
||||
"app.shield.optoutstudies.enabled" = false;
|
||||
"browser.discovery.enabled" = false;
|
||||
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
||||
"browser.newtabpage.activity-stream.telemetry" = false;
|
||||
"browser.ping-centre.telemetry" = false;
|
||||
"datareporting.healthreport.service.enabled" = false;
|
||||
"datareporting.healthreport.uploadEnabled" = false;
|
||||
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||
"datareporting.sessions.current.clean" = true;
|
||||
"devtools.onboarding.telemetry.logged" = false;
|
||||
"toolkit.telemetry.archive.enabled" = false;
|
||||
"toolkit.telemetry.bhrPing.enabled" = false;
|
||||
"toolkit.telemetry.enabled" = false;
|
||||
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
||||
"toolkit.telemetry.hybridContent.enabled" = false;
|
||||
"toolkit.telemetry.newProfilePing.enabled" = false;
|
||||
"toolkit.telemetry.prompted" = 2;
|
||||
"toolkit.telemetry.rejected" = true;
|
||||
"toolkit.telemetry.reportingpolicy.firstRun" = false;
|
||||
"toolkit.telemetry.server" = "";
|
||||
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
||||
"toolkit.telemetry.unified" = false;
|
||||
"toolkit.telemetry.unifiedIsOptIn" = false;
|
||||
"toolkit.telemetry.updatePing.enabled" = false;
|
||||
}
|
||||
+ mkif cfg.sanity {
|
||||
# Sanitize
|
||||
"SanitizeOnShutdown" = {
|
||||
"Locked" = false;
|
||||
"Cache" = true;
|
||||
"History" = true;
|
||||
"Cookies" = true;
|
||||
"Sessions" = true;
|
||||
"FormData" = true;
|
||||
"SiteSettings" = true;
|
||||
};
|
||||
};
|
||||
settings = mkMerge [
|
||||
{
|
||||
# Vertical tabs
|
||||
"sidebar.revamp" = true;
|
||||
"sidebar.verticalTabs" = true;
|
||||
"sidebar.new-sidebar.has-used" = true;
|
||||
"sidebar.main.tools" = "history,passwords";
|
||||
"sidebar.backupState" = {
|
||||
"panelOpen" = true;
|
||||
"launcherExpanded" = false;
|
||||
"launcherVisible" = true;
|
||||
};
|
||||
# No bookmarks
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
# New tab page
|
||||
"browser.newtabpage.activity-stream.feeds.topsites" = false;
|
||||
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
|
||||
"browser.newtabpage.activity-stream.showSponsoredCheckboxes" = false;
|
||||
}
|
||||
(mkIf cfg.privacy {
|
||||
# Disable some telemetry
|
||||
"app.shield.optoutstudies.enabled" = false;
|
||||
"browser.discovery.enabled" = false;
|
||||
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
||||
"browser.newtabpage.activity-stream.telemetry" = false;
|
||||
"browser.ping-centre.telemetry" = false;
|
||||
"datareporting.healthreport.service.enabled" = false;
|
||||
"datareporting.healthreport.uploadEnabled" = false;
|
||||
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||
"datareporting.sessions.current.clean" = true;
|
||||
"devtools.onboarding.telemetry.logged" = false;
|
||||
"toolkit.telemetry.archive.enabled" = false;
|
||||
"toolkit.telemetry.bhrPing.enabled" = false;
|
||||
"toolkit.telemetry.enabled" = false;
|
||||
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
||||
"toolkit.telemetry.hybridContent.enabled" = false;
|
||||
"toolkit.telemetry.newProfilePing.enabled" = false;
|
||||
"toolkit.telemetry.prompted" = 2;
|
||||
"toolkit.telemetry.rejected" = true;
|
||||
"toolkit.telemetry.reportingpolicy.firstRun" = false;
|
||||
"toolkit.telemetry.server" = "";
|
||||
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
||||
"toolkit.telemetry.unified" = false;
|
||||
"toolkit.telemetry.unifiedIsOptIn" = false;
|
||||
"toolkit.telemetry.updatePing.enabled" = false;
|
||||
})
|
||||
(mkIf cfg.sanity {
|
||||
# Sanitize
|
||||
"SanitizeOnShutdown" = {
|
||||
"Locked" = false;
|
||||
"Cache" = true;
|
||||
"History" = true;
|
||||
"Cookies" = true;
|
||||
"Sessions" = true;
|
||||
"FormData" = true;
|
||||
"SiteSettings" = true;
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
{ lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.home.shell.gnome;
|
||||
cfg = config.home.shells.gnome;
|
||||
in
|
||||
{
|
||||
options.home.shell.gnome = {
|
||||
|
||||
options.home.shells.gnome = {
|
||||
enable = mkEnableOption "Gnome service";
|
||||
extensions = {
|
||||
paperwm = mkOption {
|
||||
type = types.bool;
|
||||
@@ -26,15 +31,27 @@ in
|
||||
};
|
||||
|
||||
};
|
||||
config = {
|
||||
dconf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
home.packages = mkMerge [
|
||||
[
|
||||
pkgs.numix-icon-theme
|
||||
pkgs.numix-icon-theme-square
|
||||
]
|
||||
(mkIf cfg.extensions.paperwm [ pkgs.gnomeExtensions.paperwm ])
|
||||
(mkIf cfg.extensions.app-hider [ pkgs.gnomeExtensions.app-hider ])
|
||||
(mkIf cfg.extensions.dash-to-panel [ pkgs.gnomeExtensions.dash-to-panel ])
|
||||
];
|
||||
|
||||
dconf = {
|
||||
enable = true;
|
||||
settings = mkMerge [
|
||||
{
|
||||
# We define the input sources to use the French layout with Mac keyboard variant.
|
||||
"org/gnome/desktop/input-sources" = {
|
||||
sources = [
|
||||
(mkTuple [
|
||||
(lib.hm.gvariant.mkTuple [
|
||||
"xkb"
|
||||
"fr+mac"
|
||||
])
|
||||
@@ -44,6 +61,7 @@ in
|
||||
# We define the interface settings to use a teal accent color and prefer dark color scheme.
|
||||
"org/gnome/desktop/interface" = {
|
||||
accent-color = "teal";
|
||||
icon-theme = "Numix-Square";
|
||||
color-scheme = "prefer-dark";
|
||||
};
|
||||
|
||||
@@ -57,14 +75,14 @@ in
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions =
|
||||
with pkgs.gnomeExtensions;
|
||||
[ ]
|
||||
+ mk-if cfg.extensions.paperwm [ paperwm.extensionUuid ]
|
||||
+ mk-if cfg.extensions.app-hider [ app-hider.extensionUuid ]
|
||||
+ mk-if cfg.extensions.dash-to-panel [ dash-to-panel.extensionUuid ];
|
||||
mkMerge [
|
||||
(mkIf cfg.extensions.paperwm [ paperwm.extensionUuid ])
|
||||
(mkIf cfg.extensions.app-hider [ app-hider.extensionUuid ])
|
||||
(mkIf cfg.extensions.dash-to-panel [ dash-to-panel.extensionUuid ])
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
+ mkIf cfg.extensions.app-hider {
|
||||
(mkIf cfg.extensions.app-hider {
|
||||
"org/gnome/shell/extensions/app-hider" = {
|
||||
hidden-apps = [
|
||||
"nvim.desktop"
|
||||
@@ -73,8 +91,8 @@ in
|
||||
"nixos-manual.desktop"
|
||||
];
|
||||
};
|
||||
}
|
||||
+ mkIf cfg.extensions.dash-to-panel {
|
||||
})
|
||||
(mkIf cfg.extensions.dash-to-panel {
|
||||
"org/gnome/shell/extensions/dash-to-panel" = {
|
||||
prefs-opened = false;
|
||||
isolate-monitors = true;
|
||||
@@ -97,8 +115,8 @@ in
|
||||
highlight-appicon-hover = true;
|
||||
hide-overview-on-startup = true;
|
||||
};
|
||||
}
|
||||
+ mkIf cfg.extensions.paperwm {
|
||||
})
|
||||
(mkIf cfg.extensions.paperwm {
|
||||
"org/gnome/shell/extensions/paperwm" = {
|
||||
show-window-position-bar = false;
|
||||
show-workspace-indicator = false;
|
||||
@@ -117,8 +135,8 @@ in
|
||||
name = "Université";
|
||||
index = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{ lib, config, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.os.bluetooth;
|
||||
in
|
||||
{
|
||||
options.os.bluetooth = {
|
||||
enable = mkEnableOption "System networks manager service";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,5 @@ in
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,12 +32,13 @@ in
|
||||
|
||||
systemPackages =
|
||||
with pkgs;
|
||||
[ nautilus ]
|
||||
++ [
|
||||
[
|
||||
nautilus
|
||||
loupe
|
||||
papers
|
||||
simple-scan
|
||||
];
|
||||
]
|
||||
++ (lib.optional config.os.flatpak.enable gnome-software);
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user