This commit is contained in:
Kyattsukuro 2026-05-20 14:23:31 +02:00
parent c0f9dd84aa
commit c5f84b4fa2
6 changed files with 136 additions and 111 deletions

File diff suppressed because one or more lines are too long

View File

@ -23,7 +23,7 @@ user_pref("browser.download.viewableInternally.typeWasRegistered.avif", true);
user_pref("browser.download.viewableInternally.typeWasRegistered.webp", true); user_pref("browser.download.viewableInternally.typeWasRegistered.webp", true);
user_pref("browser.engagement.downloads-button.has-used", true); user_pref("browser.engagement.downloads-button.has-used", true);
user_pref("browser.engagement.sidebar-button.has-used", true); user_pref("browser.engagement.sidebar-button.has-used", true);
user_pref("browser.migration.version", 163); user_pref("browser.migration.version", 166);
user_pref("browser.ml.enable", true); user_pref("browser.ml.enable", true);
user_pref("browser.newtabpage.activity-stream.impressionId", "{8bf07f56-9270-4fc4-8320-132b59d9c548}"); user_pref("browser.newtabpage.activity-stream.impressionId", "{8bf07f56-9270-4fc4-8320-132b59d9c548}");
user_pref("browser.newtabpage.storageVersion", 1); user_pref("browser.newtabpage.storageVersion", 1);
@ -46,9 +46,9 @@ user_pref("browser.safebrowsing.provider.mozilla.lastupdatetime", "1778261332854
user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1778282932854"); user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1778282932854");
user_pref("browser.search.totalSearches", 98); user_pref("browser.search.totalSearches", 98);
user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20251027123126"); user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20251027123126");
user_pref("browser.shell.mostRecentDateSetAsDefault", "1778261332"); user_pref("browser.shell.mostRecentDateSetAsDefault", "1779279178");
user_pref("browser.startup.couldRestoreSession.count", 2); user_pref("browser.startup.couldRestoreSession.count", 2);
user_pref("browser.startup.lastColdStartupCheck", 1778261333); user_pref("browser.startup.lastColdStartupCheck", 1779279178);
user_pref("browser.termsofuse.prefMigrationCheck", true); user_pref("browser.termsofuse.prefMigrationCheck", true);
user_pref("browser.toolbarbuttons.introduced.sidebar-button", true); user_pref("browser.toolbarbuttons.introduced.sidebar-button", true);
user_pref("browser.toolbars.bookmarks.visibility", "never"); user_pref("browser.toolbars.bookmarks.visibility", "never");
@ -76,7 +76,7 @@ user_pref("devtools.performance.recording.threads", "[\"GeckoMain\",\"Compositor
user_pref("devtools.toolsidebar-height.inspector", 350); user_pref("devtools.toolsidebar-height.inspector", 350);
user_pref("devtools.toolsidebar-width.inspector", 700); user_pref("devtools.toolsidebar-width.inspector", 700);
user_pref("devtools.toolsidebar-width.inspector.splitsidebar", 350); user_pref("devtools.toolsidebar-width.inspector.splitsidebar", 350);
user_pref("distribution.iniFile.exists.appversion", "148.0-1"); user_pref("distribution.iniFile.exists.appversion", "150.0.3-1");
user_pref("distribution.iniFile.exists.value", true); user_pref("distribution.iniFile.exists.value", true);
user_pref("distribution.nixos.bookmarksProcessed", true); user_pref("distribution.nixos.bookmarksProcessed", true);
user_pref("dom.forms.autocomplete.formautofill", true); user_pref("dom.forms.autocomplete.formautofill", true);
@ -89,9 +89,9 @@ user_pref("extensions.colorway-builtin-themes-cleanup", 1);
user_pref("extensions.databaseSchema", 37); user_pref("extensions.databaseSchema", 37);
user_pref("extensions.getAddons.cache.lastUpdate", 1778186855); user_pref("extensions.getAddons.cache.lastUpdate", 1778186855);
user_pref("extensions.getAddons.databaseSchema", 6); user_pref("extensions.getAddons.databaseSchema", 6);
user_pref("extensions.lastAppBuildId", "20260216153405"); user_pref("extensions.lastAppBuildId", "20260511200624");
user_pref("extensions.lastAppVersion", "148.0-1"); user_pref("extensions.lastAppVersion", "150.0.3-1");
user_pref("extensions.lastPlatformVersion", "148.0"); user_pref("extensions.lastPlatformVersion", "150.0.3");
user_pref("extensions.pendingOperations", false); user_pref("extensions.pendingOperations", false);
user_pref("extensions.pictureinpicture.enable_picture_in_picture_overrides", true); user_pref("extensions.pictureinpicture.enable_picture_in_picture_overrides", true);
user_pref("extensions.quarantinedDomains.list", "autoatendimento.bb.com.br,ibpf.sicredi.com.br,ibpj.sicredi.com.br,internetbanking.caixa.gov.br,www.ib12.bradesco.com.br,www2.bancobrasil.com.br"); user_pref("extensions.quarantinedDomains.list", "autoatendimento.bb.com.br,ibpf.sicredi.com.br,ibpj.sicredi.com.br,internetbanking.caixa.gov.br,www.ib12.bradesco.com.br,www2.bancobrasil.com.br");
@ -100,8 +100,6 @@ user_pref("extensions.ui.dictionary.hidden", true);
user_pref("extensions.ui.lastCategory", "addons://list/extension"); user_pref("extensions.ui.lastCategory", "addons://list/extension");
user_pref("extensions.ui.locale.hidden", true); user_pref("extensions.ui.locale.hidden", true);
user_pref("extensions.ui.sitepermission.hidden", true); user_pref("extensions.ui.sitepermission.hidden", true);
user_pref("extensions.webcompat.enable_interventions", true);
user_pref("extensions.webcompat.enable_shims", true);
user_pref("extensions.webcompat.perform_injections", true); user_pref("extensions.webcompat.perform_injections", true);
user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.uBlock0@raymondhill.net", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.uBlock0@raymondhill.net", true);
user_pref("extensions.webextensions.uuids", "{\"data-leak-blocker@mozilla.com\":\"d5a87a73-0d8c-4829-a4fb-f4e05206d954\",\"formautofill@mozilla.org\":\"3343d40d-24c6-45f1-9037-e879464e778b\",\"ipp-activator@mozilla.com\":\"2e6771b3-7a28-4dd8-be65-b79695da5536\",\"pictureinpicture@mozilla.org\":\"735dd14a-ba6e-4a4d-b61a-4a5ad4930bed\",\"addons-search-detection@mozilla.com\":\"25a5b855-5d54-47cb-b267-91da175363f3\",\"webcompat@mozilla.org\":\"9a310967-e580-48bf-b3e8-4eafebbc122d\",\"newtab@mozilla.org\":\"26e303cc-5a6d-4da8-925f-1c9e76884be6\",\"default-theme@mozilla.org\":\"5ab7549d-05df-42fa-83ad-9cb23d7b115d\",\"uBlock0@raymondhill.net\":\"84790597-b0b9-4702-8673-1ce7289f795e\"}"); user_pref("extensions.webextensions.uuids", "{\"data-leak-blocker@mozilla.com\":\"d5a87a73-0d8c-4829-a4fb-f4e05206d954\",\"formautofill@mozilla.org\":\"3343d40d-24c6-45f1-9037-e879464e778b\",\"ipp-activator@mozilla.com\":\"2e6771b3-7a28-4dd8-be65-b79695da5536\",\"pictureinpicture@mozilla.org\":\"735dd14a-ba6e-4a4d-b61a-4a5ad4930bed\",\"addons-search-detection@mozilla.com\":\"25a5b855-5d54-47cb-b267-91da175363f3\",\"webcompat@mozilla.org\":\"9a310967-e580-48bf-b3e8-4eafebbc122d\",\"newtab@mozilla.org\":\"26e303cc-5a6d-4da8-925f-1c9e76884be6\",\"default-theme@mozilla.org\":\"5ab7549d-05df-42fa-83ad-9cb23d7b115d\",\"uBlock0@raymondhill.net\":\"84790597-b0b9-4702-8673-1ce7289f795e\"}");
@ -118,6 +116,7 @@ user_pref("network.captive-portal-service.enabled", false);
user_pref("network.connectivity-service.enabled", false); user_pref("network.connectivity-service.enabled", false);
user_pref("network.cookie.CHIPS.lastMigrateDatabase", 2); user_pref("network.cookie.CHIPS.lastMigrateDatabase", 2);
user_pref("network.early-hints.preconnect.max_connections", 0); user_pref("network.early-hints.preconnect.max_connections", 0);
user_pref("network.http.http3.enable_0rtt", false);
user_pref("network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation", true); user_pref("network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation", true);
user_pref("network.http.speculative-parallel-limit", 0); user_pref("network.http.speculative-parallel-limit", 0);
user_pref("network.predictor.enabled", false); user_pref("network.predictor.enabled", false);
@ -191,7 +190,7 @@ user_pref("storage.vacuum.last.content-prefs.sqlite", 1778077210);
user_pref("storage.vacuum.last.index", 2); user_pref("storage.vacuum.last.index", 2);
user_pref("storage.vacuum.last.places.sqlite", 1777853354); user_pref("storage.vacuum.last.places.sqlite", 1777853354);
user_pref("toolkit.profiles.storeID", "956ac82f"); user_pref("toolkit.profiles.storeID", "956ac82f");
user_pref("toolkit.startup.last_success", 1778261332); user_pref("toolkit.startup.last_success", 1779279177);
user_pref("toolkit.telemetry.cachedClientID", "39febed9-00b0-4794-9a65-91eb9f8a0e22"); user_pref("toolkit.telemetry.cachedClientID", "39febed9-00b0-4794-9a65-91eb9f8a0e22");
user_pref("toolkit.telemetry.cachedProfileGroupID", "d82d992e-64b6-451c-a9ef-522b45109ba9"); user_pref("toolkit.telemetry.cachedProfileGroupID", "d82d992e-64b6-451c-a9ef-522b45109ba9");
user_pref("toolkit.telemetry.reportingpolicy.firstRun", false); user_pref("toolkit.telemetry.reportingpolicy.firstRun", false);

