Compare commits

..

1 commit
main ... teste

Author SHA1 Message Date
lelgenio f80c7a9d69 teste 2024-12-17 17:54:17 -03:00
35 changed files with 228 additions and 395 deletions

View file

@ -28,11 +28,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1736955230, "lastModified": 1723293904,
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,7 +166,9 @@
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1693509848, "lastModified": 1693509848,
@ -186,7 +188,9 @@
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1659395338, "lastModified": 1659395338,
@ -209,11 +213,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737038063, "lastModified": 1730190761,
"narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "rev": "3979285062d6781525cded0f6c4ff92e71376b55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,14 +228,16 @@
}, },
"dzgui-nix": { "dzgui-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1737831696, "lastModified": 1727831626,
"narHash": "sha256-+MiZ0DmokNycjvoFBddlzPw16GlSHEH7fARWB9RzTas=", "narHash": "sha256-Gvt5lapgNRRTL95gFH8vm48f8gjsk7GYM4Qo5aUOzzo=",
"owner": "lelgenio", "owner": "lelgenio",
"repo": "dzgui-nix", "repo": "dzgui-nix",
"rev": "0f3bc9ab6a2d3afe93007ec742afb71bc8f03f75", "rev": "38cf2b507d75cc36ec127b21fc5a4144fc821525",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,7 +371,7 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -383,7 +389,7 @@
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -401,7 +407,7 @@
}, },
"flake-utils_7": { "flake-utils_7": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -440,16 +446,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1726989464,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -458,7 +464,9 @@
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1728159958, "lastModified": 1728159958,
@ -481,11 +489,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737861961, "lastModified": 1729999765,
"narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -501,61 +509,48 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_05": [
"nixpkgs"
],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1737201600, "lastModified": 1718084203,
"narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=", "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4", "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "master", "ref": "nixos-24.05",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1684425776, "lastModified": 1730137625,
"narHash": "sha256-eXzSIXkzXa9EecoDF9xCsoim0vd++8dvYU7QOuQMO8A=", "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8dc174d8b768893172eb3e52008f10f48dfbd5cf", "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-24_11": {
"locked": {
"lastModified": 1734083684,
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1729880355,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -564,115 +559,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1659219666,
"narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1732812356,
"narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixpkgs-unstable",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1719010183,
"narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0f620ca71fa69abb411a6c78739a9b171a0a95a6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1737885640,
"narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-24.11",
"type": "indirect"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1735554305,
"narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1719010183,
"narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0f620ca71fa69abb411a6c78739a9b171a0a95a6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"plymouth-themes": { "plymouth-themes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -692,11 +578,11 @@
"ranger-icons": { "ranger-icons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736375293, "lastModified": 1713564482,
"narHash": "sha256-ck53eG+mGIQ706sUnEHbJ6vY1/LYnRcpq94JXzwnGTQ=", "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=",
"owner": "alexanderjeurissen", "owner": "alexanderjeurissen",
"repo": "ranger_devicons", "repo": "ranger_devicons",
"rev": "f227f212e14996fbb366f945ec3ecaf5dc5f44b0", "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,13 +604,12 @@
"made-you-look": "made-you-look", "made-you-look": "made-you-look",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-mailserver": "nixos-mailserver", "nixos-mailserver": "nixos-mailserver",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"plymouth-themes": "plymouth-themes", "plymouth-themes": "plymouth-themes",
"ranger-icons": "ranger-icons", "ranger-icons": "ranger-icons",
"tlauncher": "tlauncher", "tlauncher": "tlauncher",
"tomater": "tomater", "tomater": "tomater",
"treefmt-nix": "treefmt-nix",
"vpsadminos": "vpsadminos", "vpsadminos": "vpsadminos",
"warthunder-leak-counter": "warthunder-leak-counter", "warthunder-leak-counter": "warthunder-leak-counter",
"wl-crosshair": "wl-crosshair", "wl-crosshair": "wl-crosshair",
@ -880,6 +765,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tlauncher": { "tlauncher": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
@ -888,11 +788,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734044605, "lastModified": 1684504342,
"narHash": "sha256-CeCYv3JFJIySSf2eX9ceEOF1FqNGeJnzEuO5f+OvioQ=", "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "6a68f2cda0aa2fbb399a4c43b445e8c1a2df0634", "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71",
"revCount": 4, "revCount": 3,
"type": "git", "type": "git",
"url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix" "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
}, },
@ -917,31 +817,31 @@
"url": "https://git.lelgenio.com/lelgenio/tomater" "url": "https://git.lelgenio.com/lelgenio/tomater"
} }
}, },
"treefmt-nix": { "utils": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1737483750, "lastModified": 1709126324,
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "flake-utils",
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },
"vpsadminos": { "vpsadminos": {
"locked": { "locked": {
"lastModified": 1737943400, "lastModified": 1730290190,
"narHash": "sha256-2BqPlxdK4vvZYtYL+wVhch+U9/ZJrue5/t+VJsWqc+8=", "narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=",
"owner": "vpsfreecz", "owner": "vpsfreecz",
"repo": "vpsadminos", "repo": "vpsadminos",
"rev": "bced91cd0b47d61e648d1c254351206a3395c08a", "rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -954,7 +854,9 @@
"inputs": { "inputs": {
"crane": "crane_3", "crane": "crane_3",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_7" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1719076817, "lastModified": 1719076817,
@ -973,7 +875,9 @@
"wl-crosshair": { "wl-crosshair": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_8" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1715216838, "lastModified": 1715216838,

View file

@ -1,10 +1,10 @@
{ {
description = "My system config"; description = "My system config";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs.url = "nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; 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-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
vpsadminos.url = "github:vpsfreecz/vpsadminos"; vpsadminos.url = "github:vpsfreecz/vpsadminos";
@ -27,30 +27,45 @@
}; };
nixos-mailserver = { nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-24_05.follows = "nixpkgs";
}; };
dzgui-nix.url = "github:lelgenio/dzgui-nix"; dzgui-nix = {
url = "github:lelgenio/dzgui-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
tlauncher = { tlauncher = {
url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix"; url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko.url = "github:nix-community/disko";
url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
treefmt-nix.url = "github:numtide/treefmt-nix";
# my stuff # my stuff
dhist.url = "github:lelgenio/dhist"; dhist = {
demoji.url = "github:lelgenio/demoji"; url = "github:lelgenio/dhist";
wl-crosshair.url = "github:lelgenio/wl-crosshair"; inputs.nixpkgs.follows = "nixpkgs";
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"; demoji = {
url = "github:lelgenio/demoji";
inputs.nixpkgs.follows = "nixpkgs";
};
wl-crosshair = {
url = "github:lelgenio/wl-crosshair";
inputs.nixpkgs.follows = "nixpkgs";
};
warthunder-leak-counter = {
url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
inputs.nixpkgs.follows = "nixpkgs";
};
made-you-look = {
url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
inputs.nixpkgs.follows = "nixpkgs";
};
catboy-spinner = { catboy-spinner = {
url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner"; url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
flake = false; flake = false;
@ -100,6 +115,7 @@
{ login-manager.greetd.enable = desktop == "sway"; } { login-manager.greetd.enable = desktop == "sway"; }
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
inputs.dzgui-nix.nixosModules.default
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
{ {
@ -178,7 +194,6 @@
packages.${system} = pkgs // packages; packages.${system} = pkgs // packages;
# formatter.${system} = pkgs.nixfmt-rfc-style; formatter.${system} = pkgs.nixfmt-rfc-style;
formatter.${system} = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper;
}; };
} }

View file

@ -37,8 +37,7 @@ in
options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd; options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd;
}; };
boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
"/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/97EB-7DB5"; device = "/dev/disk/by-uuid/97EB-7DB5";

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
let let
undervoltGpu = pkgs.writeShellScript "undervolt-gpu" '' undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
set -xe set -xe
@ -13,14 +13,29 @@ in
{ {
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelParams = [ boot.kernelParams = [
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
"video=DP-1:1920x1080@144" "video=DP-1:1920x1080@144"
"amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
]; ];
hardware.graphics.enable32Bit = true; systemd.services.amd-fan-control = {
script = ''
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
'';
wantedBy = [ "multi-user.target" ];
};
hardware.graphics.extraPackages = with pkgs; [ hardware.opengl.driSupport = true;
# # For 32 bit applications
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages = with pkgs; [
libva libva
libvdpau
vaapiVdpau
rocm-opencl-icd
rocm-opencl-runtime
rocmPackages.rocm-smi
]; ];
services.udev.extraRules = '' services.udev.extraRules = ''

View file

@ -35,11 +35,9 @@ in
"sd_mod" "sd_mod"
]; ];
hardware.opentabletdriver = { hardware.opentabletdriver.enable = true;
enable = true;
# TODO: remove this once otd gets updated boot.kernelPackages = pkgs.linuxPackages_latest;
package = pkgs.unstable.opentabletdriver;
};
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];

View file

@ -1,9 +1,4 @@
{ { config, pkgs, ... }:
config,
pkgs,
lib,
...
}:
{ {
services.factorio = { services.factorio = {
enable = true; enable = true;
@ -15,33 +10,6 @@
extraSettingsFile = config.age.secrets.factorio-settings.path; extraSettingsFile = config.age.secrets.factorio-settings.path;
}; };
systemd.services.factorio = {
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
};
systemd.services.factorio-backup-save = {
description = "Backup factorio saves";
script = ''
${lib.getExe pkgs.rsync} \
-av \
--chown=lelgenio \
/var/lib/factorio/saves/default.zip \
~lelgenio/Documentos/GameSaves/factorio_saves/space-age-$(date --iso=seconds).zip
'';
serviceConfig.Type = "oneshot";
wantedBy = [ "multi-user.target" ];
};
systemd.timers.factorio-backup-save = {
timerConfig = {
OnCalendar = "*-*-* 18:00:00";
Persistent = true;
Unit = "factorio-backup-save.service";
};
wantedBy = [ "timers.target" ];
};
age.secrets.factorio-settings = { age.secrets.factorio-settings = {
file = ../../secrets/factorio-settings.age; file = ../../secrets/factorio-settings.age;
mode = "777"; mode = "777";

View file

@ -11,7 +11,6 @@
../../system/nix.nix ../../system/nix.nix
./hardware-config.nix ./hardware-config.nix
./mastodon.nix ./mastodon.nix
./lemmy.nix
./nextcloud.nix ./nextcloud.nix
./nginx.nix ./nginx.nix
./syncthing.nix ./syncthing.nix

View file

@ -1,14 +1,15 @@
{
config,
pkgs,
inputs,
...
}:
{ {
fileSystems."/var/lib/syncthing-data" = { fileSystems."/var/lib/syncthing-data" = {
device = "172.16.130.7:/nas/5749/syncthinng_data"; device = "172.16.130.7:/nas/5749/syncthinng_data";
fsType = "nfs"; fsType = "nfs";
options = [ "nofail" ]; options = [ "nofail" ];
}; };
fileSystems."/var/lib/mastodon" = {
device = "172.16.130.7:/nas/5749/mastodon";
fsType = "nfs";
options = [ "nofail" ];
};
swapDevices = [ swapDevices = [
{ {

View file

@ -1,18 +0,0 @@
{ pkgs, ... }:
{
services.lemmy = {
enable = true;
settings = {
hostname = "lemmy.lelgenio.com";
};
database.createLocally = true;
nginx.enable = true;
};
services.pict-rs.package = pkgs.pict-rs;
services.nginx.virtualHosts."lemmy.lelgenio.com" = {
enableACME = true;
forceSSL = true;
};
}

View file

@ -7,7 +7,7 @@
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud29;
hostName = "cloud.lelgenio.com"; hostName = "cloud.lelgenio.com";
https = true; https = true;
config = { config = {

View file

@ -1,10 +1,10 @@
{ factorio-headless, pkgs }: { factorio-headless, pkgs }:
factorio-headless.overrideAttrs (_: rec { factorio-headless.overrideAttrs (_: rec {
version = "2.0.28"; version = "2.0.23";
src = pkgs.fetchurl { src = pkgs.fetchurl {
name = "factorio_headless_x64-${version}.tar.xz"; name = "factorio_headless_x64-${version}.tar.xz";
url = "https://www.factorio.com/get-download/${version}/headless/linux64"; url = "https://www.factorio.com/get-download/${version}/headless/linux64";
hash = "sha256-6pk3tq3HoY4XpOHmSZLsOJQHSXs25oKAuxT83UyITdM="; hash = "sha256-6Bn8mtbfBhv51L/8kZiN0Y0OOYLIscIsBSXXi9o+8hY=";
}; };
}) })

View file

@ -5,6 +5,7 @@
wrapGAppsHook, wrapGAppsHook,
gtk3, gtk3,
gobject-introspection, gobject-introspection,
gnome,
}: }:
let let

View file

@ -1,33 +0,0 @@
#!/bin/sh
# Create the DOCKER-USER chain if it doesn't exist
iptables -N DOCKER-USER || true
# Flush existing rules in the DOCKER-USER chain
iptables -F DOCKER-USER
# Get all external network interfaces
interfaces=$(
ip -o -f inet addr show |
awk '{print $2}' |
grep -E '^(enp|eth|wlan|wlp)' |
sort -u
)
for iface in $interfaces; do
# Allow traffic from LAN
iptables -A DOCKER-USER -i "$iface" -s 127.0.0.1 -j ACCEPT
iptables -A DOCKER-USER -i "$iface" -s 10.0.0.0/8 -j ACCEPT
iptables -A DOCKER-USER -i "$iface" -s 192.168.0.0/16 -j ACCEPT
# Allow established and related connections
iptables -A DOCKER-USER -i "$iface" -m state --state RELATED,ESTABLISHED -j ACCEPT
# Drop all other traffic
iptables -A DOCKER-USER -i "$iface" -j DROP
echo "iptables rules have been set up for interface: $iface"
done
# Return to the previous chain
iptables -A DOCKER-USER -j RETURN

50
scripts/amd-fan-control Executable file
View file

@ -0,0 +1,50 @@
#!/usr/bin/env bash
set -e
DEVICE="$1" # eg: /sys/class/drm/card1/device
HWMON=$(echo "$DEVICE"/hwmon/hwmon*)
exit() {
echo "Setting controll to auto" >&2
echo 2 > "$HWMON/pwm1_enable"
}
trap exit EXIT INT
bail() {
echo "Error: $@" >&2
echo "Exiting..." >&2
exit 1
}
if ! [ -d $HWMON ]; then
bail "Invalid HWMON"
fi
TEMP_INPUT="$HWMON/temp2_input"
if ! [ -f $TEMP_INPUT ]; then
bail "Invalid TEMP_INPUT"
fi
MIN="$2"
MAX="$3"
echo "Running..." >&2
while true; do
TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
# Remap from a number between 60_000..90_000 to 0..255
PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) ))
if [ "$PWM" -gt 255 ]; then
PWM=255
elif [ "$PWM" -lt 0 ]; then
PWM=0
fi
echo 1 > "$HWMON/pwm1_enable"
echo "$PWM" > "$HWMON/pwm1"
sleep .1s
done

View file

@ -23,6 +23,7 @@
in in
with final; with final;
createScripts { createScripts {
amd-fan-control = [ bash ];
br = [ ]; br = [ ];
bmenu = [ bmenu = [
bemenu bemenu
@ -124,12 +125,6 @@
zbar zbar
wl-clipboard wl-clipboard
]; ];
git_clean_remote_deleted = [
git
gnugrep
gawk
findutils
];
pint-fmt = [ ]; pint-fmt = [ ];
powerplay-led-idle = [ powerplay-led-idle = [
bash bash
@ -138,12 +133,6 @@
]; ];
vrr-fullscreen = [ ]; vrr-fullscreen = [ ];
controller-battery = [ ]; controller-battery = [ ];
_docker-block-external-connections = [
iptables
gawk
gnugrep
iproute2
];
} }
// lib.mapAttrs importScript { // lib.mapAttrs importScript {
wdmenu = ./wdmenu.nix; wdmenu = ./wdmenu.nix;

View file

@ -1,6 +0,0 @@
#!/bin/sh
git branch -vv \
| grep ': gone]' \
| awk '{print $1}' \
| xargs git branch -D

View file

@ -43,7 +43,7 @@
glib # gsettings glib # gsettings
usbutils usbutils
# dracula-theme # gtk theme # dracula-theme # gtk theme
adwaita-icon-theme # default gnome cursors gnome3.adwaita-icon-theme # default gnome cursors
]; ];
services.geoclue2.enable = true; services.geoclue2.enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
services.flatpak.enable = true; services.flatpak.enable = true;
@ -22,8 +22,6 @@
}; };
}; };
networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections;
programs.extra-container.enable = true; programs.extra-container.enable = true;
programs.firejail.enable = true; programs.firejail.enable = true;

View file

@ -3,7 +3,7 @@
fonts.enableDefaultPackages = true; fonts.enableDefaultPackages = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk
noto-fonts-emoji noto-fonts-emoji
nerdfonts_fira_hack nerdfonts_fira_hack
]; ];

View file

@ -44,7 +44,7 @@ in
]; ];
}; };
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes repl-flake
''; '';
}; };
} }

