diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index da8c15f..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-flake.lock binary
diff --git a/.sops.yaml b/.sops.yaml
deleted file mode 100644
index 7aa3d88..0000000
--- a/.sops.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-keys:
- - &lelgenio-gpg 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B
- - &lelgenio-ssh age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h
- - &monolith-ssh age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw
- - &phantom-ssh age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y
-
-creation_rules:
- - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
- key_groups:
- - pgp:
- - *lelgenio-gpg
- age:
- - *lelgenio-ssh
- - *monolith-ssh
- - path_regex: secrets/monolith/[^/]+\.(yaml|json|env|ini)$
- key_groups:
- - pgp:
- - *lelgenio-gpg
- age:
- - *lelgenio-ssh
- - *monolith-ssh
- - path_regex: secrets/phantom/[^/]+\.(yaml|json|env|ini)$
- key_groups:
- - pgp:
- - *lelgenio-gpg
- age:
- - *lelgenio-ssh
- - *phantom-ssh
diff --git a/flake.lock b/flake.lock
index 78b8ed1..f62cca1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1747575206,
- "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
+ "lastModified": 1736955230,
+ "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
+ "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
"type": "github"
},
"original": {
@@ -73,22 +73,6 @@
"url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
}
},
- "contador-da-viagem": {
- "flake": false,
- "locked": {
- "lastModified": 1742610036,
- "narHash": "sha256-sY1iheemazmIVJAnoFtut6cN7HX/C5OMDY54UrmCoqE=",
- "ref": "refs/heads/main",
- "rev": "efe5ac4a16de7f78824ac89dc987ef635afa5267",
- "revCount": 4,
- "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",
@@ -163,11 +147,11 @@
]
},
"locked": {
- "lastModified": 1744478979,
- "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+ "lastModified": 1700795494,
+ "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+ "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
@@ -225,11 +209,11 @@
]
},
"locked": {
- "lastModified": 1747742835,
- "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=",
+ "lastModified": 1740485968,
+ "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"owner": "nix-community",
"repo": "disko",
- "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62",
+ "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"type": "github"
},
"original": {
@@ -243,11 +227,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1742179690,
- "narHash": "sha256-s/q3OWRe5m7kwDcAs1BhJEj6aHc5bsBxRnLP7DM77xE=",
+ "lastModified": 1739502527,
+ "narHash": "sha256-KMLNOCWmqdDeAZV5O1ccRmVqRutDcy4IONJin3lzd0Q=",
"owner": "lelgenio",
"repo": "dzgui-nix",
- "rev": "a6d68720c932ac26d549b24f17c776bd2aeb73b4",
+ "rev": "06fcea9445b5a005b40469a69f57f2147398bc94",
"type": "github"
},
"original": {
@@ -297,11 +281,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
- "lastModified": 1747046372,
- "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -433,54 +417,6 @@
"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": {
@@ -504,16 +440,16 @@
]
},
"locked": {
- "lastModified": 1747556831,
- "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
+ "lastModified": 1739757849,
+ "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
+ "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-25.05",
+ "ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
@@ -545,11 +481,11 @@
]
},
"locked": {
- "lastModified": 1747540584,
- "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=",
+ "lastModified": 1740281615,
+ "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
"owner": "Mic92",
"repo": "nix-index-database",
- "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce",
+ "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
"type": "github"
},
"original": {
@@ -562,23 +498,22 @@
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat_2",
- "git-hooks": "git-hooks",
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-25_05": "nixpkgs-25_05"
+ "nixpkgs-24_11": "nixpkgs-24_11"
},
"locked": {
- "lastModified": 1747965231,
- "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
+ "lastModified": 1740437053,
+ "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "53007af63fade28853408370c4c600a63dd97f41",
+ "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
- "ref": "nixos-25.05",
+ "ref": "master",
"repo": "nixos-mailserver",
"type": "gitlab"
}
@@ -599,29 +534,28 @@
"type": "github"
}
},
- "nixpkgs-25_05": {
+ "nixpkgs-24_11": {
"locked": {
- "lastModified": 1747610100,
- "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
+ "lastModified": 1734083684,
+ "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+ "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-25.05",
- "repo": "nixpkgs",
- "type": "github"
+ "id": "nixpkgs",
+ "ref": "nixos-24.11",
+ "type": "indirect"
}
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1747744144,
- "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
+ "lastModified": 1740367490,
+ "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
+ "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github"
},
"original": {
@@ -678,26 +612,26 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1747953325,
- "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+ "lastModified": 1740339700,
+ "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
+ "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-25.05",
+ "ref": "nixos-24.11",
"type": "indirect"
}
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1745377448,
- "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
+ "lastModified": 1735554305,
+ "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
+ "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
"type": "github"
},
"original": {
@@ -775,7 +709,6 @@
"inputs": {
"agenix": "agenix",
"catboy-spinner": "catboy-spinner",
- "contador-da-viagem": "contador-da-viagem",
"demoji": "demoji",
"dhist": "dhist",
"disko": "disko",
@@ -789,7 +722,6 @@
"nixpkgs-unstable": "nixpkgs-unstable",
"plymouth-themes": "plymouth-themes",
"ranger-icons": "ranger-icons",
- "sops-nix": "sops-nix",
"tlauncher": "tlauncher",
"tomater": "tomater",
"treefmt-nix": "treefmt-nix",
@@ -843,26 +775,6 @@
"type": "github"
}
},
- "sops-nix": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1747603214,
- "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
- "owner": "Mic92",
- "repo": "sops-nix",
- "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
- "type": "github"
- },
- "original": {
- "owner": "Mic92",
- "repo": "sops-nix",
- "type": "github"
- }
- },
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -1010,11 +922,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1747912973,
- "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=",
+ "lastModified": 1739829690,
+ "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3",
+ "rev": "3d0579f5cc93436052d94b73925b48973a104204",
"type": "github"
},
"original": {
@@ -1025,11 +937,11 @@
},
"vpsadminos": {
"locked": {
- "lastModified": 1748016252,
- "narHash": "sha256-P/h9BTZv6r5br/MKkXyEdUdDTU446UaAZzGLQMCMSIw=",
+ "lastModified": 1740082937,
+ "narHash": "sha256-HcTWGIzG2leM0gZabg9lkY7iLwvAe49lqXEzez/Rp/s=",
"owner": "vpsfreecz",
"repo": "vpsadminos",
- "rev": "4756a2ecc603c347e3d983663d663e96f22225a9",
+ "rev": "521427c69173bc443de940ba88d4f58d5fa8d8e2",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 05332a4..0126f65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
{
description = "My system config";
inputs = {
- nixpkgs.url = "nixpkgs/nixos-25.05";
+ nixpkgs.url = "nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
- home-manager.url = "github:nix-community/home-manager/release-25.05";
+ home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
vpsadminos.url = "github:vpsfreecz/vpsadminos";
@@ -26,13 +26,8 @@
inputs.home-manager.follows = "home-manager";
};
- sops-nix = {
- url = "github:Mic92/sops-nix";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
nixos-mailserver = {
- url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
+ url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -56,10 +51,6 @@
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;
@@ -105,12 +96,10 @@
{ nixpkgs.pkgs = pkgs; }
./system/configuration.nix
./system/secrets.nix
- ./system/sops.nix
./system/greetd.nix
{ login-manager.greetd.enable = desktop == "sway"; }
inputs.agenix.nixosModules.default
- inputs.sops-nix.nixosModules.default
inputs.home-manager.nixosModules.home-manager
inputs.disko.nixosModules.disko
(
@@ -150,7 +139,6 @@
modules = [
./hosts/monolith
./system/monolith-gitlab-runner.nix
- ./system/monolith-bitbucket-runner.nix
./system/monolith-forgejo-runner.nix
./system/nix-serve.nix
] ++ common_modules;
@@ -159,6 +147,7 @@
inherit system specialArgs;
modules = [
./hosts/double-rainbow.nix
+ ./system/rainbow-gitlab-runner.nix
] ++ common_modules;
};
pixie = lib.nixosSystem {
diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix
index 2270198..af8c5e4 100644
--- a/hosts/double-rainbow.nix
+++ b/hosts/double-rainbow.nix
@@ -19,8 +19,6 @@ in
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
- my.nix-ld.enable = true;
-
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix
index 2554500..4c26afa 100644
--- a/hosts/monolith/amdgpu.nix
+++ b/hosts/monolith/amdgpu.nix
@@ -14,11 +14,12 @@ in
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelParams = [
"video=DP-1:1920x1080@144"
+ "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
];
systemd.services.amd-fan-control = {
script = ''
- ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 90 0 80
+ ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
'';
serviceConfig = {
Restart = "always";
diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix
index 753047a..410300e 100644
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -42,7 +42,6 @@ in
};
my.gaming.enable = true;
- my.nix-ld.enable = true;
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
@@ -144,7 +143,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}="kyber"
+ 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"
'';
boot.tmp = {
diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix
index 9648de3..8ed0324 100644
--- a/hosts/monolith/factorio-server.nix
+++ b/hosts/monolith/factorio-server.nix
@@ -23,12 +23,11 @@
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/$FILENAME
+ ~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip
'';
serviceConfig.Type = "oneshot";
wantedBy = [ "multi-user.target" ];
diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix
index 1b0d3cb..45c27d7 100644
--- a/hosts/phantom/default.nix
+++ b/hosts/phantom/default.nix
@@ -2,16 +2,12 @@
config,
pkgs,
inputs,
- lib,
...
}:
{
imports = [
inputs.vpsadminos.nixosConfigurations.container
inputs.agenix.nixosModules.default
- inputs.sops-nix.nixosModules.default
-
- ../../system/sops.nix
../../system/nix.nix
./hardware-config.nix
./mastodon.nix
@@ -53,7 +49,7 @@
# Set your time zone.
time.timeZone = "America/Sao_Paulo";
# Select internationalisation properties.
- i18n.defaultLocale = "pt_BR.UTF-8";
+ i18n.defaultLocale = "pt_BR.utf8";
boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
@@ -61,15 +57,6 @@
identityPaths = [ "/root/.ssh/id_rsa" ];
};
- sops = {
- secrets.hello = { };
- defaultSopsFile = lib.mkForce ../../secrets/phantom/default.yaml;
- };
-
- environment.etc."teste-sops" = {
- text = config.sops.secrets.hello.path;
- };
-
virtualisation.docker = {
enable = true;
daemon.settings = {
diff --git a/hosts/phantom/goofs.nix b/hosts/phantom/goofs.nix
index dfb5736..c0b670a 100644
--- a/hosts/phantom/goofs.nix
+++ b/hosts/phantom/goofs.nix
@@ -43,9 +43,4 @@
forceSSL = true;
root = inputs.hello-fonts;
};
- services.nginx.virtualHosts."contador-da-viagem.lelgenio.com" = {
- enableACME = true;
- forceSSL = true;
- root = inputs.contador-da-viagem;
- };
}
diff --git a/hosts/phantom/hardware-config.nix b/hosts/phantom/hardware-config.nix
index 7eebde8..afea081 100644
--- a/hosts/phantom/hardware-config.nix
+++ b/hosts/phantom/hardware-config.nix
@@ -5,7 +5,7 @@
options = [ "nofail" ];
};
fileSystems."/var/lib/mastodon" = {
- device = "172.16.131.19:/nas/5749/mastodon";
+ device = "172.16.130.7:/nas/5749/mastodon";
fsType = "nfs";
options = [ "nofail" ];
};
diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix
index 28d76a1..a7ef9f3 100644
--- a/hosts/phantom/nextcloud.nix
+++ b/hosts/phantom/nextcloud.nix
@@ -1,6 +1,7 @@
{
config,
pkgs,
+ inputs,
...
}:
{
@@ -10,7 +11,6 @@
hostName = "cloud.lelgenio.com";
https = true;
config = {
- dbtype = "sqlite"; # TODO: move to single postgres db
adminpassFile = config.age.secrets.phantom-nextcloud.path;
};
};
diff --git a/overlays/default.nix b/overlays/default.nix
index a032271..8886897 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -28,6 +28,14 @@ rec {
];
}
);
+ nerdfonts_fira_hack = (
+ final.nerdfonts.override {
+ fonts = [
+ "FiraCode"
+ "Hack"
+ ];
+ }
+ );
}
);
diff --git a/pkgs/factorio-headless/default.nix b/pkgs/factorio-headless/default.nix
index 8d81f1d..2aaaba4 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.47";
+ version = "2.0.28";
src = pkgs.fetchurl {
name = "factorio_headless_x64-${version}.tar.xz";
url = "https://www.factorio.com/get-download/${version}/headless/linux64";
- hash = "sha256-8PMgx3YWpHlCJ+tjenC1VxCPMUGkYzJ2WTIgp2j0miY=";
+ hash = "sha256-6pk3tq3HoY4XpOHmSZLsOJQHSXs25oKAuxT83UyITdM=";
};
})
diff --git a/scripts/amd-fan-control b/scripts/amd-fan-control
index 5b0d7a9..1f4c3e7 100755
--- a/scripts/amd-fan-control
+++ b/scripts/amd-fan-control
@@ -39,31 +39,10 @@ if [ -z "$TEMP_MAX" ];then
bail "No maximum temperature provided"
fi
-PWM_MIN_PCT="$4"
-PWM_MAX_PCT="$5"
-
-if [ -z "$PWM_MIN_PCT" ];then
- bail "No minimum fan speed % not provided"
-fi
-
-if [ -z "$PWM_MAX_PCT" ];then
- bail "No maximum fan speed % not provided"
-fi
-
-PWM_MIN="$(( $PWM_MIN_PCT * 255 / 100))"
-PWM_MAX="$(( $PWM_MAX_PCT * 255 / 100))"
+PWM_MIN=0
+PWM_MAX=255
echo "Running..." >&2
-
-echo "TEMP_MIN=$TEMP_MIN°C"
-echo "TEMP_MAX=$TEMP_MAX°C"
-echo "FAN_MIN=$PWM_MIN_PCT%"
-echo "FAN_MAX=$PWM_MAX_PCT%"
-
-echo 1 > "$HWMON/pwm1_enable"
-
-PREV=0
-
while true; do
TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
@@ -76,11 +55,7 @@ while true; do
PWM=$PWM_MIN
fi
- AVG="$(( ($PWM * 20 + $PREV * 80) / 100 ))"
-
- echo "$AVG"
-
- echo "$AVG" > "$HWMON/pwm1"
- PREV="$AVG"
+ echo 1 > "$HWMON/pwm1_enable"
+ echo "$PWM" > "$HWMON/pwm1"
sleep .1s
done
diff --git a/scripts/bmenu b/scripts/bmenu
index 8abad08..c793269 100755
--- a/scripts/bmenu
+++ b/scripts/bmenu
@@ -8,10 +8,13 @@
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" \
- --i3-ipc \
+ --wrapper="$wrapper" \
--no-generic
end
diff --git a/secrets/monolith/default.yaml b/secrets/monolith/default.yaml
deleted file mode 100644
index f354335..0000000
--- a/secrets/monolith/default.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-forgejo-runners:
- git.lelgenio.com-default: ENC[AES256_GCM,data:sEfpBZvgQUkyXPWY4RI0RPJWUbsYK/RGqiYJ5wDSVY9a0EYenyt96QYq6815evq2iQ==,iv:rSWnCOdhfKH4TM9R0/IParYd9laYhWxR+iUhgkVvqfc=,tag:mBcSH/oGDMBgBScvCdn3Zg==,type:str]
-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:
- age:
- - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlaFFtOHRBNjZqOXJOV1Bk
- SXRhZTdNWklKaTZST2JhU3VFLzBGSWY0QlMwCldwS1hhMDEyZDAxWUlRRXZtTWts
- Ti9IOUR2OFdGYkJ4cFRsV0lkbWJvb1EKLS0tIEJUS1ZCZ1M4ZUs5cDhiam5JaEk1
- U1VjNFprNHZWeDhwU3owRXh0MlBFYkUKHPgxz9/w3+JEtOljfyWBPSshfFlVWVys
- f15yxlAeWIZVEGqoau7DegVdZiYYIJR2dFBXV1RkKbAwLrbUxAQidg==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5OWk0cTJ4d25Qd0hrdkFD
- a2Fzd1lrMDREclkvRmxUSjFpYXZvRGs2Rm13Cm5aRVZDWE5ZUVR1K2hkZkdKWjYw
- K3lKNndBNGFveGVGVWplaHA0MVlYUG8KLS0tIFlVeXhCTGJGUm1HK2RCSFg1RnI3
- aFVxcDFhaGdYekRWRVFIWnRsZndtZFkKgsvxOFHOcO306Z9FkucA1fDOpZA8N1/h
- jYmIgcKTFgWoSCvux67lK30jFsYp7sm5z6WxxDYsGcoQ/+pxoUX2jQ==
- -----END AGE ENCRYPTED FILE-----
- 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: |-
- -----BEGIN PGP MESSAGE-----
-
- hQEMAzy6JxafzLr5AQgAjwQqdeESOfrOuCjfjALdoy3AnNYC+slusdlra58CoRu6
- YFDAivwPHJBRiuVy43Lo7SWnKXMKvLOry589GBY3JGjNV5U1cPWBhMlTubYZmZWl
- iel8Bvw4IF5JksMIvLFdDgexLN7wETzzZP9S8750BCgpSrncrw1k/dUedhv5HUjo
- N10x6BPjPSmgolA8uxsISHLAUrKcQoeaWvcZFU1ofKywq08HgIySphy6z3Gmv3Qs
- 86saZp1rFm5+qHkrDRgL6Oe3Xx30jVkzn9MHPWzZCDPCEvYGJgXX34NGzbX+/nd3
- JB9XkT2YTFi4BLhdHY3EE7e9//PJc5G9RVDZyAF1e9JeAXH2yR5blXbogoy+VMnS
- Yn74Uvs+fnYFTDOiuequro5i0uAyxtrCx8fdfwjuh+9SC5p3N2cBv2eT7zLQwQHi
- czHlwxmpi/dMB/u83fR4FzuCUt98VXiezIC4yGn25g==
- =Yqqx
- -----END PGP MESSAGE-----
- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B
- unencrypted_suffix: _unencrypted
- version: 3.10.2
diff --git a/secrets/phantom/default.yaml b/secrets/phantom/default.yaml
deleted file mode 100644
index 962c6ba..0000000
--- a/secrets/phantom/default.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-hello: ENC[AES256_GCM,data:UJAAdOL7wzQ1LduTyW+XK2NtXyw/u/Yz28Bmd7OoBe41FVLKwVfvdI1nAwYuNQ==,iv:7kPT2HF5T498bUJ9hUlz5Ez/jn1g7YIUVbJOTW/CHhQ=,tag:KJhJPg8AStyW4roEbEUJ2g==,type:str]
-example_key: ENC[AES256_GCM,data:DcLN+C1BQ6WZg5fRiA==,iv:JC3GTWn4a4RekAHdOQB3YV5+eGa4cUK1JjyTPe8eNHY=,tag:W9CV4rsgHuXyqpWpUxlIQg==,type:str]
-#ENC[AES256_GCM,data:RjdYJNz6qGfbsU/AiBeLlQ==,iv:LjRzSjBXp44cGSqUUfRDNLC9cW4Vd7lfsqDWINt31VA=,tag:NzVm1h9CVKE2XXt300aR/g==,type:comment]
-example_array:
- - ENC[AES256_GCM,data:K9j/t8MDibYO8Frhu1M=,iv:YnrxRnJJwTH6DJC6Bv/d1NUnX2ZPFwsjoji7L1Z+d7s=,tag:Dm7xCUlnjKdXHCuk8lwY8w==,type:str]
- - ENC[AES256_GCM,data:0g6ACJzEHBtukwQYYTY=,iv:xLBJWfOYkX7Y28N01CX2+d5QOr9VGAhInH6pa1hNSGE=,tag:tCkCigo4yhi6YKVMe3Z3lQ==,type:str]
-example_number: ENC[AES256_GCM,data:R+/m/QVBH9/3DA==,iv:FumBUj97ICrRQmyh5fg8Gu9Lba9oITD1pdsr1I/PCf0=,tag:hguw1gpPI3w64fG1WLnJqA==,type:float]
-example_booleans:
- - ENC[AES256_GCM,data:VvI5ag==,iv:koMzyWcua75sK19vuk65oywCD61lMyH3xUwue8LTqy4=,tag:2ym1M0FTwevLm7wefTUWAw==,type:bool]
- - ENC[AES256_GCM,data:lFEC/S8=,iv:cJWbnmseP/AqJzyORM+VI5y7rK8axVeh7EXoLP7mT/Q=,tag:BaS5HyecokdLCq+LzQxGkg==,type:bool]
-sops:
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
- age:
- - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSXhsMHQvb0NyUXRkRDE3
- TjVjb2orQktDMGs4U2JUS3hWdmtMdnhuYnhBCi9VU1RVblZPaW14VGxMcjM0N20z
- R1pOdUJZc1ZGcjBsTnNaZGhleVR6L1kKLS0tIE5vQkFhVXd0R3ZQSzZkNmVqN1Vj
- NERXdlJhVHF0NWpNT29CNlRid2NYMVUKxg7kbP6dOZDUz0uxdC45DZCAa6GQTQ1x
- nIb7lvPW4xFIb0bOZuvc7cAbHjf4So+8zvA0MM4mkTmIDpnwGD5Clg==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age1m4mqcd2kmuhfr8a22rvh02c68jkakhdfmuqgtusuv0czk4jvna7sz79p3y
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrcTJGVmZUenNwYVNjRFlU
- VXNBeDdpVFVtSTN5TG9VN0Q1WjRFbjlHd0Z3CjFsU1BsNkZ1a1ZkY2lva3lBUWZ3
- YUpqeEo0Tys1bDk0TEpwQTJ2U29kbjgKLS0tIFJDYWpNemY4NXZ0MkM0YWNldDBE
- RU1HSUhldHpzeURaUWQvcjBCQ3pMY2cKYL87Njs4e68zu5AXKNF/hxiB3HduS8wz
- o0kmGI58DZx17+Cdipw0ab9a9wiu9C9Fn+LaiCcdM/ESXtS79RzdbQ==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-03-05T22:27:18Z"
- mac: ENC[AES256_GCM,data:WSopSnWZ+uOllywd7difaZtJcfxkL7eIf9Kr3GajZKO0+rP6pEHIS+5AbXZy6oKRlCLUPecY/WXFvk3//akpvvXHbf6Jp4fQ/YSuTcYKRQupbDBpOXSlc33QyRl6oEyiMOjxMxa2N2tmq8dmA0NbF9wSDMa5a4eNDoiL5T/sUZ8=,iv:QqbVRApzFF6q24rk8KfKuthj656nEczD9Si4INj+N9A=,tag:tMRNYo+u/jIQ6iX3KqKJdA==,type:str]
- pgp:
- - created_at: "2025-03-07T22:49:19Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQEMAzy6JxafzLr5AQf/Zw+EB0lFpbul4KmHL3ndbhQCHzhkMgG6vEyj7EpjHQxE
- nwf9kRrTcRh9YdrgR+5PFRnFJ8+L+gZhk+V/GaEPcEUyskOX/YGTSp1u6pXKGEem
- TGojrIx0WwcmeCZUn+qCehbC7ZU64NDDmb7VeWnRkMbboU6UVooHUub88VsbnYw2
- XXtXh4G8isrbyAKzUyypnJnEVbKlVqPOL67BYczjyBqMYc1JVLmBy6nP+sv6q/yo
- QyDzlunmZtu52dwAL0L6wJF+novLr4W9cso4K5UVv2sp5M8gucuiY2obiB3vNfgO
- q9GZTlMWnyDGflM1w+tzpZ/Ke+sM4dSy3cXpZd+MFNJeAaBJ1owjolb4tPUXlt+W
- cJ+SFLWxzH8MsPb+Hfxrt8PPCcv67uch/k50PLYs/V/EM59+mgEJe5LY4rMbUSFw
- REGL3LA6Cnkl2bUeHlfG7XlztHd/ehmZM2RPKof+Qw==
- =htZl
- -----END PGP MESSAGE-----
- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B
- unencrypted_suffix: _unencrypted
- version: 3.9.4-unstable
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 6504054..f64fb4b 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -2,6 +2,9 @@ let
main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15";
in
{
+ "rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
+ main_ssh_public_key
+ ];
"monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
main_ssh_public_key
];
diff --git a/secrets/test.yaml b/secrets/test.yaml
deleted file mode 100644
index 0f9b6e7..0000000
--- a/secrets/test.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-hello: ENC[AES256_GCM,data:ADXdQUkrnh9lDrsHyInYsPBo21u/mIAH47KhGQsxuz5OshT6CoK+89CILEi9tQ==,iv:b/rnM77z69+pVO3kxQZxI2YzTCRiBwwO5fhcwCB2/CI=,tag:A0FOXIfgIkJawV3QhlJPWQ==,type:str]
-example_key: ENC[AES256_GCM,data:gXXl6hhdYNLC1Grmyw==,iv:miSL7Wdewd5zs4A86/r8OW6gK+PGZJ+gaqZRHHxvZos=,tag:Ty+IaoXdMSEThNPRjwhqTA==,type:str]
-#ENC[AES256_GCM,data:FLhydTaiOqLRFk+ZrgGx9Q==,iv:TqhX2ylJKFQjdOpmwCER1+gRe4iR+I0hkVkNnYH4ESo=,tag:1BSk9TKqTma4MVUMswwmog==,type:comment]
-example_array:
- - ENC[AES256_GCM,data:1sIEL3xGDAygUKoodBA=,iv:1DumVv8vDvhT/K0jXM1vHdrFTE7dIxqqjS8CIpWdnc8=,tag:WSs+3a816zVOaGCTElxgFQ==,type:str]
- - ENC[AES256_GCM,data:tFi1czQnVgX/nlWrJrs=,iv:isH65ldilVe3EjsKNP/dOKgtWZtHQPw364fPHBI+LEw=,tag:Ka5ywriFptKg3+lIHPEIyA==,type:str]
-example_number: ENC[AES256_GCM,data:sxSM8a9oAp+u6g==,iv:KRLfIxZuBsnK+QE4mqm3pyhJmE7Fsd4ykJA++KrOnEQ=,tag:F5EkVUzw06ulr5jZvlTJdg==,type:float]
-example_booleans:
- - ENC[AES256_GCM,data:PDts2Q==,iv:qtfKg5gmUw2aERJe3gfT15Pk7mWocXwKdJhAzSic1o0=,tag:gn1sWsgt9ihYF8bHAkAQwQ==,type:bool]
- - ENC[AES256_GCM,data:o9as7T0=,iv:YXyTB2X9PmTsOd37+BAp2xnT/+Yzyajcn5y1GE1O5rE=,tag:hyXA43jpyAbgH2hg1ivloQ==,type:bool]
-sops:
- shamir_threshold: 1
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
- age:
- - recipient: age1zrgu7w8059xydagm60phnffghvfe9h2ca58cx8qwagqpyfuvs9fqw79c8h
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvUURIQmZvSVp3aXlFT0RR
- VHVBR0drN2JyV1hNUk5sakxGRXl6SEJuOUUwClQ1Q1lRZTR5R3Z4dlZyb29OaTNW
- UVcwV3h6UlhtZkg2aFhrUUtIT0tQRmsKLS0tIDlnckhHWXRKcmRwTGUzdHZxWEVh
- a3ZSWk0wNm1raXdMYXdKY1hDd2dZWUEK+IFU/9vsHu70XbSJ7sKqFncrZO3NAH8/
- X/XF1VUmIuDfQZYJsDa4HaXe52xvDWTw3/4frG9HutEI2NcvvRpxlw==
- -----END AGE ENCRYPTED FILE-----
- - recipient: age1ecyynwv93lfu7crjjp8l47defv07quzfzaktwurpep7jc9eha5pscg7lrw
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNRGxFWXJVcDZOdzVxaFJG
- LzdhN3JKaFhPOVBlblRPNWpDdERPaWhDNkM0CmcvUGxNQ09tNTJndWZTdjFia2pl
- RnNWQ0ZKSFhEN0FNbVZlKzlFUlh5QTgKLS0tIFkwc1pJajlyOGNHSTdaM3FQZWFK
- NUJpRDlLNXlGOTNBbVRTU0ZMVkhqdUUK1koXmGDGTKoNx1wp4c9EknY9LQ5a7dQP
- Zx6OzvtpsxL6KGjH7BeNNcm2zOR4YqnklLq09UsPHElz2upJQzECAQ==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-03-07T22:49:01Z"
- mac: ENC[AES256_GCM,data:yma+7wtzVjCzlLOVpqiicjQ9YN1ttzoh8CpcAtjdtVl6gu7/3FXUKYyAWJd+1NUUpK7vN435gOq9/nsig0FRrn0Hgq0+cjFUGS6+6+SPmL97eFvti89gCOeIFhPvBnJQYJLiyVkUcBek4xW+vnt6UgrTy+sD9AT3KHdBlfu3pzY=,iv:ioswFO5KDAL3Bv7MI8V0aWXXxZZIz1M1PyMUbIMnCRI=,tag:5fUBtqz9J2qvY4fUT2ueoQ==,type:str]
- pgp:
- - created_at: "2025-03-07T22:49:20Z"
- enc: |-
- -----BEGIN PGP MESSAGE-----
-
- hQEMAzy6JxafzLr5AQf/Xok7aBMNT6W3LV2Ekx/ccxEZaZ0aVNKHE9aFTz5kBSpu
- cXVohu5mEgeXr++HbrsCI821/gfchQ1yzVSLJsSrmZdJ586c3a7pWx2Eo4pcngmy
- vb5UWtTBNogABnLz4iTjVQYLjZeNcNhkzW6s3m9PiaX3AvJP9irPcmwIyYpzd9pt
- hngnBsdTis52fmvZ6+wOuMyTZU0Iksknom1De8xqgR5ZuO0Vitt19RGbpVhx96AC
- t1CUkb5WMFTdpbCFORa/ta9Z7UcKxXTAPsfPkPVG9DnHQ1jSmsJWPDQZxoIJLHuH
- SVV+qfRGndOo9fjExCInX6I5wBlrHrdpGtL7VLczV9JeAXYlMJwH63eOyi8hxxtr
- KfTJEIALC25uFhoK8bmr30yVZe7thUPMXfht+R5dlHne7+FcBb4k7YLpeN/M40me
- CSKk+9YaG7gQIdrfvEXlHSPCPppcKev6ZUspHewhmQ==
- =IMON
- -----END PGP MESSAGE-----
- fp: 0FECE8316E74BA6F44EFC21A2F8F21CE8721456B
- unencrypted_suffix: _unencrypted
- version: 3.9.4
diff --git a/system/configuration.nix b/system/configuration.nix
index 2380d22..a227e36 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -1,7 +1,7 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
-{ pkgs, config, ... }:
+{ pkgs, ... }:
{
imports = [
./android.nix
@@ -17,7 +17,6 @@
./locale.nix
./users.nix
./containers.nix
- ./nix-ld.nix
./network.nix
../settings
];
diff --git a/system/containers.nix b/system/containers.nix
index ddd3e38..9032a6c 100644
--- a/system/containers.nix
+++ b/system/containers.nix
@@ -9,7 +9,6 @@
config = lib.mkIf config.my.containers.enable {
services.flatpak.enable = true;
- programs.appimage.enable = true;
virtualisation.docker = {
enable = true;
diff --git a/system/fonts.nix b/system/fonts.nix
index 73aa8f7..2815563 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -5,7 +5,6 @@
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
- nerd-fonts.fira-code
- nerd-fonts.hack
+ nerdfonts_fira_hack
];
}
diff --git a/system/gaming.nix b/system/gaming.nix
index e79353e..e32c640 100644
--- a/system/gaming.nix
+++ b/system/gaming.nix
@@ -59,13 +59,5 @@
};
};
};
-
- programs.corectrl = {
- enable = true;
- gpuOverclock = {
- enable = true;
- ppfeaturemask = "0xffffffff";
- };
- };
};
}
diff --git a/system/gitlab-runner.nix b/system/gitlab-runner.nix
index 8db526f..c50e1b9 100644
--- a/system/gitlab-runner.nix
+++ b/system/gitlab-runner.nix
@@ -1,55 +1,51 @@
{ 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: {
- # 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"
- ];
- dockerDisableCache = true;
- 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";
+ mkNixRunner =
+ authenticationTokenConfigFile: with lib; rec {
+ # 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"
+ ];
+ 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
+ ]
+ )
+ }
+ '';
+ 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";
+ };
};
- };
}
diff --git a/system/locale.nix b/system/locale.nix
index e2c7e81..07e7175 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.UTF-8";
+ i18n.defaultLocale = "pt_BR.utf8";
# Configure keymap in X11
services.xserver.xkb = {
diff --git a/system/monolith-bitbucket-runner.nix b/system/monolith-bitbucket-runner.nix
deleted file mode 100644
index 17d462b..0000000
--- a/system/monolith-bitbucket-runner.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- config,
- pkgs,
- ...
-}:
-
-let
- mkRunner = secret: {
- image = "docker-public.packages.atlassian.com/sox/atlassian/bitbucket-pipelines-runner:latest";
- volumes = [
- "/tmp:/tmp"
- "/var/run/docker.sock:/var/run/docker.sock"
- "/var/lib/docker/containers:/var/lib/docker/containers:ro"
- ];
- environmentFiles = [ secret ];
- };
-
- secretConf = {
- sopsFile = ../secrets/monolith/default.yaml;
- };
-in
-{
- virtualisation.docker = {
- enable = true;
- daemon.settings = {
- # needed by bitbucket runner ???
- log-driver = "json-file";
- log-opts = {
- max-size = "10m";
- max-file = "3";
- };
- };
- };
-
- virtualisation.oci-containers.backend = "docker";
-
- virtualisation.oci-containers.containers = {
- bitbucket-runner-1 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-1".path;
- bitbucket-runner-2 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-2".path;
- bitbucket-runner-3 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-3".path;
- bitbucket-runner-4 = mkRunner config.sops.secrets."bitbucket-runners/wopus-runner-4".path;
- };
-
- sops.secrets = {
- "bitbucket-runners/wopus-runner-1" = secretConf;
- "bitbucket-runners/wopus-runner-2" = secretConf;
- "bitbucket-runners/wopus-runner-3" = secretConf;
- "bitbucket-runners/wopus-runner-4" = secretConf;
- };
-}
diff --git a/system/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix
index dd80627..3e63d98 100644
--- a/system/monolith-gitlab-runner.nix
+++ b/system/monolith-gitlab-runner.nix
@@ -1,6 +1,7 @@
{
config,
pkgs,
+ lib,
...
}:
let
@@ -15,46 +16,9 @@ in
services = {
# runner for building in docker via host's nix-daemon
# nix store will be readable in runner, might be insecure
- 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`
- # `CI_SERVER_TOKEN`
- 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";
- };
+ thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
+ thoreb-itinerario-nix = mkNixRunner config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
};
};
systemd.services.gitlab-runner.serviceConfig.Nice = 10;
-
- sops.secrets = {
- "gitlab-runners/thoreb-telemetria-nix" = {
- sopsFile = ../secrets/monolith/default.yaml;
- };
- "gitlab-runners/thoreb-itinerario-nix" = {
- sopsFile = ../secrets/monolith/default.yaml;
- };
- "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;
- };
- };
}
diff --git a/system/nix-ld.nix b/system/nix-ld.nix
deleted file mode 100644
index 33afa69..0000000
--- a/system/nix-ld.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- pkgs,
- lib,
- config,
- ...
-}:
-{
- options.my.nix-ld.enable = lib.mkEnableOption { };
-
- config = lib.mkIf (config.my.nix-ld.enable) {
- programs.nix-ld = {
- enable = true;
- libraries =
- with pkgs;
- # run appimages + linux games natively
- [ fuse ]
- ++ (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
- ++ (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
- };
- };
-}
diff --git a/system/rainbow-gitlab-runner.nix b/system/rainbow-gitlab-runner.nix
new file mode 100644
index 0000000..52e573a
--- /dev/null
+++ b/system/rainbow-gitlab-runner.nix
@@ -0,0 +1,22 @@
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
+let
+ inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
+in
+{
+ boot.kernel.sysctl."net.ipv4.ip_forward" = true;
+ virtualisation.docker.enable = true;
+ services.gitlab-runner = {
+ enable = true;
+ settings.concurrent = 6;
+ services = {
+ thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
+ thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
+ };
+ };
+ systemd.services.gitlab-runner.serviceConfig.Nice = 10;
+}
diff --git a/system/secrets.nix b/system/secrets.nix
index 588dfe4..ca11fb4 100644
--- a/system/secrets.nix
+++ b/system/secrets.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
{
age = {
identityPaths = [ "/root/.ssh/id_rsa" ];
@@ -6,6 +6,7 @@
secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age;
+ secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age;
secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age;
};
diff --git a/system/sops.nix b/system/sops.nix
deleted file mode 100644
index d868153..0000000
--- a/system/sops.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
- environment.systemPackages = with pkgs; [
- sops
- gnupg
- ];
-
- sops = {
- defaultSopsFile = ../secrets/test.yaml;
- age.sshKeyPaths = [
- "/etc/ssh/ssh_host_ed25519_key"
- "/home/lelgenio/.ssh/id_ed25519"
- ];
- };
-}
diff --git a/user/dummy.nix b/user/dummy.nix
index 91e66cc..39043dd 100644
--- a/user/dummy.nix
+++ b/user/dummy.nix
@@ -1,7 +1,6 @@
{ lib, ... }:
{
options.my = {
- nix-ld.enable = lib.mkEnableOption { };
android.enable = lib.mkEnableOption { };
media-packages.enable = lib.mkEnableOption { };
containers.enable = lib.mkEnableOption { };
diff --git a/user/firefox.nix b/user/firefox.nix
index 0403a14..4b69ad2 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -1,11 +1,12 @@
{
config,
pkgs,
+ lib,
+ font,
...
}:
let
- inherit (config.my.theme) color;
-
+ inherit (config.my) desktop browser;
bugfixedFirefox = pkgs.firefox-devedition-unwrapped // {
requireSigning = false;
allowAddonSideload = true;
@@ -27,11 +28,11 @@ in
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 = "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";
@@ -55,15 +56,10 @@ in
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=";
+ 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 = "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";
@@ -88,14 +84,13 @@ in
dev-edition-default = {
isDefault = true;
search.force = true;
- search.default = "ddg";
+ search.default = "DuckDuckGo";
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
- "browser.tabs.groups.enabled" = true;
-
# enable media RDD to allow gpu acceleration
"media.rdd-ffmpeg.enabled" = true;
"media.rdd-ffvpx.enabled" = true;
@@ -112,6 +107,8 @@ 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;
@@ -122,22 +119,65 @@ in
"devtools.chrome.enabled" = true;
"devtools.debugger.remote-enabled" = true;
};
- userChrome = ''
- #sidebar-main {
- background-color: ${color.bg};
- }
+ userChrome =
+ if desktop == "sway" then
+ ''
+ #titlebar { display: none !important; }
+ #TabsToolbar { display: none !important; }
+ #sidebar-header { display: none !important; }
+ ''
+ else
+ ''
+ /* Element | chrome://browser/content/browser.xhtml */
- #tabbrowser-tabbox {
- outline-width: 0 !important;
- }
- '';
+ #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;
+ }
+ '';
};
};
};
wayland.windowManager.sway = {
extraConfig = ''
- exec firefox-devedition
+ exec firefox
'';
};
+ home.sessionVariables = {
+ MOZ_ENABLE_WAYLAND = "1";
+ MOZ_DISABLE_RDD_SANDBOX = "1";
+ };
};
}
diff --git a/user/git.nix b/user/git.nix
index d411d35..bfc85c1 100644
--- a/user/git.nix
+++ b/user/git.nix
@@ -16,46 +16,17 @@ in
user = {
name = username;
email = mail.personal.user;
- signingkey = "2F8F21CE8721456B";
};
init.defaultBranch = "main";
- core = {
- fsmonitor = true;
- untrackedCache = true;
- };
- commit = {
- verbose = true;
- gpgsign = true;
- };
- fetch = {
- prune = true;
- pruneTags = true;
- all = true;
- };
- push = {
- autoSetupRemote = true;
- default = "simple";
- followTags = true;
- };
+ commit.verbose = true;
+ push.autoSetupRemote = true;
pull.rebase = true;
- tag.sort = "version:refname";
- merge.conflictStyle = "zdiff3";
- rerere = {
- enabled = true;
- autoupdate = true;
- };
- branch.sort = "-committerdate";
- diff = {
- algorithm = "histogram";
- colorMoved = "plain";
- mnemonicPrefix = true;
- renames = true;
- };
+ merge.conflictStyle = "diff3";
+ rerere.enabled = true;
rebase = {
abbreviateCommands = true;
autoSquash = true;
autoStash = true;
- updateRefs = true;
};
pager = {
log = "${pkgs._diffr}/bin/_diffr | ${pkgs.kak-pager}/bin/kak-pager";
diff --git a/user/gnome.nix b/user/gnome.nix
index 776f095..74951c7 100644
--- a/user/gnome.nix
+++ b/user/gnome.nix
@@ -35,7 +35,6 @@ lib.mkIf (config.my.desktop == "gnome") {
amberol
pitivi
keepassxc
- menulibre
libsForQt5.qt5ct
libsForQt5.qtstyleplugin-kvantum
diff --git a/user/home-manager.nix b/user/home-manager.nix
deleted file mode 100644
index 9c8452a..0000000
--- a/user/home-manager.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ 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 334e260..c384c60 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -9,7 +9,6 @@
{
imports = [
./dummy.nix
- ./home-manager.nix
./waybar
./helix.nix
./kakoune
@@ -45,7 +44,6 @@
inputs.nix-index-database.hmModules.nix-index
../settings
./powerplay-led-idle.nix
- ./rm-target.nix
];
my = import ./variables.nix // {
@@ -59,6 +57,8 @@
home.username = "lelgenio";
home.homeDirectory = "/home/lelgenio";
+ # Let Home Manager install and manage itself.
+ programs.home-manager.enable = true;
home.packages = with pkgs; [
terminal
@@ -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-devedition.desktop";
+ web-browser = lib.mkDefault "firefox.desktop";
document-viewer = lib.mkDefault "org.pwmt.zathura.desktop";
file-manager = lib.mkDefault "thunar.desktop";
archive-manager = "engrampa.desktop";
@@ -169,6 +169,30 @@
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/kakoune/default.nix b/user/kakoune/default.nix
index fa63e6b..a015bd0 100644
--- a/user/kakoune/default.nix
+++ b/user/kakoune/default.nix
@@ -82,9 +82,6 @@ in
rev = "1cc6baeb14b773916eb9209469aa77b3cfa67a0a";
sha256 = "sha256-3PLxG9UtT0MMSibvTviXQIgTH3rApZ3WSbNCEH3c7HE=";
};
- buildInputs = with pkgs; [
- python3Minimal
- ];
})
];
extraConfig =
diff --git a/user/kakoune/filetypes.kak b/user/kakoune/filetypes.kak
index 9fa33a6..7ea774e 100644
--- a/user/kakoune/filetypes.kak
+++ b/user/kakoune/filetypes.kak
@@ -15,16 +15,8 @@ hook global WinSetOption filetype=nix %{
set buffer formatcmd 'nixfmt'
}
-hook global BufCreate .*\.json %{
- set buffer formatcmd "prettier --stdin-filepath=%val{buffile}"
-}
-
-hook global BufCreate .*\.ya?ml %{
- set buffer formatcmd "prettier --stdin-filepath=%val{buffile}"
-}
-
hook global BufCreate .*\.html %{
- set buffer formatcmd "prettier --stdin-filepath=%val{buffile}"
+ set buffer formatcmd 'prettier --parser html'
}
hook global BufCreate .*\.component\.html %{
@@ -43,15 +35,11 @@ hook global BufCreate .*\.php %{
}
hook global BufCreate .*\.js %{
- set buffer formatcmd "prettier --stdin-filepath=%val{buffile}"
-}
-
-hook global BufCreate .*\.ts %{
- set buffer formatcmd "prettier --stdin-filepath=%val{buffile}"
+ set buffer formatcmd 'prettier --parser babel'
}
hook global BufCreate .*\.scss %{
- set buffer formatcmd "prettier --stdin-filepath=%val{buffile}"
+ set buffer formatcmd 'prettier --parser scss'
}
hook global BufCreate .*\.vue %{
diff --git a/user/ranger/rc.conf b/user/ranger/rc.conf
index ad71849..3936f36 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 false
+set vcs_aware true
# State of the four backends git, hg, bzr, svn. The possible states are
# disabled, local (only show local info), enabled (show local and remote
diff --git a/user/rm-target.nix b/user/rm-target.nix
deleted file mode 100644
index 93c6058..0000000
--- a/user/rm-target.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ 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" ];
- };
- };
-}
diff --git a/user/sway/default.nix b/user/sway/default.nix
index 596fdde..325cad5 100644
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@@ -20,7 +20,6 @@ in
./swayidle.nix
./swaylock.nix
./theme.nix
- ./gammastep.nix
];
options.my.sway.enable = lib.mkEnableOption { };
@@ -33,7 +32,6 @@ in
my.mpd.enable = true;
my.zathura.enable = true;
my.waybar.enable = true;
- my.gammastep.enable = true;
wayland.windowManager.sway = {
enable = true;
@@ -115,8 +113,13 @@ in
for_window [title=.*] inhibit_idle fullscreen
exec swaymsg workspace 2
exec_always systemctl --user restart waybar.service
+ exec corectrl --minimize-systray
'';
};
+ services.gammastep = {
+ enable = true;
+ provider = "geoclue2";
+ };
services.kdeconnect = {
enable = true;
@@ -125,10 +128,7 @@ in
services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
- xdg.configFile."OpenTabletDriver/settings.json" = {
- force = true;
- source = ./open-tablet-driver.json;
- };
+ xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
home.packages = with pkgs; [
mySway
diff --git a/user/sway/gammastep.nix b/user/sway/gammastep.nix
deleted file mode 100644
index a5b6917..0000000
--- a/user/sway/gammastep.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ 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;
- };
- };
- };
-}
diff --git a/user/sway/mako.nix b/user/sway/mako.nix
index 28b5eb4..af6c673 100644
--- a/user/sway/mako.nix
+++ b/user/sway/mako.nix
@@ -34,13 +34,12 @@ in
defaultTimeout = 10000;
- settings = {
- "app-name=volumesh" = {
- "default-timeout" = "5000";
- "group-by" = "app-name";
- "format" = "%s\\n%b";
- };
- };
+ extraConfig = ''
+ [app-name=volumesh]
+ default-timeout=5000
+ group-by=app-name
+ format=%s\n%b
+ '';
# # {{@@ header() @@}}
# # text
diff --git a/user/sway/swaylock.nix b/user/sway/swaylock.nix
index ceb2e6b..8d0a195 100644
--- a/user/sway/swaylock.nix
+++ b/user/sway/swaylock.nix
@@ -9,7 +9,7 @@ in
options.my.swaylock.enable = lib.mkEnableOption { };
config.programs.swaylock.settings = lib.mkIf cfg.enable {
- image = theme.backgroundPath;
+ image = toString theme.background;
font = font.interface;
font-size = font.size.medium;
indicator-thickness = 20;
diff --git a/user/sway/theme.nix b/user/sway/theme.nix
index 600f596..731d12a 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 = "kvantum";
+ style.name = "qt5ct";
};
dconf.settings = {
@@ -70,6 +70,28 @@ 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 = {
@@ -83,6 +105,11 @@ 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
@@ -92,6 +119,7 @@ lib.mkIf (desktop == "sway") {
hack-font
font-awesome_5
fira-code
+ nerdfonts_fira_hack
material-wifi-icons
];
}
diff --git a/user/variables.nix b/user/variables.nix
index 65bc69a..cb35123 100644
--- a/user/variables.nix
+++ b/user/variables.nix
@@ -28,7 +28,6 @@ let
cursor_theme = "Bibata-Modern-Classic";
background = ./backgrounds/nixos-dark-pattern.png;
- backgroundPath = "~/.local/share/backgrounds/nixos-dark-pattern.png";
opacity = 95;
opacityHex = "ee";
color = {
@@ -60,7 +59,6 @@ let
cursor_theme = "Bibata-Modern-Classic";
background = ./backgrounds/nixos-light-pattern.png;
- backgroundPath = "~/.local/share/backgrounds/nixos-light-pattern.png";
opacity = 95;
opacityHex = "ee";
color = {
@@ -116,6 +114,6 @@ rec {
dmenu = "bmenu";
desktop = "sway";
- browser = "firefox-devedition";
+ browser = "firefox";
editor = "kakoune";
}
diff --git a/user/xdg-dirs.nix b/user/xdg-dirs.nix
index c4036c2..a9e1c9b 100644
--- a/user/xdg-dirs.nix
+++ b/user/xdg-dirs.nix
@@ -1,5 +1,8 @@
{
config,
+ pkgs,
+ lib,
+ inputs,
...
}:
let
@@ -21,4 +24,9 @@ in
videos = "${HOME}/Vídeos";
};
};
+
+ home.sessionVariables = {
+ CARGO_HOME = "${config.xdg.dataHome}/cargo";
+ RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+ };
}