View File

@ -157,11 +157,16 @@ in
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# KDE
kdePackages.bluedevil kdePackages.bluedevil
pkgs-unstable.gns3-gui
kdePackages.krdc kdePackages.krdc
imagemagick
# Net
pkgs-unstable.gns3-gui
docker-compose docker-compose
# Utils
imagemagick
] ++ optionalPkgs; ] ++ optionalPkgs;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

View File

@ -155,81 +155,89 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
polkit # System
libsecret # needet by gnnnome keyring polkit
xdg-desktop-portal-gtk libsecret # for gnome-keyring
xdg-utils xdg-desktop-portal-gtk
shared-mime-info xdg-utils
xwayland shared-mime-info
kitty xwayland
copyq dconf
distrobox tree
qemu unzip
virt-manager bind # dig, nslookup
virtiofsd
distrobox
dunst
htop
nvtopPackages.full
nwg-drawer
rofi
swaylock
waybar
dconf
hyprpolkitagent
tree
unzip
adwaita-icon-theme
hyprpicker
hypridle
playerctl
pwvucontrol
android-tools
kdePackages.kdeconnect-kde # Hyprland stuff
kitty
dunst
waybar
rofi
nwg-drawer
swaylock
hyprpolkitagent
hyprpicker
hypridle
hyprpaper
playerctl
pwvucontrol
# Graphen flash # Screenshots & clipboard
android-tools grim
# ToDo: error: 'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules. slurp
swappy
wl-clipboard
copyq
python312Packages.pillow
# Coms # Files
discord-ptb yazi
freecad file-roller
qimgv
sunshine # Media
qimgv vlc
vlc rawtherapee
rawtherapee handbrake
python3 svt-av1
handbrake tidal-hifi
svt-av1 # av1 encoder
spotify
blender
file-roller # GUI arciver, support for thunar-arcive
# 3D / CAD
blender
freecad
seahorse # Gnome keyring viewer # Dev
yazi python3
pkgs-unstable.orca-slicer qemu
pkgs-unstable.video-downloader virt-manager
bind # nsutils # Comms
grim # screenshot discord-ptb
slurp # area selectionn kdePackages.kdeconnect-kde
swappy # draw on pic seahorse
wl-clipboard
python312Packages.pillow # pic manipulation
# Theme # Gaming
catppuccin-cursors.frappeMauve sunshine
libsForQt5.qt5ct heroic
qt6Packages.qt6ct prismlauncher
hyprpaper
lxappearance
# Games # Monitoring
heroic kdePackages.plasma-systemmonitor
prismlauncher # nvtopPackages.full
# btop
# Hardware
android-tools # adb, fastboot
# Theme
catppuccin-cursors.frappeMauve
libsForQt5.qt5ct
qt6Packages.qt6ct
lxappearance
adwaita-icon-theme
# Misc
pkgs-unstable.orca-slicer
pkgs-unstable.video-downloader
] ++ optionalPkgs; ] ++ optionalPkgs;
# nerdfonts wher seperated into different packages, so nerdfonts dosnt work # nerdfonts wher seperated into different packages, so nerdfonts dosnt work
@ -247,9 +255,6 @@ in
security.pam.services.ly.enableGnomeKeyring = true; security.pam.services.ly.enableGnomeKeyring = true;
# Required for non native linked programms
# https://nix.dev/guides/faq#how-to-run-non-nix-executables
programs.nix-ld.enable = true;