View file

@ -12,7 +12,7 @@ in
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
services.gitlab-runner = { services.gitlab-runner = {
enable = true; enable = true;
settings.concurrent = 6; settings.concurrent = 1;
services = { services = {
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; 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; thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;

View file

@ -1,5 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

View file

@ -31,6 +31,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
protontricks protontricks
bottles bottles
inputs.dzgui-nix.packages.${pkgs.system}.default
]; ];
programs.dzgui.enable = true;
} }

View file

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
projectRootFile = "flake.nix";
programs.nixfmt.enable = true;
programs.nixfmt.package = pkgs.nixfmt-rfc-style;
settings.on-unmatched = "debug";
}

View file

@ -9,15 +9,15 @@
wayland.windowManager.sway = { wayland.windowManager.sway = {
extraConfig = '' extraConfig = ''
exec thunderbird exec thunderbird
exec discordcanary exec vesktop
exec telegram-desktop exec telegram-desktop
''; '';
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
tdesktop tdesktop
discord-canary vesktop
thunderbird thunderbird
element-desktop element-desktop-wayland
]; ];
} }

View file

@ -61,6 +61,11 @@ in
hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8="; hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8=";
}) })
(pkgs.fetchFirefoxAddon {
name = "mastodon_simplified_federation";
url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";
hash = "sha256-4iU25chpjsdsMTPaa0yQOTWc9V9q1qFz6YV0lYtNjLA=";
})
(pkgs.fetchFirefoxAddon { (pkgs.fetchFirefoxAddon {
name = "substitoot"; name = "substitoot";
url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi"; url = "https://addons.mozilla.org/firefox/downloads/file/4236602/substitoot-0.7.2.0.xpi";
@ -123,7 +128,6 @@ in
if desktop == "sway" then if desktop == "sway" then
'' ''
#titlebar { display: none !important; } #titlebar { display: none !important; }
#TabsToolbar { display: none !important; }
#sidebar-header { display: none !important; } #sidebar-header { display: none !important; }
'' ''
else else

View file

@ -13,36 +13,7 @@ in
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
extraConfig = { extraConfig = {
user = {
name = username;
email = mail.personal.user;
};
init.defaultBranch = "main";
commit.verbose = true;
push.autoSetupRemote = true;
pull.rebase = true;
merge.conflictStyle = "diff3";
rerere.enabled = true;
rebase = {
abbreviateCommands = true;
autoSquash = true;
autoStash = true;
};
pager = {
log = "${pkgs._diffr}/bin/_diffr | ${pkgs.kak-pager}/bin/kak-pager";
show = "${pkgs._diffr}/bin/_diffr | ${pkgs.kak-pager}/bin/kak-pager";
diff = "${pkgs._diffr}/bin/_diffr | ${pkgs.kak-pager}/bin/kak-pager";
};
alias = {
graph = "log --graph --oneline --branches";
root = "rev-parse --show-toplevel";
clean-deleted-remotes = "!" + (lib.getExe pkgs.git_clean_remote_deleted);
};
}; };
}; };
home.packages = with pkgs; [
git_clean_remote_deleted
];
}; };
} }

