update, fmt

This commit is contained in:
Leonardo Eugênio 2025-08-06 12:57:58 -03:00
parent cc6110dcac
commit 0dcc8811bb
No known key found for this signature in database
GPG key ID: 2F8F21CE8721456B
5 changed files with 126 additions and 122 deletions

60
flake.lock generated
View file

@ -28,11 +28,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1750173260, "lastModified": 1754433428,
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +225,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751607816, "lastModified": 1753140376,
"narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751468302, "lastModified": 1753592768,
"narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "rev": "fc3add429f21450359369af74c2375cb34a2d204",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -565,11 +565,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751170039, "lastModified": 1754195341,
"narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "9c932ae632d6b5150515e5749b198c175d8565db", "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +653,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1751271578, "lastModified": 1754214453,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -714,11 +714,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1751582995, "lastModified": 1754292888,
"narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -888,11 +888,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751606940, "lastModified": 1754328224,
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1750931469, "lastModified": 1754061284,
"narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "rev": "58bd4da459f0a39e506847109a2a5cfceb837796",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1063,11 +1063,11 @@
}, },
"vpsadminos": { "vpsadminos": {
"locked": { "locked": {
"lastModified": 1751504201, "lastModified": 1754243274,
"narHash": "sha256-rmy2PeePgItz8uBU3ge1Mq0wVJSfX6V3qUmhBL2arPQ=", "narHash": "sha256-gVTM1eIYzHx/Z/2WVhhf3Eov3JuARF5fuIrWjvc73wo=",
"owner": "vpsfreecz", "owner": "vpsfreecz",
"repo": "vpsadminos", "repo": "vpsadminos",
"rev": "8e1f048ef6c8fb07dde01a31ab3a6625aa83b239", "rev": "483e04c5556e7a42a0dcd176caab7ad450244515",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1102,11 +1102,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1715216838, "lastModified": 1752343846,
"narHash": "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE=", "narHash": "sha256-tm2iycSAzbomHfOqmpQ21ozmS84OXfKIu/ZJant0Vfk=",
"owner": "lelgenio", "owner": "lelgenio",
"repo": "wl-crosshair", "repo": "wl-crosshair",
"rev": "39b716cf410a1b45006f50f32f8d63de5c43aedb", "rev": "940acb43e753cfbe0afd0478370778e1bf2d3d55",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -108,42 +108,41 @@
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
}; };
common_modules = common_modules = [
[ { nixpkgs.pkgs = pkgs; }
{ nixpkgs.pkgs = pkgs; } ./system/configuration.nix
./system/configuration.nix ./system/secrets.nix
./system/secrets.nix ./system/sops.nix
./system/sops.nix ./system/greetd.nix
./system/greetd.nix { login-manager.greetd.enable = desktop == "sway"; }
{ login-manager.greetd.enable = desktop == "sway"; }
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
inputs.sops-nix.nixosModules.default inputs.sops-nix.nixosModules.default
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
( (
{ config, ... }: { config, ... }:
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.lelgenio = { home-manager.users.lelgenio = {
my = config.my; my = config.my;
imports = [ imports = [
./user/home.nix ./user/home.nix
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
]; ];
}; };
home-manager.backupFileExtension = "bkp"; home-manager.backupFileExtension = "bkp";
# Optionally, use home-manager.extraSpecialArgs to pass # Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix # arguments to home.nix
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit inputs; inherit inputs;
}; };
} }
) )
] ]
++ lib.optional (desktop == "gnome") ./system/gnome.nix ++ lib.optional (desktop == "gnome") ./system/gnome.nix
++ lib.optional (desktop == "kde") ./system/kde.nix; ++ lib.optional (desktop == "kde") ./system/kde.nix;
in in
{ {
checks."${system}" = { checks."${system}" = {
@ -161,25 +160,28 @@
./system/monolith-gitlab-runner.nix ./system/monolith-gitlab-runner.nix
./system/monolith-forgejo-runner.nix ./system/monolith-forgejo-runner.nix
./system/nix-serve.nix ./system/nix-serve.nix
] ++ common_modules; ]
++ common_modules;
}; };
double-rainbow = lib.nixosSystem { double-rainbow = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ modules = [
./hosts/double-rainbow.nix ./hosts/double-rainbow.nix
] ++ common_modules; ]
++ common_modules;
}; };
pixie = lib.nixosSystem { pixie = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = modules = [
[ ./hosts/pixie.nix ] ./hosts/pixie.nix
++ common_modules ]
++ [ ++ common_modules
{ ++ [
packages.media-packages.enable = lib.mkOverride 0 false; {
services.flatpak.enable = lib.mkOverride 0 false; packages.media-packages.enable = lib.mkOverride 0 false;
} services.flatpak.enable = lib.mkOverride 0 false;
]; }
];
}; };
phantom = lib.nixosSystem { phantom = lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;

View file

@ -94,7 +94,8 @@ in
options = [ options = [
"subvol=@games" "subvol=@games"
"nofail" "nofail"
] ++ btrfs_options; ]
++ btrfs_options;
}; };
fileSystems."/home/lelgenio/Downloads/Torrents" = { fileSystems."/home/lelgenio/Downloads/Torrents" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
@ -102,7 +103,8 @@ in
options = [ options = [
"subvol=@torrents" "subvol=@torrents"
"nofail" "nofail"
] ++ btrfs_options; ]
++ btrfs_options;
}; };
fileSystems."/home/lelgenio/Música" = { fileSystems."/home/lelgenio/Música" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
@ -110,7 +112,8 @@ in
options = [ options = [
"subvol=@music" "subvol=@music"
"nofail" "nofail"
] ++ btrfs_options; ]
++ btrfs_options;
}; };
fileSystems."/home/lelgenio/.local/mount/data" = { fileSystems."/home/lelgenio/.local/mount/data" = {
device = "/dev/disk/by-label/BTRFS_DATA"; device = "/dev/disk/by-label/BTRFS_DATA";
@ -118,7 +121,8 @@ in
options = [ options = [
"subvol=@data" "subvol=@data"
"nofail" "nofail"
] ++ btrfs_options; ]
++ btrfs_options;
}; };
fileSystems."/home/lelgenio/.local/mount/old" = { fileSystems."/home/lelgenio/.local/mount/old" = {
device = "/dev/disk/by-label/BTRFS_ROOT"; device = "/dev/disk/by-label/BTRFS_ROOT";

View file

@ -55,23 +55,22 @@ rec {
inherit authenticationTokenConfigFile; # 2 inherit authenticationTokenConfigFile; # 2
dockerImage = "alpine:3.18.2"; dockerImage = "alpine:3.18.2";
dockerPullPolicy = "if-not-present"; dockerPullPolicy = "if-not-present";
dockerVolumes = dockerVolumes = [
[ "/etc/nix/nix.conf:/etc/nix/nix.conf:ro"
"/etc/nix/nix.conf:/etc/nix/nix.conf:ro" "/nix/store:/nix/store:ro"
"/nix/store:/nix/store:ro" "/nix/var/nix/db:/nix/var/nix/db:ro"
"/nix/var/nix/db:/nix/var/nix/db:ro" "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
"/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" "/tmp:/tmp"
"/tmp:/tmp" "/var/run/docker.sock:/var/run/docker.sock"
"/var/run/docker.sock:/var/run/docker.sock" "/var/lib/docker/containers:/var/lib/docker/containers"
"/var/lib/docker/containers:/var/lib/docker/containers" "/cache"
"/cache" ]
] ++ lib.optionals (nixCacheSshPrivateKeyPath != null) [
++ lib.optionals (nixCacheSshPrivateKeyPath != null) [ "${nixCacheSshPrivateKeyPath}:${nixCacheSshPrivateKeyPath}"
"${nixCacheSshPrivateKeyPath}:${nixCacheSshPrivateKeyPath}" ]
] ++ lib.optionals (nixCacheSshPublicKeyPath != null) [
++ lib.optionals (nixCacheSshPublicKeyPath != null) [ "${nixCacheSshPublicKeyPath}:${nixCacheSshPublicKeyPath}"
"${nixCacheSshPublicKeyPath}:${nixCacheSshPublicKeyPath}" ];
];
# dockerDisableCache = true; # dockerDisableCache = true;
preBuildScript = "\". ${lib.getExe (installNixScript args)}\""; preBuildScript = "\". ${lib.getExe (installNixScript args)}\"";
environmentVariables = { environmentVariables = {

View file

@ -21,33 +21,32 @@ lib.mkIf (desktop == "sway") {
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
gtk.enable = true; gtk.enable = true;
}; };
gtk = gtk = {
enable = true;
font = {
name = font.interface;
size = font.size.small;
};
theme = {
name = gtk_theme;
package = pkgs.orchis_theme_compact;
};
iconTheme = {
name = icon_theme;
package = pkgs.papirus_red;
};
}
// (
let
shared.extraConfig = {
gtk-decoration-layout = "menu:";
};
in
{ {
enable = true; gtk4 = shared;
font = { gtk3 = shared;
name = font.interface;
size = font.size.small;
};
theme = {
name = gtk_theme;
package = pkgs.orchis_theme_compact;
};
iconTheme = {
name = icon_theme;
package = pkgs.papirus_red;
};
} }
// ( );
let
shared.extraConfig = {
gtk-decoration-layout = "menu:";
};
in
{
gtk4 = shared;
gtk3 = shared;
}
);
xdg.configFile."gtk-3.0/settings.ini".force = true; xdg.configFile."gtk-3.0/settings.ini".force = true;
xdg.configFile."gtk-4.0/settings.ini".force = true; xdg.configFile."gtk-4.0/settings.ini".force = true;