From c361efb1ebadf54de271ee85212760a999c87bbb Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 20 Mar 2025 16:59:12 -0300 Subject: [PATCH 01/46] variables: switch to gnome --- user/gnome.nix | 2 +- user/variables.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gnome.nix b/user/gnome.nix index 74951c7..85d04be 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -42,7 +42,7 @@ lib.mkIf (config.my.desktop == "gnome") { qt6Packages.qtstyleplugin-kvantum ]; - services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome; + services.gpg-agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3; xdg.defaultApplications = { enable = lib.mkForce false; diff --git a/user/variables.nix b/user/variables.nix index 84823d3..7d56cf3 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -115,7 +115,7 @@ rec { }; dmenu = "bmenu"; - desktop = "sway"; + desktop = "gnome"; browser = "firefox"; editor = "kakoune"; } From 07b509750b34af7c76fa8d316e3c74f8def34304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:31:27 -0300 Subject: [PATCH 02/46] gnome: install menulibre --- user/gnome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/gnome.nix b/user/gnome.nix index 85d04be..e52c3b2 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -35,6 +35,7 @@ lib.mkIf (config.my.desktop == "gnome") { amberol pitivi keepassxc + menulibre libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum From 5e3260a57e00e967a6d5a4abb40f1db2268b8256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:36:48 -0300 Subject: [PATCH 03/46] cursor: add cursor editor --- user/cursor/cursor.desktop | 15 +++++++++++++++ user/cursor/default.nix | 20 ++++++++++++++++++++ user/cursor/keybindings.json | 1 + user/cursor/settings.json | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 user/cursor/cursor.desktop create mode 100644 user/cursor/default.nix create mode 100644 user/cursor/keybindings.json create mode 100644 user/cursor/settings.json diff --git a/user/cursor/cursor.desktop b/user/cursor/cursor.desktop new file mode 100644 index 0000000..04ec82e --- /dev/null +++ b/user/cursor/cursor.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Name=Cursor +Exec=/home/lelgenio/.local/bin/cursor --enable-features=UseOzonePlatform --ozone-platform-hint=wayland %F +Path=/home/lelgenio/.local/bin +Icon=/home/lelgenio/.icons/cursor.png +Type=Application +Categories=Utility;Development; +StartupWMClass=Cursor +X-AppImage-Version=latest +Comment=Cursor is an AI-first coding environment. +MimeType=x-scheme-handler/cursor; + + +[Desktop Action new-empty-window] +Exec=/home/lelgenio/.local/bin/cursor --enable-features=UseOzonePlatformc --ozone-platform-hint --new-window %F diff --git a/user/cursor/default.nix b/user/cursor/default.nix new file mode 100644 index 0000000..46d32c7 --- /dev/null +++ b/user/cursor/default.nix @@ -0,0 +1,20 @@ +{ + pkgs, + lib, + ... +}: +{ + options.cursor = { + enable = lib.mkEnableOption { }; + }; + + config = lib.mkIf config.cursor.enable { + home.file = { + "${config.home.homeDirectory}/.local/share/applications/cursor.desktop".source = ./cursor.desktop; + "${config.home.homeDirectory}/.config/Cusor/User/keybindings.json".source = + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/cursor/keybindings.json"; + "${config.home.homeDirectory}/.config/Cursor/User/settings.json".source = + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/cursor/settings.json"; + }; + }; +} diff --git a/user/cursor/keybindings.json b/user/cursor/keybindings.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/user/cursor/keybindings.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/user/cursor/settings.json b/user/cursor/settings.json new file mode 100644 index 0000000..08b5adb --- /dev/null +++ b/user/cursor/settings.json @@ -0,0 +1,34 @@ +{ + "terminal.integrated.sendKeybindingsToShell": true, + "window.titleBarStyle": "custom", + "workbench.preferredDarkColorTheme": "GitHub Dark", + "workbench.preferredLightColorTheme": "GitHub Light", + "window.autoDetectColorScheme": true, + "workbench.colorTheme": "GitHub Dark", + "git.autofetch": true, + "git.confirmSync": false, + "editor.suggest.snippetsPreventQuickSuggestions": false, + "update.mode": "none", + "intelephense.files.exclude": [ + "**/.git/**", + "**/.svn/**", + "**/.hg/**", + "**/CVS/**", + "**/.DS_Store/**", + "**/node_modules/**", + "**/bower_components/**", + "**/vendor/**/{Tests,tests}/**", + "**/.history/**", + "**/vendor/**/vendor/**", + "**/.direnv/**" + ], + "intelephense.format.braces": "k&r", + "window.commandCenter": 1, + "files.exclude": { + "**/.deps": true, + "**/.direnv": true + }, + "diffEditor.renderSideBySide": false, + "laravel-pint.enable": true, + "editor.formatOnSave": true +} \ No newline at end of file From ccc5a10793981f7f30019c4bf5a54ee500905fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:51:33 -0300 Subject: [PATCH 04/46] firefox: remove header styling --- user/firefox.nix | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 4b69ad2..7d8d65f 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -127,46 +127,7 @@ in #sidebar-header { display: none !important; } '' else - '' - /* Element | chrome://browser/content/browser.xhtml */ - - #navigator-toolbox { - display: grid; - grid-template-columns: 1fr 50px; - overflow: hidden; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #nav-bar { - flex: 1; - width: 100%; - grid-column: 1 / 3; - grid-row: 1; - z-index: 0; - padding-right: 29px !important; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - .toolbar-items { - display: none; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #TabsToolbar { - max-width: 50px; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #titlebar { - max-width: 50px; - grid-area: 1 / 2; - z-index: 10; - } - ''; + ""; }; }; }; From dc6f25fd23f235b4eebdecdf89f21ad82409fa75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Mar 2025 00:55:53 -0300 Subject: [PATCH 05/46] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index cabf4cf..6391c4b 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1739502527, - "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=", + "lastModified": 1742179690, + "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "06fcea9445b5a005b40469a69f57f2147398bc94", + "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1742174123, + "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1740437053, - "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=", + "lastModified": 1742413977, + "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec", + "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", "type": "gitlab" }, "original": { @@ -551,11 +551,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1742388435, + "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { @@ -943,11 +943,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { @@ -958,11 +958,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1740754923, - "narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=", + "lastModified": 1742222981, + "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3", + "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487", "type": "github" }, "original": { From d2654ca5bc27fc20439915be4eacaf834a2735a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Mar 2025 23:23:52 -0300 Subject: [PATCH 06/46] phantom: add travel counter goof --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ hosts/phantom/goofs.nix | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/flake.lock b/flake.lock index cabf4cf..c1f716c 100644 --- a/flake.lock +++ b/flake.lock @@ -73,6 +73,22 @@ "url": "https://git.lelgenio.com/lelgenio/catboy-spinner" } }, + "contador-da-viagem": { + "flake": false, + "locked": { + "lastModified": 1742597480, + "narHash": "sha256-aN+Kioc4AWPMyJxfz/zFCo2YdP4YxcPqoUcp46z9KcA=", + "ref": "refs/heads/main", + "rev": "29dde9d1965b1f8c1b870185a95859c050ba847d", + "revCount": 3, + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem" + }, + "original": { + "type": "git", + "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -709,6 +725,7 @@ "inputs": { "agenix": "agenix", "catboy-spinner": "catboy-spinner", + "contador-da-viagem": "contador-da-viagem", "demoji": "demoji", "dhist": "dhist", "disko": "disko", diff --git a/flake.nix b/flake.nix index fd1bac2..8994009 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,10 @@ wl-crosshair.url = "github:lelgenio/wl-crosshair"; warthunder-leak-counter.url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter"; made-you-look.url = "git+https://git.lelgenio.com/lelgenio/made-you-look"; + contador-da-viagem = { + url = "git+https://git.lelgenio.com/lelgenio/contador-da-viagem"; + flake = false; + }; catboy-spinner = { url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner"; flake = false; diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix index c0b670a..dfb5736 100644 --- a/hosts/phantom/goofs.nix +++ b/hosts/phantom/goofs.nix @@ -43,4 +43,9 @@ forceSSL = true; root = inputs.hello-fonts; }; + services.nginx.virtualHosts."contador-da-viagem.lelgenio.com" = { + enableACME = true; + forceSSL = true; + root = inputs.contador-da-viagem; + }; } From fd3c642a10f395a75f606d26a75e4ff7198bdc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 23 Mar 2025 16:30:08 -0300 Subject: [PATCH 07/46] factorio: update backup script filename to fix syncthing integration --- hosts/monolith/factorio-server.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 8ed0324..9648de3 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -23,11 +23,12 @@ systemd.services.factorio-backup-save = { description = "Backup factorio saves"; script = '' + FILENAME="space-age-$(date --iso=seconds | tr ':' '_').zip" ${lib.getExe pkgs.rsync} \ -av \ --chown=lelgenio \ /var/lib/factorio/saves/default.zip \ - ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip + ~lelgenio/Documentos/GameSaves/factorio_saves/$FILENAME ''; serviceConfig.Type = "oneshot"; wantedBy = [ "multi-user.target" ]; From e6491176156f380fd05ddd7a31f2953fc5e4bc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 26 Mar 2025 21:58:24 -0300 Subject: [PATCH 08/46] refactor: move rm-target service and timer to separate file --- user/home.nix | 25 +------------------------ user/rm-target.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 user/rm-target.nix diff --git a/user/home.nix b/user/home.nix index c384c60..271ceee 100644 --- a/user/home.nix +++ b/user/home.nix @@ -44,6 +44,7 @@ inputs.nix-index-database.hmModules.nix-index ../settings ./powerplay-led-idle.nix + ./rm-target.nix ]; my = import ./variables.nix // { @@ -169,30 +170,6 @@ exec nicotine ''; - systemd.user.services.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Service = { - Type = "oneshot"; - ExecStart = pkgs.writeShellScript "rm-target" '' - sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- - ''; - }; - }; - systemd.user.timers.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Timer = { - OnCalendar = "weekly"; - Unit = "rm-target.service"; - }; - Install = { - WantedBy = [ "timers.target" ]; - }; - }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/user/rm-target.nix b/user/rm-target.nix new file mode 100644 index 0000000..93c6058 --- /dev/null +++ b/user/rm-target.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, ... }: +{ + systemd.user.services.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "rm-target" '' + sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- + ''; + }; + }; + systemd.user.timers.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Timer = { + OnCalendar = "weekly"; + Unit = "rm-target.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; +} From a899d5b15968ca90c33ecc335d80321a1f8be612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 27 Mar 2025 01:07:27 -0300 Subject: [PATCH 09/46] home: add automatic home-manager cleanup service --- user/home-manager.nix | 28 ++++++++++++++++++++++++++++ user/home.nix | 3 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 user/home-manager.nix diff --git a/user/home-manager.nix b/user/home-manager.nix new file mode 100644 index 0000000..9c8452a --- /dev/null +++ b/user/home-manager.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, ... }: +{ + programs.home-manager.enable = true; + + systemd.user.services.home-manager-expire = { + Unit = { + Description = "Remove old home-manager generations"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "home-manager-expire" '' + ${lib.getExe pkgs.home-manager} expire-generations 7d + ''; + }; + }; + systemd.user.timers.home-manager-expire = { + Unit = { + Description = "Remove old home-manager generations"; + }; + Timer = { + OnCalendar = "daily"; + Unit = "home-manager-expire.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; +} diff --git a/user/home.nix b/user/home.nix index 271ceee..31e3871 100644 --- a/user/home.nix +++ b/user/home.nix @@ -9,6 +9,7 @@ { imports = [ ./dummy.nix + ./home-manager.nix ./waybar ./helix.nix ./kakoune @@ -58,8 +59,6 @@ home.username = "lelgenio"; home.homeDirectory = "/home/lelgenio"; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; home.packages = with pkgs; [ terminal From 3c7da418dffaa36c150970d74e20351f9da7f676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:31:27 -0300 Subject: [PATCH 10/46] gnome: install menulibre --- user/gnome.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/gnome.nix b/user/gnome.nix index 74951c7..776f095 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -35,6 +35,7 @@ lib.mkIf (config.my.desktop == "gnome") { amberol pitivi keepassxc + menulibre libsForQt5.qt5ct libsForQt5.qtstyleplugin-kvantum From 0f161863fc8eef929aec742ab1c89e1f79293e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 20 Mar 2025 20:51:33 -0300 Subject: [PATCH 11/46] firefox: remove header styling --- user/firefox.nix | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 4b69ad2..7d8d65f 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -127,46 +127,7 @@ in #sidebar-header { display: none !important; } '' else - '' - /* Element | chrome://browser/content/browser.xhtml */ - - #navigator-toolbox { - display: grid; - grid-template-columns: 1fr 50px; - overflow: hidden; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #nav-bar { - flex: 1; - width: 100%; - grid-column: 1 / 3; - grid-row: 1; - z-index: 0; - padding-right: 29px !important; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - .toolbar-items { - display: none; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #TabsToolbar { - max-width: 50px; - } - - /* Element | chrome://browser/content/browser.xhtml */ - - #titlebar { - max-width: 50px; - grid-area: 1 / 2; - z-index: 10; - } - ''; + ""; }; }; }; From a432569595c9300db6e882037bd3f1cb1f9623dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 21 Mar 2025 00:55:53 -0300 Subject: [PATCH 12/46] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index c1f716c..e0843d6 100644 --- a/flake.lock +++ b/flake.lock @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1739502527, - "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=", + "lastModified": 1742179690, + "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "06fcea9445b5a005b40469a69f57f2147398bc94", + "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1742174123, + "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1740437053, - "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=", + "lastModified": 1742413977, + "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec", + "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740603184, - "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "lastModified": 1742388435, + "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1741043164, - "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1740754923, - "narHash": "sha256-o7Qo5kkjVgBL9CVqNJKnkcDbRkpD0UAp82G/mJ086Xw=", + "lastModified": 1742222981, + "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "3a9df8fbe84b680ad0a38ec85e8e9c8a4f095ca3", + "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487", "type": "github" }, "original": { From 4ebfaca007c8b77d3942979ae49528258d6339d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 23 Mar 2025 16:30:08 -0300 Subject: [PATCH 13/46] factorio: update backup script filename to fix syncthing integration --- hosts/monolith/factorio-server.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 8ed0324..9648de3 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -23,11 +23,12 @@ systemd.services.factorio-backup-save = { description = "Backup factorio saves"; script = '' + FILENAME="space-age-$(date --iso=seconds | tr ':' '_').zip" ${lib.getExe pkgs.rsync} \ -av \ --chown=lelgenio \ /var/lib/factorio/saves/default.zip \ - ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip + ~lelgenio/Documentos/GameSaves/factorio_saves/$FILENAME ''; serviceConfig.Type = "oneshot"; wantedBy = [ "multi-user.target" ]; From 0f61393bf36b14ee0293c191fdefb1b3845c387e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 26 Mar 2025 21:58:24 -0300 Subject: [PATCH 14/46] refactor: move rm-target service and timer to separate file --- user/home.nix | 25 +------------------------ user/rm-target.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 user/rm-target.nix diff --git a/user/home.nix b/user/home.nix index c384c60..271ceee 100644 --- a/user/home.nix +++ b/user/home.nix @@ -44,6 +44,7 @@ inputs.nix-index-database.hmModules.nix-index ../settings ./powerplay-led-idle.nix + ./rm-target.nix ]; my = import ./variables.nix // { @@ -169,30 +170,6 @@ exec nicotine ''; - systemd.user.services.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Service = { - Type = "oneshot"; - ExecStart = pkgs.writeShellScript "rm-target" '' - sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- - ''; - }; - }; - systemd.user.timers.rm-target = { - Unit = { - Description = "Remove directories named 'target'"; - }; - Timer = { - OnCalendar = "weekly"; - Unit = "rm-target.service"; - }; - Install = { - WantedBy = [ "timers.target" ]; - }; - }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/user/rm-target.nix b/user/rm-target.nix new file mode 100644 index 0000000..93c6058 --- /dev/null +++ b/user/rm-target.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, ... }: +{ + systemd.user.services.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "rm-target" '' + sudo ${pkgs.fd}/bin/fd -td -u '^\.?target$' "$HOME" -x rm -vrf -- + ''; + }; + }; + systemd.user.timers.rm-target = { + Unit = { + Description = "Remove directories named 'target'"; + }; + Timer = { + OnCalendar = "weekly"; + Unit = "rm-target.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; +} From 8cae611cd5612135263723cb8321f6c11340556a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 27 Mar 2025 01:07:27 -0300 Subject: [PATCH 15/46] home: add automatic home-manager cleanup service --- user/home-manager.nix | 28 ++++++++++++++++++++++++++++ user/home.nix | 3 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 user/home-manager.nix diff --git a/user/home-manager.nix b/user/home-manager.nix new file mode 100644 index 0000000..9c8452a --- /dev/null +++ b/user/home-manager.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, ... }: +{ + programs.home-manager.enable = true; + + systemd.user.services.home-manager-expire = { + Unit = { + Description = "Remove old home-manager generations"; + }; + Service = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "home-manager-expire" '' + ${lib.getExe pkgs.home-manager} expire-generations 7d + ''; + }; + }; + systemd.user.timers.home-manager-expire = { + Unit = { + Description = "Remove old home-manager generations"; + }; + Timer = { + OnCalendar = "daily"; + Unit = "home-manager-expire.service"; + }; + Install = { + WantedBy = [ "timers.target" ]; + }; + }; +} diff --git a/user/home.nix b/user/home.nix index 271ceee..31e3871 100644 --- a/user/home.nix +++ b/user/home.nix @@ -9,6 +9,7 @@ { imports = [ ./dummy.nix + ./home-manager.nix ./waybar ./helix.nix ./kakoune @@ -58,8 +59,6 @@ home.username = "lelgenio"; home.homeDirectory = "/home/lelgenio"; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; home.packages = with pkgs; [ terminal From 0a0b8f9e610867fdac84722befd9b13f35f0104e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 27 Mar 2025 21:09:14 -0300 Subject: [PATCH 16/46] gammastep: extract config --- user/sway/default.nix | 6 ++---- user/sway/gammastep.nix | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 user/sway/gammastep.nix diff --git a/user/sway/default.nix b/user/sway/default.nix index 04193aa..046ae07 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -20,6 +20,7 @@ in ./swayidle.nix ./swaylock.nix ./theme.nix + ./gammastep.nix ]; options.my.sway.enable = lib.mkEnableOption { }; @@ -32,6 +33,7 @@ in my.mpd.enable = true; my.zathura.enable = true; my.waybar.enable = true; + my.gammastep.enable = true; wayland.windowManager.sway = { enable = true; @@ -115,10 +117,6 @@ in exec_always systemctl --user restart waybar.service ''; }; - services.gammastep = { - enable = true; - provider = "geoclue2"; - }; services.kdeconnect = { enable = true; diff --git a/user/sway/gammastep.nix b/user/sway/gammastep.nix new file mode 100644 index 0000000..a5b6917 --- /dev/null +++ b/user/sway/gammastep.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: +let + cfg = config.my.gammastep; +in +{ + options.my.gammastep.enable = lib.mkEnableOption { }; + + config = lib.mkIf cfg.enable { + services.gammastep = { + enable = true; + dawnTime = "6:00-7:45"; + duskTime = "18:35-20:15"; + temperature = { + day = 6500; + night = 4500; + }; + }; + }; +} From 921413f545403e2ea91e19602831dd9fe5bed020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 28 Mar 2025 20:22:34 -0300 Subject: [PATCH 17/46] firefox: update userchrome --- user/firefox.nix | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 7d8d65f..5e38a56 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -2,15 +2,22 @@ config, pkgs, lib, - font, ... }: let - inherit (config.my) desktop browser; + inherit (config.my) desktop; + inherit (config.my.theme) color; + bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { requireSigning = false; allowAddonSideload = true; }; + + swayCustomization = '' + #titlebar { display: none !important; } + #TabsToolbar { display: none !important; } + #sidebar-header { display: none !important; } + ''; in { config = { @@ -119,15 +126,17 @@ in "devtools.chrome.enabled" = true; "devtools.debugger.remote-enabled" = true; }; - userChrome = - if desktop == "sway" then - '' - #titlebar { display: none !important; } - #TabsToolbar { display: none !important; } - #sidebar-header { display: none !important; } - '' - else - ""; + userChrome = '' + ${lib.optionalString (desktop == "sway") swayCustomization} + + #sidebar-main { + background-color: ${color.bg}; + } + + #tabbrowser-tabbox { + outline-width: 0 !important; + } + ''; }; }; }; From 9239cbef77d1e3312eb7a8d076cc0d4f671d1fe0 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 2 Apr 2025 17:11:01 -0300 Subject: [PATCH 18/46] kakoune: add json and yaml formatter --- user/kakoune/filetypes.kak | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index 7ea774e..01b0175 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -15,6 +15,14 @@ hook global WinSetOption filetype=nix %{ set buffer formatcmd 'nixfmt' } +hook global BufCreate .*\.json %{ + set buffer formatcmd 'prettier --parser json' +} + +hook global BufCreate .*\.ya?ml %{ + set buffer formatcmd 'prettier --parser yaml' +} + hook global BufCreate .*\.html %{ set buffer formatcmd 'prettier --parser html' } From 1054e831d8d48099895bb2edc30fb51662281c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 31 Mar 2025 08:05:09 -0300 Subject: [PATCH 19/46] update --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e0843d6..69ae3c0 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "contador-da-viagem": { "flake": false, "locked": { - "lastModified": 1742597480, - "narHash": "sha256-aN+Kioc4AWPMyJxfz/zFCo2YdP4YxcPqoUcp46z9KcA=", + "lastModified": 1742610036, + "narHash": "sha256-sY1iheemazmIVJAnoFtut6cN7HX/C5OMDY54UrmCoqE=", "ref": "refs/heads/main", - "rev": "29dde9d1965b1f8c1b870185a95859c050ba847d", - "revCount": 3, + "rev": "efe5ac4a16de7f78824ac89dc987ef635afa5267", + "revCount": 4, "type": "git", "url": "https://git.lelgenio.com/lelgenio/contador-da-viagem" }, @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1742174123, - "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", + "lastModified": 1742701275, + "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", + "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", "type": "github" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742388435, - "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1742406979, - "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1742222981, - "narHash": "sha256-EDhfWimpzUnpH5h/FQ3oYw/Kaq4Cx1E5nRofDQyI3aE=", + "lastModified": 1743047409, + "narHash": "sha256-WTUW2GZqHknVwEbzF/TeX2eg52414gfl6hXloDDwEsQ=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "14da38b9a49bf156e06f20ed02533a0549e6d487", + "rev": "cf9324b9ff855172bd9de8aa3b8215071c4a0c6f", "type": "github" }, "original": { From caffa85ba020a5f18755c2647224145dd1dbb671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 4 Apr 2025 21:01:39 -0300 Subject: [PATCH 20/46] ranger: disable preview scripts and vcs support, making it very fast --- user/ranger/rc.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/ranger/rc.conf b/user/ranger/rc.conf index 3936f36..ad71849 100644 --- a/user/ranger/rc.conf +++ b/user/ranger/rc.conf @@ -27,10 +27,10 @@ set confirm_on_delete multiple # Use non-default path for file preview script? # ranger ships with scope.sh, a script that calls external programs (see # README.md for dependencies) to preview images, archives, etc. -set preview_script ~/.config/ranger/scope.sh +# set preview_script ~/.config/ranger/scope.sh # Use the external preview script or display simple plain text or image previews? -set use_preview_script true +# set use_preview_script true # Automatically count files in the directory, even before entering them? set automatically_count_files true @@ -40,7 +40,7 @@ set automatically_count_files true set open_all_images true # Be aware of version control systems and display information. -set vcs_aware true +set vcs_aware false # State of the four backends git, hg, bzr, svn. The possible states are # disabled, local (only show local info), enabled (show local and remote From 2d2c3d20075b4b30b96c5970e0ce4582269d9191 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sat, 5 Apr 2025 14:02:55 -0300 Subject: [PATCH 21/46] kak: fix multiline-edit extension --- user/kakoune/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index a015bd0..fa63e6b 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -82,6 +82,9 @@ in rev = "1cc6baeb14b773916eb9209469aa77b3cfa67a0a"; sha256 = "sha256-3PLxG9UtT0MMSibvTviXQIgTH3rApZ3WSbNCEH3c7HE="; }; + buildInputs = with pkgs; [ + python3Minimal + ]; }) ]; extraConfig = From 310f3b192c157bbac4595a25a7c8e844a20543fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 8 Apr 2025 21:42:08 -0300 Subject: [PATCH 22/46] qt: cleanup theme config --- user/sway/theme.nix | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 731d12a..0a8a38a 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -55,7 +55,7 @@ lib.mkIf (desktop == "sway") { qt = { enable = true; platformTheme.name = "gtk3"; - style.name = "qt5ct"; + style.name = "kvantum"; }; dconf.settings = { @@ -70,28 +70,6 @@ lib.mkIf (desktop == "sway") { }; }; - # fonts.fontconfig.enable = true; - xdg.configFile = { - "qt5ct/qt5ct.conf".text = '' - [Appearance] - # color_scheme_path=/nix/store/f07mk0vrm47jxw3y5v99hxncy0w4vcyq-qt5ct-1.5/share/qt5ct/colors/darker.conf - custom_palette=false - icon_theme=${icon_theme} - standard_dialogs=default - style=kvantum-dark - - # [Fonts] - # fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - # general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) - ''; - "kdedefaults/kdeglobals".text = '' - [General] - ColorScheme=BreezeDark - - [Icons] - Theme=${icon_theme} - ''; - }; services.xsettingsd = { enable = true; settings = { @@ -105,11 +83,6 @@ lib.mkIf (desktop == "sway") { }; home.packages = with pkgs; [ - libsForQt5.qt5ct - libsForQt5.qtstyleplugin-kvantum - qt6Packages.qt6ct - qt6Packages.qtstyleplugin-kvantum - pkgs.bibata-cursors pkgs.orchis_theme_compact pkgs.papirus_red From 7eeb06fbb753b0bf91d8b8b5c4d80a6fd3a6ba16 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 8 Apr 2025 17:58:25 -0300 Subject: [PATCH 23/46] firefox: remove buggy config --- user/firefox.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 5e38a56..3f58fa6 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -114,8 +114,6 @@ in "media.ffmpeg.vaapi.enabled" = true; "media.ffvpx.enabled" = true; - "gfx.webrender.all" = true; - # Enable installing non signed extensions "extensions.langpacks.signatures.required" = false; "xpinstall.signatures.required" = false; @@ -145,9 +143,5 @@ in exec firefox ''; }; - home.sessionVariables = { - MOZ_ENABLE_WAYLAND = "1"; - MOZ_DISABLE_RDD_SANDBOX = "1"; - }; }; } From fde4835a77ee84ba6dc37323e2a04fc2b270e3e3 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 12 May 2025 17:58:13 -0300 Subject: [PATCH 24/46] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 69ae3c0..0213291 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1742701275, - "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1742413977, - "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", + "lastModified": 1746740198, + "narHash": "sha256-Sbcl1MkJBOMg9BBENRm++clDuk6SihqBNOkPcKt+EF4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", + "rev": "1feca020084017b47bcbf893b33e76585785a840", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -643,11 +643,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1735554305, - "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1742700801, - "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1743081648, - "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1743047409, - "narHash": "sha256-WTUW2GZqHknVwEbzF/TeX2eg52414gfl6hXloDDwEsQ=", + "lastModified": 1746798207, + "narHash": "sha256-KGvQoBdrOCEaxSnvQrQcbDzu4x2aP8ik6RiRxBj43dg=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "cf9324b9ff855172bd9de8aa3b8215071c4a0c6f", + "rev": "29ee8947bda07185e21388a414df88501c3ce83f", "type": "github" }, "original": { From 5dcf7259ed7d383a57f9b4295d93482d6f240035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Mon, 12 May 2025 22:19:33 -0300 Subject: [PATCH 25/46] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 0213291..970c204 100644 --- a/flake.lock +++ b/flake.lock @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1746934494, + "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1746740198, - "narHash": "sha256-Sbcl1MkJBOMg9BBENRm++clDuk6SihqBNOkPcKt+EF4=", + "lastModified": 1746937334, + "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "1feca020084017b47bcbf893b33e76585785a840", + "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b", "type": "gitlab" }, "original": { @@ -567,11 +567,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -628,11 +628,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -960,11 +960,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1746989248, + "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", "type": "github" }, "original": { @@ -975,11 +975,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1746798207, - "narHash": "sha256-KGvQoBdrOCEaxSnvQrQcbDzu4x2aP8ik6RiRxBj43dg=", + "lastModified": 1746967427, + "narHash": "sha256-lTI7Bg9zgDDWX0kFdR4OoK+I3kAaYt6Jo6jGRvSCn9U=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "29ee8947bda07185e21388a414df88501c3ce83f", + "rev": "cad317d0c2eacd36beb4fce60d6dcced50b71173", "type": "github" }, "original": { From 4c67c260a7deee7f8501c69363970703a560a2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 15 May 2025 12:57:15 -0300 Subject: [PATCH 26/46] kakoune: fix prettier formatter config --- user/kakoune/filetypes.kak | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak index 01b0175..9fa33a6 100644 --- a/user/kakoune/filetypes.kak +++ b/user/kakoune/filetypes.kak @@ -16,15 +16,15 @@ hook global WinSetOption filetype=nix %{ } hook global BufCreate .*\.json %{ - set buffer formatcmd 'prettier --parser json' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.ya?ml %{ - set buffer formatcmd 'prettier --parser yaml' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.html %{ - set buffer formatcmd 'prettier --parser html' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.component\.html %{ @@ -43,11 +43,15 @@ hook global BufCreate .*\.php %{ } hook global BufCreate .*\.js %{ - set buffer formatcmd 'prettier --parser babel' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" +} + +hook global BufCreate .*\.ts %{ + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.scss %{ - set buffer formatcmd 'prettier --parser scss' + set buffer formatcmd "prettier --stdin-filepath=%val{buffile}" } hook global BufCreate .*\.vue %{ From bce7c36693fb088e68db528d38cff47a47987eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 21 May 2025 20:14:08 -0300 Subject: [PATCH 27/46] factorio: update server --- pkgs/factorio-headless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix index 46064b5..8d81f1d 100644 --- a/pkgs/factorio-headless/default.nix +++ b/pkgs/factorio-headless/default.nix @@ -1,10 +1,10 @@ { factorio-headless, pkgs }: factorio-headless.overrideAttrs (_: rec { - version = "2.0.39"; + version = "2.0.47"; src = pkgs.fetchurl { name = "factorio_headless_x64-${version}.tar.xz"; url = "https://www.factorio.com/get-download/${version}/headless/linux64"; - hash = "sha256-D4o9DkN5e1/02LhdfDNLCVo/B9mqf4Cx6H+Uk5qT3zQ="; + hash = "sha256-8PMgx3YWpHlCJ+tjenC1VxCPMUGkYzJ2WTIgp2j0miY="; }; }) From e4b2f1cb143bc892e6d653ca6650b1b1c68c2040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:02:46 -0300 Subject: [PATCH 28/46] tablet: force replacing OpenTabletDriver config --- user/sway/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user/sway/default.nix b/user/sway/default.nix index 046ae07..596fdde 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -125,7 +125,10 @@ in services.gpg-agent.pinentryPackage = pkgs.pinentry-all; - xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json; + xdg.configFile."OpenTabletDriver/settings.json" = { + force = true; + source = ./open-tablet-driver.json; + }; home.packages = with pkgs; [ mySway From 6102f2283a3c624d97fb752c8d6125c8cf89d665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:03:16 -0300 Subject: [PATCH 29/46] firefox: remove pinned extensions --- user/firefox.nix | 70 +----------------------------------------------- 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 3f58fa6..29d7f07 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -8,11 +8,6 @@ let inherit (config.my) desktop; inherit (config.my.theme) color; - bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { - requireSigning = false; - allowAddonSideload = true; - }; - swayCustomization = '' #titlebar { display: none !important; } #TabsToolbar { display: none !important; } @@ -23,70 +18,7 @@ in config = { programs.firefox = { enable = true; - package = pkgs.wrapFirefox bugfixedFirefox { - nixExtensions = [ - (pkgs.fetchFirefoxAddon { - name = "darkreader"; - url = "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73.xpi"; - hash = "sha256-fDmf8yVhiGu4Da0Mr6+PYpeSsLcf8e/PEmZ+BaKzjxo="; - }) - (pkgs.fetchFirefoxAddon { - name = "sponsorblock"; - url = "https://addons.mozilla.org/firefox/downloads/file/4202411/sponsorblock-5.4.29.xpi"; - hash = "sha256-7Xqc8cyQNylMe5/dgDOx1f2QDVmz3JshDlTueu6AcSg="; - }) - (pkgs.fetchFirefoxAddon { - name = "tree-style-tab"; - url = "https://addons.mozilla.org/firefox/downloads/file/4197314/tree_style_tab-3.9.19.xpi"; - hash = "sha256-u2f0elVPj5N/QXa+5hRJResPJAYwuT9z0s/0nwmFtVo="; - }) - (pkgs.fetchFirefoxAddon { - name = "ublock-origin"; - url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi"; - hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo="; - }) - (pkgs.fetchFirefoxAddon { - name = "user_agent_string_switcher"; - url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi"; - hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM="; - }) - - (pkgs.fetchFirefoxAddon { - name = "i-still-dont-care-about-cookies"; - url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; - hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; - }) - - (pkgs.fetchFirefoxAddon { - name = "vimium_ff"; - url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; - hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI="; - }) - (pkgs.fetchFirefoxAddon { - name = "invidious_redirect"; - url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi"; - hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; - }) - - (pkgs.fetchFirefoxAddon { - name = "substitoot"; - url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; - hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; - }) - - # Locale - (pkgs.fetchFirefoxAddon { - name = "firefox_br"; - url = "https://addons.mozilla.org/firefox/downloads/file/4144369/firefox_br-115.0.20230726.201356.xpi"; - hash = "sha256-8zkqfdW0lX0b62+gAJeq4FFlQ06nXGFAexpH+wg2Cr0="; - }) - (pkgs.fetchFirefoxAddon { - name = "corretor"; - url = "https://addons.mozilla.org/firefox/downloads/file/1176165/corretor-65.2018.12.8.xpi"; - hash = "sha256-/rFQtJHdgemMkGAd+KWuWxVA/BwSIkn6sk0XZE0LrGk="; - }) - ]; - }; + package = pkgs.firefox-devedition; profiles = { dev-edition-default = { isDefault = true; From 18ec0369d7df43df83e4d79937255a6bd34db391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:05:30 -0300 Subject: [PATCH 30/46] flake: mark flake.lock as binary to git, don't show diffs --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..da8c15f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +flake.lock binary From 8c5847ff33f7680b5b1a1f342adbf454294bb19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 00:08:40 -0300 Subject: [PATCH 31/46] update --- flake.lock | 132 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 91 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 970c204..0821cf8 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -433,6 +433,54 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "hello-fonts": { "flake": false, "locked": { @@ -456,11 +504,11 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -497,11 +545,11 @@ ] }, "locked": { - "lastModified": 1746934494, - "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -514,17 +562,18 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1746937334, - "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=", + "lastModified": 1747965231, + "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b", + "rev": "53007af63fade28853408370c4c600a63dd97f41", "type": "gitlab" }, "original": { @@ -550,28 +599,29 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -628,11 +678,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -800,11 +850,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -960,11 +1010,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1746989248, - "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { @@ -975,11 +1025,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1746967427, - "narHash": "sha256-lTI7Bg9zgDDWX0kFdR4OoK+I3kAaYt6Jo6jGRvSCn9U=", + "lastModified": 1748016252, + "narHash": "sha256-P/h9BTZv6r5br/MKkXyEdUdDTU446UaAZzGLQMCMSIw=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "cad317d0c2eacd36beb4fce60d6dcced50b71173", + "rev": "4756a2ecc603c347e3d983663d663e96f22225a9", "type": "github" }, "original": { From 68568255cbb534f779c0dcaa61f184f571dde06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:08:45 -0300 Subject: [PATCH 32/46] update: 24.11 -> 25.05 --- flake.lock | 18 +++++++++--------- flake.nix | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0821cf8..78b8ed1 100644 --- a/flake.lock +++ b/flake.lock @@ -504,16 +504,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -578,7 +578,7 @@ }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-25.05", "repo": "nixos-mailserver", "type": "gitlab" } @@ -678,16 +678,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1747862697, - "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 8994009..05332a4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; vpsadminos.url = "github:vpsfreecz/vpsadminos"; @@ -32,7 +32,7 @@ }; nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; From ce66f177fb4b59d2ae3c839abf454ab830d1b84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:09:18 -0300 Subject: [PATCH 33/46] 25.05: split nerd fonts --- overlays/default.nix | 8 -------- system/fonts.nix | 3 ++- user/sway/theme.nix | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 8886897..a032271 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -28,14 +28,6 @@ rec { ]; } ); - nerdfonts_fira_hack = ( - final.nerdfonts.override { - fonts = [ - "FiraCode" - "Hack" - ]; - } - ); } ); diff --git a/system/fonts.nix b/system/fonts.nix index 2815563..73aa8f7 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -5,6 +5,7 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-emoji - nerdfonts_fira_hack + nerd-fonts.fira-code + nerd-fonts.hack ]; } diff --git a/user/sway/theme.nix b/user/sway/theme.nix index 0a8a38a..600f596 100644 --- a/user/sway/theme.nix +++ b/user/sway/theme.nix @@ -92,7 +92,6 @@ lib.mkIf (desktop == "sway") { hack-font font-awesome_5 fira-code - nerdfonts_fira_hack material-wifi-icons ]; } From 707e8143a03ca4b78ed008a4e390cc2175227c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:09:54 -0300 Subject: [PATCH 34/46] 25.05: fix defaultLocale string --- hosts/phantom/default.nix | 2 +- system/locale.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix index 9111434..1b0d3cb 100644 --- a/hosts/phantom/default.nix +++ b/hosts/phantom/default.nix @@ -53,7 +53,7 @@ # Set your time zone. time.timeZone = "America/Sao_Paulo"; # Select internationalisation properties. - i18n.defaultLocale = "pt_BR.utf8"; + i18n.defaultLocale = "pt_BR.UTF-8"; boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576; diff --git a/system/locale.nix b/system/locale.nix index 07e7175..e2c7e81 100644 --- a/system/locale.nix +++ b/system/locale.nix @@ -2,7 +2,7 @@ { time.timeZone = "America/Sao_Paulo"; environment.variables.TZ = config.time.timeZone; - i18n.defaultLocale = "pt_BR.utf8"; + i18n.defaultLocale = "pt_BR.UTF-8"; # Configure keymap in X11 services.xserver.xkb = { From d353be3ce81476dba4327c10be990794afc0c5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:10:18 -0300 Subject: [PATCH 35/46] 25.05: j4-dmenu-desktop use '--i3-ipc' flag --- scripts/bmenu | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/bmenu b/scripts/bmenu index c793269..8abad08 100755 --- a/scripts/bmenu +++ b/scripts/bmenu @@ -8,13 +8,10 @@ if test "$argv[1]" = "run" test -n "$argv[2]" && set t "$argv[2]" || set t "terminal" - test -n "$i3SOCK" && set wrapper 'i3-msg exec --' - test -n "$SWAYSOCK" && set wrapper 'swaymsg exec --' - exec j4-dmenu-desktop \ --dmenu="bmenu start -p Iniciar:" \ --term "$t" \ - --wrapper="$wrapper" \ + --i3-ipc \ --no-generic end From dc734b6d62c7624cad55a587f3c290878582c810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:11:08 -0300 Subject: [PATCH 36/46] 25.05: fix firefox search engine names --- user/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/firefox.nix b/user/firefox.nix index 29d7f07..3e5c9df 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -23,7 +23,7 @@ in dev-edition-default = { isDefault = true; search.force = true; - search.default = "DuckDuckGo"; + search.default = "ddg"; settings = { "devtools.theme" = "auto"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; From 2c70a0e7dec1f64488051586dc09846dbca6a340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:11:26 -0300 Subject: [PATCH 37/46] 25.05: mako use settings instead of extraConfig --- user/sway/mako.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/user/sway/mako.nix b/user/sway/mako.nix index af6c673..28b5eb4 100644 --- a/user/sway/mako.nix +++ b/user/sway/mako.nix @@ -34,12 +34,13 @@ in defaultTimeout = 10000; - extraConfig = '' - [app-name=volumesh] - default-timeout=5000 - group-by=app-name - format=%s\n%b - ''; + settings = { + "app-name=volumesh" = { + "default-timeout" = "5000"; + "group-by" = "app-name"; + "format" = "%s\\n%b"; + }; + }; # # {{@@ header() @@}} # # text From fba64d38633230de8e3516e5acfc73e130efe6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 01:46:00 -0300 Subject: [PATCH 38/46] firefox: remove unused config --- user/firefox.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 3e5c9df..1c891ae 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -1,18 +1,10 @@ { config, pkgs, - lib, ... }: let - inherit (config.my) desktop; inherit (config.my.theme) color; - - swayCustomization = '' - #titlebar { display: none !important; } - #TabsToolbar { display: none !important; } - #sidebar-header { display: none !important; } - ''; in { config = { @@ -27,7 +19,6 @@ in settings = { "devtools.theme" = "auto"; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1; "sidebar.position_start" = false; # Move sidebar to the right # enable media RDD to allow gpu acceleration @@ -57,8 +48,6 @@ in "devtools.debugger.remote-enabled" = true; }; userChrome = '' - ${lib.optionalString (desktop == "sway") swayCustomization} - #sidebar-main { background-color: ${color.bg}; } From 451aeb6725c2b24559b90d38ca653948c2b27a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 19:10:54 -0300 Subject: [PATCH 39/46] 25.05: firefox-devedition fix executable and .desktop name --- user/firefox.nix | 2 +- user/home.nix | 2 +- user/variables.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user/firefox.nix b/user/firefox.nix index 1c891ae..28ba913 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -61,7 +61,7 @@ in }; wayland.windowManager.sway = { extraConfig = '' - exec firefox + exec firefox-devedition ''; }; }; diff --git a/user/home.nix b/user/home.nix index 31e3871..334e260 100644 --- a/user/home.nix +++ b/user/home.nix @@ -152,7 +152,7 @@ text-editor = lib.mkDefault "kak.desktop"; image-viewer = lib.mkDefault "pqiv.desktop"; video-player = lib.mkDefault "mpv.desktop"; - web-browser = lib.mkDefault "firefox.desktop"; + web-browser = lib.mkDefault "firefox-devedition.desktop"; document-viewer = lib.mkDefault "org.pwmt.zathura.desktop"; file-manager = lib.mkDefault "thunar.desktop"; archive-manager = "engrampa.desktop"; diff --git a/user/variables.nix b/user/variables.nix index 84823d3..65bc69a 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -116,6 +116,6 @@ rec { dmenu = "bmenu"; desktop = "sway"; - browser = "firefox"; + browser = "firefox-devedition"; editor = "kakoune"; } From a4b900582aa71695bc628a1b063334c5e892af85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 24 May 2025 19:11:26 -0300 Subject: [PATCH 40/46] 25.05: fix nextcloud dbtype --- hosts/phantom/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix index a7ef9f3..28d76a1 100644 --- a/hosts/phantom/nextcloud.nix +++ b/hosts/phantom/nextcloud.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, ... }: { @@ -11,6 +10,7 @@ hostName = "cloud.lelgenio.com"; https = true; config = { + dbtype = "sqlite"; # TODO: move to single postgres db adminpassFile = config.age.secrets.phantom-nextcloud.path; }; }; From 72ddcec77ef098c6204a951f1ef963c6f089e8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 00:07:44 -0300 Subject: [PATCH 41/46] monolith: add wopus gitlab runners --- secrets/monolith/default.yaml | 12 +++++------- system/gitlab-runner.nix | 6 ++++-- system/monolith-gitlab-runner.nix | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml index 8bd8e12..f354335 100644 --- a/secrets/monolith/default.yaml +++ b/secrets/monolith/default.yaml @@ -4,16 +4,14 @@ gitlab-runners: thoreb-telemetria-nix: ENC[AES256_GCM,data:zrZvG4be08ulpo7itbrprKK5csCMLvzZjrszfMw1XiJP0FyRTUd9nHgHpbAzbjj2KyT7kKngoZAyengvaTEhkT9sUi1pdGnvajAH8BDDOD0g4LJIHFl4,iv:3bSsTzU7gHx+MchuPg9kmb5xEDugmGPje8Jw74NpRJI=,tag:zffRr77lWbyLt7o/mywb5A==,type:str] thoreb-itinerario-nix: ENC[AES256_GCM,data:UdAAD0V895sFoEYR56sCG2LlpZugJ0K/nwkTygzWOnbTSmBRAcIQ8qVFPZGw+K+XMSLiCyio6Jp7k8AYP0K1VYm+6aEP3OkqR9FCLQTJgXo=,iv:UGUby50BYkn13OzItk6zZmxc5+SnbZZa4bebQHIow2A=,tag:LjDg3deWwdH2T71EtPo6jA==,type:str] docker-images-token: ENC[AES256_GCM,data:GGB/KSkjdAyhFKEspAh91ItbqEDf7K/LZSGSn+Jp7SxRfXpDzHIiMD8XJ9PTkGLeQGN4ug1i2nTYPS7d/P5OALWDU+1NPiV9nPdG0w7GERfu4g==,iv:6roabdOKX9xFMf0hWlECd73+943R+hFLos0e2dOpzns=,tag:LrASFc4DtN7aQ+3oOW/p/w==,type:str] + wopus-gitlab-nix: ENC[AES256_GCM,data:asE7J0d58x9VfQFWc07f5T4s5NZ+/VqMQo66EX93J0LbJ4iI5YjvrrIE4pSI1e4Nz/SRQhltaJ0DfSH0+qgjD4wnAONPRi3UlFbSdGWS2bwwRtWe+Nci2krrUFxV2i/ZVE3CwCkNe4mqtII=,iv:gKrD/LhzI+jnDnX6CdxoHfjpiRdrsuRYJF9rTc8SffM=,tag:TczDGSU3gdKmERjBJ7tP/A==,type:str] + wopus-gitlab-docker-images: ENC[AES256_GCM,data:aGbCjQr1VKgg5n4f8vZKgdXcDw/M5JHez9E2TqipBXQ8D0jXdfPg6laNOJUOD+uPBOIGKUBMEg4OtLblCZFVw/V6wJN16wVbwkDU3uELQ8tPmlYSt4fcy4+5sC6+tV4YeMSKA6yIjD+xpkk=,iv:ojBhf2WdkWHruvTbABAAvuGDVOnsUl+qnhvH09L+lgA=,tag:gWhEkvL1qlcge3bSKVDSIg==,type:str] bitbucket-runners: wopus-runner-1: ENC[AES256_GCM,data:gtH0T5n8qMYpvSv5ciN8+ScGlFDf9xE0FTxNP97vT/qsOCcaItTE+5P+DFcWw46onLED+1c+u0sArFbEsT3f8lyco9b+0l99uOQAxLZQzAXYH8zGye1UnwUtytkci2PHu5c8kTpIWHXyZ1IOYNGWkermeab57ANzOkM1LbkHyAjS6VTh0I60LfAOdHOw5FDFL8d1d9oWxLloOe9USLPqHjC023EpCUT2YuyHoPCTpBu8Kb/2HfV0wkAKaB3dvVrKwXCj+bfP6+bjQ3uMzVO/7jxPmnSGBfvyZ+Hlg5goJ6bSAqQWmnPPnQ96FgQfe8su5ML9qNIp9/7eNiL6Rv6Vhxe0hHbE5wsZ/58grcg/LrugeWJvUJ9THhwcTwO8Pkvwlq0XM9seUY2NV+LCK3bLQ4IWDjWkU1IHg6+nihTcvl1iD6UIGMgqGoB/v05WVzHb+GcE2fFuSuhVHfa5RMyboELOJoFrqZiXGhY=,iv:ZakLafxYQCDd1Zw8T83Xfj+YwAQKna9LC6ognJqtifA=,tag:bwBObfdMIvJfRrOG04NtxA==,type:str] wopus-runner-2: ENC[AES256_GCM,data:gg8merZMFbf396hdJY7zmKQndT3GzB7NeGZAs3C0au8Zd7OFAg9vcQcFcxNA3kZGJZqmFTR/ycWJwhYr9fhlfFuPhDynVvgJAqoYtvC2MUDiOMD/d3DlfwFjQ6cOGTrvFuY1kkgSFb4OFdrVC1eiTDrGygFmYnYcqTKn/t5Ttqi+cHZNzFzVzdVLvaLCYxltM5g45zn+fXYxYwCfqyb32/M1XTnnwIGiataGxEX5oWhVV4zqeLO4ZIYPSby5AVvIMJ/zqvqaeVVY52GLDcTKrj3thbZxMQLWN3/lOA0uYhi3L/WM8Gx+JMEIbSICcuT7QXu4w4PA+opcx9GnsMCK2/egzS+cNPJ4vGZCdVD/jh6A9zVEJAgXdsHXNXFHmMPt7DcgrCQiub62og4kBY4G/Rcg4UN7sb3v3qyBpGbCGHGRjCFc+wdHpom0yDOG2cwcqfN49pC2R7Ag2BisFQ/5A+DPmKnvGG3kt9s=,iv:5g5XiDecYqi4JNRkZubgPJECBQdZ6rBeojgFe6Etebk=,tag:HRy5bFSbfxKTb5e13lGtgg==,type:str] wopus-runner-3: ENC[AES256_GCM,data:f9pLYR8t51HtPpLyXysIVaDAhxDrmktJH93E7rb7imtKwK7hRhR8usnvHTcknLfD7BMvStAIYefdGt19u7PrQu6vqc19bEcNbnK5OH4KBP6+X47oMgBYtbIGXH+t3dSDt22fSIoppTwdX7/Kf4vqesfN8K7EunETvFR86oyyKdy15mvXr0XUO4us4HZjnIOBEnOm1P/V8hk5JcCpRuo+8ZYmBe5gzq5pTnqnYlPE1EovM7eDMg72J7ev07h50qvySrAqmNiqDcXfTPQ2TzuHx3XxAYqFybf1L6P9OnLB6RDAlpoFJ0h8dSg2tzC2+amYsBP0UIBK/ZhWvvAjpX+MZrTASjenh/tefDcNdbsXDOr7A4i/261z4rC0r+97INglCN1N/SZg51iBHiRAVV1zibDLfioR5+eBIykWAtjILMoYU+zOcr0E8K0I9jQGMtpnYmvHJqV0DVcdfZpJptrPUUy+lQ/iZVcPpLs=,iv:grzvVsfpUzywjNE4jvTxXKG3TYajrvSsQgfOgtafvIo=,tag:K1B6crN0ckLk0EYBtGHDkw==,type:str] wopus-runner-4: ENC[AES256_GCM,data:D1Zq0BtPuACnutAbUcj3gYSMLuIZcMuqc/1mEFmitEG0tBFMWhkabS+8lXcp8sb1DM0LTDMEwgMB9FVyFb670MKQNEncqQtaNJtY1BxS3SolovDAM/I+i6YGvd4X8jX99d+7ZNR6xGBWJ/dW8rz4QnIM8Eh3FDOqaFa/ltfyPKP9IZ2uZi67C/n8Q/OSdgMQkt+QxhgJfSghE1iruPwxyGlqv+E4SZNI/fQQMjX0Lh7z02ms58yyMtjO71YbukV/JXFRsdJrqY2wfH/6NlZbsKideoSxluBRVqmbW6KQd7dUT819KbOSu9CFdgThtVCU8qiv3jbAbn8D5xRy4AAOEfSqRLXJoj7otCqr47R/8+0BdS3aztFBjL3lDmprMWZ4+LD55fvczfpxUF9ox1mhcjIvCvZJJL06XsST1XRXa7i2fr4/a/XhCmQgIzar5IYxSC9OjuHp6jLsTaY3ZUgid5W1L1n8uWSmA98=,iv:O9caRG//brERiIhuMrsFdTz6TnPY0rdQnvHEu0P42yM=,tag:hrmwLX/CRhZfammJ2nfTPw==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h enc: | @@ -33,8 +31,8 @@ sops: aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-07T21:28:04Z" - mac: ENC[AES256_GCM,data:4lOafZQ6PP38CByulzA/J86sw+TpQhj40s1lTRXqUtpt72yH8nQK8dXpw0dNYvDBtDpKRvNTHZubzalEua6n2lCQL7rsZ2+fo6FJ4ht2Kb70dddDcWEyrfyZQ2FaKC5L/QjqM0SbIfPszNvyQ8wIaOoMfNJBis5QOjRSGDAcJm8=,iv:LLT0oJW+3KNe1nKphCK0c5FPIuh8GfnDrvNDCFhP4NM=,tag:rPbVY7L1qxNc3aCfv77FAg==,type:str] + lastmodified: "2025-05-28T03:04:52Z" + mac: ENC[AES256_GCM,data:THwZcK7nJnCYEUR8CiaQKZ8dQpYbDqnshBBWFzEzPXEWLgFB9+7d6aRh9ZDjZs0rhBTChta3H7YxDJdFh5nAJQy532FJp4S4tBOLHWFZARlKhXngujd0SvxPER55uvxImNFIYX0RDSHUck5jDXCA0tBCmE/Q7DuY7v0+cmRgOV8=,iv:1p3kFMSg0k1n00P6UY5Tttuqvpsb4Se8km5zA9GhAu4=,tag:cDxbHZ+eScDQacwV1sYGIA==,type:str] pgp: - created_at: "2025-03-07T22:49:16Z" enc: |- @@ -52,4 +50,4 @@ sops: -----END PGP MESSAGE----- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B unencrypted_suffix: _unencrypted - version: 3.9.4-unstable + version: 3.10.2 diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index c50e1b9..b998d17 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,18 +1,19 @@ { pkgs, lib, ... }: { mkNixRunner = - authenticationTokenConfigFile: with lib; rec { + authenticationTokenConfigFile: with lib; { # File should contain at least these two variables: # `CI_SERVER_URL` # `REGISTRATION_TOKEN` inherit authenticationTokenConfigFile; # 2 dockerImage = "alpine:3.18.2"; - dockerAllowedImages = [ dockerImage ]; dockerVolumes = [ "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" "/nix/store:/nix/store:ro" "/nix/var/nix/db:/nix/var/nix/db:ro" "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + "/var/run/docker.sock:/var/run/docker.sock" + "/cache" ]; dockerDisableCache = true; preBuildScript = pkgs.writeScript "setup-container" '' @@ -36,6 +37,7 @@ cacert git openssh + docker ] ) } diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix index 28a0ecd..dd80627 100644 --- a/system/monolith-gitlab-runner.nix +++ b/system/monolith-gitlab-runner.nix @@ -18,6 +18,8 @@ in thoreb-telemetria-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-telemetria-nix".path; thoreb-itinerario-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-itinerario-nix".path; + wopus-gitlab-nix = mkNixRunner config.sops.secrets."gitlab-runners/wopus-gitlab-nix".path; + default = { # File should contain at least these two variables: # `CI_SERVER_URL` @@ -25,6 +27,15 @@ in authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/docker-images-token".path; dockerImage = "debian:stable"; }; + + wopus-gitlab-docker-images = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = + config.sops.secrets."gitlab-runners/wopus-gitlab-docker-images".path; + dockerImage = "debian:stable"; + }; }; }; systemd.services.gitlab-runner.serviceConfig.Nice = 10; @@ -39,5 +50,11 @@ in "gitlab-runners/docker-images-token" = { sopsFile = ../secrets/monolith/default.yaml; }; + "gitlab-runners/wopus-gitlab-nix" = { + sopsFile = ../secrets/monolith/default.yaml; + }; + "gitlab-runners/wopus-gitlab-docker-images" = { + sopsFile = ../secrets/monolith/default.yaml; + }; }; } From 93c88db929bb1072b4b7cf16b2750bd72ba0a808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 11:45:38 -0300 Subject: [PATCH 42/46] home: don't set CARGO_HOME and RUSTUP_HOME This was causing issues with using different rust versions in different projects --- user/xdg-dirs.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/user/xdg-dirs.nix b/user/xdg-dirs.nix index a9e1c9b..c4036c2 100644 --- a/user/xdg-dirs.nix +++ b/user/xdg-dirs.nix @@ -1,8 +1,5 @@ { config, - pkgs, - lib, - inputs, ... }: let @@ -24,9 +21,4 @@ in videos = "${HOME}/Vídeos"; }; }; - - home.sessionVariables = { - CARGO_HOME = "${config.xdg.dataHome}/cargo"; - RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; - }; } From 53a3cb0a0eb245c25aaa4df1900ea84c7a1b9f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 20:56:59 -0300 Subject: [PATCH 43/46] monolith: fix gitlab-runner config to not override PATH --- system/gitlab-runner.nix | 100 ++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index b998d17..e450b5e 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -1,53 +1,55 @@ { pkgs, lib, ... }: +let + installNixScript = pkgs.writeScriptBin "install-nix" '' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" + + . ${pkgs.nix}/etc/profile.d/nix.sh + + ${pkgs.nix}/bin/nix-env -i ${ + lib.concatStringsSep " " ( + with pkgs; + [ + nix + cacert + git + openssh + docker + ] + ) + } + ''; +in { - mkNixRunner = - authenticationTokenConfigFile: with lib; { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - inherit authenticationTokenConfigFile; # 2 - dockerImage = "alpine:3.18.2"; - dockerVolumes = [ - "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" - "/nix/store:/nix/store:ro" - "/nix/var/nix/db:/nix/var/nix/db:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" - "/var/run/docker.sock:/var/run/docker.sock" - "/cache" - ]; - dockerDisableCache = true; - preBuildScript = pkgs.writeScript "setup-container" '' - mkdir -p -m 0755 /nix/var/log/nix/drvs - mkdir -p -m 0755 /nix/var/nix/gcroots - mkdir -p -m 0755 /nix/var/nix/profiles - mkdir -p -m 0755 /nix/var/nix/temproots - mkdir -p -m 0755 /nix/var/nix/userpool - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user - mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root - mkdir -p -m 0700 "$HOME/.nix-defexpr" - - . ${pkgs.nix}/etc/profile.d/nix.sh - - ${pkgs.nix}/bin/nix-env -i ${ - concatStringsSep " " ( - with pkgs; - [ - nix - cacert - git - openssh - docker - ] - ) - } - ''; - environmentVariables = { - ENV = "/etc/profile"; - USER = "root"; - NIX_REMOTE = "daemon"; - PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; - NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; - }; + mkNixRunner = authenticationTokenConfigFile: { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + inherit authenticationTokenConfigFile; # 2 + dockerImage = "alpine:3.18.2"; + dockerVolumes = [ + "/etc/nix/nix.conf:/etc/nix/nix.conf:ro" + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + "/tmp:/tmp" + "/var/run/docker.sock:/var/run/docker.sock" + "/var/lib/docker/containers:/var/lib/docker/containers" + "/cache" + ]; + preBuildScript = "\". ${lib.getExe installNixScript}\""; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; }; + }; } From 218d32153f794affb95996f77bae6455a58bf5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Wed, 28 May 2025 23:29:28 -0300 Subject: [PATCH 44/46] Revert "firefox: remove pinned extensions" This reverts commit 6102f2283a3c624d97fb752c8d6125c8cf89d665. --- user/firefox.nix | 77 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/user/firefox.nix b/user/firefox.nix index 28ba913..0403a14 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -5,12 +5,85 @@ }: let inherit (config.my.theme) color; + + bugfixedFirefox = pkgs.firefox-devedition-unwrapped // { + requireSigning = false; + allowAddonSideload = true; + }; in { config = { programs.firefox = { enable = true; - package = pkgs.firefox-devedition; + package = pkgs.wrapFirefox bugfixedFirefox { + nixExtensions = [ + (pkgs.fetchFirefoxAddon { + name = "darkreader"; + url = "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73.xpi"; + hash = "sha256-fDmf8yVhiGu4Da0Mr6+PYpeSsLcf8e/PEmZ+BaKzjxo="; + }) + (pkgs.fetchFirefoxAddon { + name = "sponsorblock"; + url = "https://addons.mozilla.org/firefox/downloads/file/4202411/sponsorblock-5.4.29.xpi"; + hash = "sha256-7Xqc8cyQNylMe5/dgDOx1f2QDVmz3JshDlTueu6AcSg="; + }) + # (pkgs.fetchFirefoxAddon { + # name = "tree-style-tab"; + # url = "https://addons.mozilla.org/firefox/downloads/file/4197314/tree_style_tab-3.9.19.xpi"; + # hash = "sha256-u2f0elVPj5N/QXa+5hRJResPJAYwuT9z0s/0nwmFtVo="; + # }) + (pkgs.fetchFirefoxAddon { + name = "ublock-origin"; + url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi"; + hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo="; + }) + (pkgs.fetchFirefoxAddon { + name = "user_agent_string_switcher"; + url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi"; + hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM="; + }) + + (pkgs.fetchFirefoxAddon { + name = "i-still-dont-care-about-cookies"; + url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; + hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; + }) + + (pkgs.fetchFirefoxAddon { + name = "vimium_ff"; + url = "https://addons.mozilla.org/firefox/downloads/file/4191523/vimium_ff-2.0.6.xpi"; + hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI="; + }) + (pkgs.fetchFirefoxAddon { + name = "unhook"; + url = "https://addons.mozilla.org/firefox/downloads/file/4263531/youtube_recommended_videos-1.6.7.xpi"; + hash = "sha256-u21ouN9IyOzkTkFSeDz+QBp9psJ1F2Nmsvqp6nh0DRU="; + }) + # (pkgs.fetchFirefoxAddon { + # name = "invidious_redirect"; + # url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi"; + # hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; + # }) + + (pkgs.fetchFirefoxAddon { + name = "substitoot"; + url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; + hash = "sha256-1auSqEjkebwRSbmAVUsYwy77dl7TQCOnqgozpoVnqgI="; + }) + + # Locale + (pkgs.fetchFirefoxAddon { + name = "firefox_br"; + url = "https://addons.mozilla.org/firefox/downloads/file/4144369/firefox_br-115.0.20230726.201356.xpi"; + hash = "sha256-8zkqfdW0lX0b62+gAJeq4FFlQ06nXGFAexpH+wg2Cr0="; + }) + (pkgs.fetchFirefoxAddon { + name = "corretor"; + url = "https://addons.mozilla.org/firefox/downloads/file/1176165/corretor-65.2018.12.8.xpi"; + hash = "sha256-/rFQtJHdgemMkGAd+KWuWxVA/BwSIkn6sk0XZE0LrGk="; + }) + ]; + }; profiles = { dev-edition-default = { isDefault = true; @@ -21,6 +94,8 @@ in "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "sidebar.position_start" = false; # Move sidebar to the right + "browser.tabs.groups.enabled" = true; + # enable media RDD to allow gpu acceleration "media.rdd-ffmpeg.enabled" = true; "media.rdd-ffvpx.enabled" = true; From 1d7c1bf0e9762b3919a5fb3d1491c51f566287bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 30 May 2025 01:31:19 -0300 Subject: [PATCH 45/46] monolith: switch to kyber io scheduler --- hosts/monolith/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 280cc3f..753047a 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -144,7 +144,7 @@ in ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled" # Force all disks to use mq-deadline scheduler # For some reason "noop" is used by default which is kinda bad when io is saturated - ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline" + ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="kyber" ''; boot.tmp = { From 22dc422b6308e54973c3fa33a70ba39cd0096e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 30 May 2025 17:05:29 -0300 Subject: [PATCH 46/46] gitlab-runner: fix broken cache config --- system/gitlab-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix index e450b5e..8db526f 100644 --- a/system/gitlab-runner.nix +++ b/system/gitlab-runner.nix @@ -42,8 +42,8 @@ in "/tmp:/tmp" "/var/run/docker.sock:/var/run/docker.sock" "/var/lib/docker/containers:/var/lib/docker/containers" - "/cache" ]; + dockerDisableCache = true; preBuildScript = "\". ${lib.getExe installNixScript}\""; environmentVariables = { ENV = "/etc/profile";