View file

@ -10,7 +10,7 @@ lib.mkIf (config.my.desktop == "gnome") {
home.pointerCursor = { home.pointerCursor = {
name = "Adwaita"; name = "Adwaita";
size = 24; size = 24;
package = pkgs.adwaita-icon-theme; package = pkgs.gnome.adwaita-icon-theme;
gtk.enable = true; gtk.enable = true;
}; };
@ -42,7 +42,7 @@ lib.mkIf (config.my.desktop == "gnome") {
qt6Packages.qtstyleplugin-kvantum qt6Packages.qtstyleplugin-kvantum
]; ];
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome; services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
xdg.defaultApplications = { xdg.defaultApplications = {
enable = lib.mkForce false; enable = lib.mkForce false;

View file

@ -75,7 +75,7 @@
comma comma
# System monitors # System monitors
(btop.override { rocmSupport = true; }) (btop.override { cudaSupport = true; })
amdgpu_top amdgpu_top
inxi inxi
dmidecode dmidecode

View file

@ -127,7 +127,7 @@ in
ranger ranger
bmenu bmenu
kak-lsp kak-lsp
kak-tree-sitter unstable.kak-tree-sitter
kak-pager kak-pager
kak-man-pager kak-man-pager

View file

@ -104,19 +104,6 @@ files.exclude = [
"**/bower_components/**", "**/bower_components/**",
"**/resources/views/**" "**/resources/views/**"
] ]
stubs = [
"apache", "bcmath", "bz2", "calendar", "com_dotnet", "Core", "ctype",
"curl", "date", "dba", "dom", "enchant", "exif", "FFI", "fileinfo", "filter",
"fpm", "ftp", "gd", "gettext", "gmp", "hash", "iconv", "imagick", "imap",
"intl", "json", "ldap", "libxml", "mbstring", "meta", "mysqli", "oci8",
"odbc", "openssl", "pcntl", "pcre", "PDO", "pdo_ibm", "pdo_mysql", "pdo_pgsql",
"pdo_sqlite", "pgsql", "Phar", "posix", "pspell", "readline", "Reflection",
"session", "shmop", "SimpleXML", "snmp", "soap", "sockets", "sodium",
"SPL", "sqlite3", "standard", "superglobals", "sysvmsg", "sysvsem", "sysvshm",
"tidy", "tokenizer", "xml", "xmlreader", "xmlrpc", "xmlwriter", "xsl",
"Zend OPcache", "zip", "zlib",
]
[language_server.rust-analyzer] [language_server.rust-analyzer]
filetypes = ["rust"] filetypes = ["rust"]

View file

@ -76,7 +76,7 @@
"Settings": [ "Settings": [
{ {
"Property": "Keys", "Property": "Keys",
"Value": "Control+Shift+Z" "Value": "Control+O"
} }
], ],
"Enable": true "Enable": true

View file

@ -58,6 +58,7 @@ in
{ app_id = "wdisplays"; } { app_id = "wdisplays"; }
{ app_id = "pavucontrol"; } { app_id = "pavucontrol"; }
{ app_id = ".*[Hh]elvum.*"; } { app_id = ".*[Hh]elvum.*"; }
{ workspace = "9"; }
]; ];
}; };
}; };

