Compare commits

..

1 commit

Author SHA1 Message Date
e3fa982b95 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/cbe4866388730d63d98743cc884062b6374beb41' (2024-09-16)
  → 'github:nix-community/nixpkgs-wayland/6002e05eb85219d1018b3d3f6c8692ac26e2642a' (2024-09-16)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/8802412b8747633e9d80639897e4d58fa6290909' (2024-08-11)
  → 'github:nix-community/nix-eval-jobs/a7cdbbbd9a7755489267dfd1297c613c824a5920' (2024-09-16)
• Updated input 'roc':
    'github:roc-lang/roc/7df11424550bb7955a178190a3b341e34d184a19' (2024-09-15)
  → 'github:roc-lang/roc/38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf' (2024-09-16)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/8c866db5f020cbdbe9ea9123ce4b92478b41ede5?dir=nix' (2024-09-14)
  → 'github:daylinmorgan/tsm/5991d93bcb216c4cd5345296111fee7027be29cf?dir=nix' (2024-09-16)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/ff9255e02181bad3562f5f24fa27a26036a5f112' (2024-09-16)
  → 'github:mitchellh/zig-overlay/42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a' (2024-09-17)
• Updated input 'zls':
    'github:zigtools/zls/956b436a3f302d5dbc7fecfa565da666c1b2df77' (2024-09-15)
  → 'github:zigtools/zls/cf9b49a67b15693d62926ea11d17f53efc60be50' (2024-09-16)
2024-09-17 00:32:14 +00:00
4 changed files with 35 additions and 43 deletions

View file

@ -34,14 +34,11 @@ runs:
echo "Removing unwanted software... " echo "Removing unwanted software... "
if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then # if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then
# sudo apt-get purge \ # sudo apt-get purge \
# --allow-remove-essential \ # --allow-remove-essential \
# $(non_manifest_packages) # > /dev/null # $(non_manifest_packages) # > /dev/null
# Remove all packages that are not required by the base system: # fi
sudo apt-get remove $(comm -23 <(apt-mark showmanual | sort -u) <(gzip -dc /var/log/installer/initial-status.gz | sed -n 's/^Package: //p' | sort -u))
fi
sudo rm -rf \ sudo rm -rf \
/var/lib/docker/ \ /var/lib/docker/ \

View file

@ -179,11 +179,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1710146030,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1726580240, "lastModified": 1726430622,
"narHash": "sha256-VBXNeRJMaiqbIietRihPYnWA7bFJO2wqqlPg0f9Xfjc=", "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3c9716acfd00c6ea1b7bcd1dc63f97b51cc09998", "rev": "9e356562446f44c471ae38a80506a9df039305d6",
"revCount": 5227, "revCount": 5224,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -488,11 +488,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1726575175, "lastModified": 1726402305,
"narHash": "sha256-9SVJKVrX3q5dHHAuF/Eb/cjJgnZ3zZJq9kUoZHPbSrM=", "narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "2a444967aca0587396ea089bdb643f0111356f82", "rev": "90b637e33ab9be23e0ba3c57905a1837561923ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726590994, "lastModified": 1726411950,
"narHash": "sha256-CrvIEzBzvvfE7jGIXBv6hSYDxv4eYeHWAwVho5WrF48=", "narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=",
"rev": "8ab5743904a06c78153281bf61b3aa8aa451a489", "rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8ab5743904a06c78153281bf61b3aa8aa451a489.tar.gz?rev=8ab5743904a06c78153281bf61b3aa8aa451a489" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/80202e3ca314c21547c48f3a23d3f629cd9ddb87.tar.gz?rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1726586471, "lastModified": 1726530502,
"narHash": "sha256-6toT5xVsQumkIWIIy3zsE1rw9cx+a0JbeNfpxjMIWq4=", "narHash": "sha256-ls3VME2/LC1beE63N4KFGCjmUyzMY13evwX9Xi5kJ7A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "f1f31db00a336eddbd058009726369b2b3904591", "rev": "6002e05eb85219d1018b3d3f6c8692ac26e2642a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +791,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1726243404,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1726243404,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +900,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726567229, "lastModified": 1726501651,
"narHash": "sha256-5BfrNDZBwiG0dN09V7Skd5Bpr2HwVMCdDWOvneQ2iZ4=", "narHash": "sha256-W2az8KESGyK1PZtJ1SIriu0VRzlCmyVfmnHwa0exMK8=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "3215a8f3d73daf881185e4f7474972f2059754b6", "rev": "38674aeb9415c47b5ea1c397a7c7f8378cd5cbaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1184,11 +1184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726575046, "lastModified": 1726532622,
"narHash": "sha256-XD2qJ30wTLUz7BOXVz1wY/q+RJBvI7f6ksGJrYMbFAg=", "narHash": "sha256-BGaIY1UMGkHbtwlGixSiuzM+g8Nnkvec9fmas3jie/I=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "a2f15c93b689b31044d5604fb0cd5bac818daf01", "rev": "42a7e61fa262d2fe3df7c9544938ef0dd2a2a56a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -19,6 +19,5 @@ restic-gdrive
gitea gitea
lock lock
code code
direnv
comma-with-db comma-with-db
nix-index-with-db nix-index-with-db

View file

@ -150,11 +150,7 @@ proc findSystemPaths(drvs: Table[string, NixDerivation]): seq[string] =
func isIgnored(drv: string): bool = func isIgnored(drv: string): bool =
const ignoredPackages = (slurp "ignored.txt").splitLines() const ignoredPackages = (slurp "ignored.txt").splitLines()
let name = drv.split("-", 1)[1].replace(".drv","") let name = drv.split("-", 1)[1].replace(".drv","")
result = name in ignoredPackages name in ignoredPackages
if not result:
for pkg in ignoredPackages:
if name.startswith(pkg):
return true
proc systemPathDrvsToBuild(): seq[string] = proc systemPathDrvsToBuild(): seq[string] =
let toBuild = toBuildNixosConfiguration() let toBuild = toBuildNixosConfiguration()