diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..da8c15f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+flake.lock binary
diff --git a/flake.lock b/flake.lock
index 970c204..78b8ed1 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,16 +504,16 @@
]
},
"locked": {
- "lastModified": 1747020534,
- "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
+ "lastModified": 1747556831,
+ "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
+ "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-24.11",
+ "ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@@ -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,22 +562,23 @@
"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": {
"owner": "simple-nixos-mailserver",
- "ref": "master",
+ "ref": "nixos-25.05",
"repo": "nixos-mailserver",
"type": "gitlab"
}
@@ -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,16 +678,16 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1746957726,
- "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+ "lastModified": 1747953325,
+ "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+ "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-24.11",
+ "ref": "nixos-25.05",
"type": "indirect"
}
},
@@ -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": {
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";
};
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/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
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/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 = {
diff --git a/user/firefox.nix b/user/firefox.nix
index 3f58fa6..3e5c9df 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,75 +18,12 @@ 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;
search.force = true;
- search.default = "DuckDuckGo";
+ search.default = "ddg";
settings = {
"devtools.theme" = "auto";
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
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
diff --git a/user/sway/mako.nix b/user/sway/mako.nix
index af6c673..e1e71c6 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
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
];
}