View file

@ -166,8 +166,7 @@ let
other_binds = { other_binds = {
"${mod}+p" = "exec ${pkgs.wpass}/bin/wpass"; "${mod}+p" = "exec ${pkgs.wpass}/bin/wpass";
"${mod}+s" = "exec ${menu}"; "${mod}+s" = "exec ${menu}";
"${mod}+g" = "${mod}+g" = "exec ${pkgs.demoji}/bin/demoji --lang pt --fallback --copy -- ${pkgs.wdmenu}/bin/wdmenu";
"exec ${pkgs.demoji}/bin/demoji --lang pt --fallback --copy -- ${pkgs.wdmenu}/bin/wdmenu";
"${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker"; "${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker";
"${mod}+Return" = "exec ${terminal}"; "${mod}+Return" = "exec ${terminal}";
"${mod}+Ctrl+Return" = "exec thunar"; "${mod}+Ctrl+Return" = "exec thunar";

View file

@ -12,11 +12,8 @@
}; };
home.file = { home.file = {
"${config.home.homeDirectory}/.config/VSCodium/User/keybindings.json".source = "${config.home.homeDirectory}/.config/VSCodium/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/keybindings.json";
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/keybindings.json"; "${config.home.homeDirectory}/.config/VSCodium/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/settings.json";
"${config.home.homeDirectory}/.config/VSCodium/User/settings.json".source = "${config.home.homeDirectory}/.config/VSCodium/product.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/product.json";
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/settings.json";
"${config.home.homeDirectory}/.config/VSCodium/product.json".source =
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/product.json";
}; };
} }