View File

@ -97,8 +97,8 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# CLI
starship starship
virtiofsd
fzf fzf
jq jq
bc bc
@ -106,33 +106,43 @@
wget wget
colordiff colordiff
git git
librewolf
rnote
vscode
nextcloud-client
ciscoPacketTracer9
gimp3
logseq
pdfarranger
thunderbird
textpieces
normcap
pkgs-unstable.zed-editor # Nix / Lang
nil # nix language server nil
nixd # " nixd
devenv
rustup rustup
php php
devenv # from nixos # Web
docker-buildx librewolf
# Apps
rnote
logseq
pdfarranger
textpieces
normcap
nextcloud-client
thunderbird
libreoffice libreoffice
# Graphics
gimp3
virtiofsd
ciscoPacketTracer9
pkgs-unstable.zed-editor
# Printing
cnijfilter2 # canon printer
# Net
wireshark
# Misc
hunspell hunspell
hunspellDicts.en_US hunspellDicts.en_US
hunspellDicts.de_DE hunspellDicts.de_DE
docker-buildx
cnijfilter2 # Canon printer driver
wireshark
]; ];
} }

View File

@ -83,17 +83,23 @@ if [[ $RE_FLAKE -eq 1 ]]; then
rm root-conf/nixos/flake.lock 2>/dev/null || true rm root-conf/nixos/flake.lock 2>/dev/null || true
fi fi
ARGS=""
# Rebuild if requested
if [[ $AUTO_REBUILD -eq 1 ]]; then if [[ $AUTO_REBUILD -eq 1 ]]; then
echo "Running nixos-rebuild switch..." ARGS+="switch "
if [[ $UPGRADE -eq 1 ]]; then else
nixos-rebuild switch --flake /etc/nixos --upgrade ARGS+="boot "
else
nixos-rebuild switch --flake /etc/nixos
fi
cp /etc/nixos/flake.lock root-conf/nixos/flake.lock
fi fi
if [[ $UPGRADE -eq 1 ]]; then
ARGS+="--upgrade "
fi
ARGS+="--flake /etc/nixos"
echo $ARGS
echo "Running: nixos-rebuild $ARGS"
nixos-rebuild $ARGS
cp /etc/nixos/flake.lock root-conf/nixos/flake.lock
diff -r /etc/nixos.bak root-conf/nixos | colordiff --nobanner diff -r /etc/nixos.bak root-conf/nixos | colordiff --nobanner
echo "Done!" echo "Done!"