v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

various updates

Browse source
This commit is contained in:
Vivian 2024-04-03 10:45:17 +02:00
parent ef35ed546e
commit 46151ed25b
5 changed files with 120 additions and 263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

313
flake.lock generated
View file

@ -61,27 +61,6 @@
"type": "github" "type": "github"
} }
}, },
"comma": {
"inputs": {
"flake-compat": "flake-compat_3",
"naersk": "naersk",
"nixpkgs": "nixpkgs_2",
"utils": "utils"
},
"locked": {
"lastModified": 1710529178,
"narHash": "sha256-PW9OS/ccRxigP0ikk1XR4QhQX4j9+ALQz0FMKXF3yRA=",
"owner": "nix-community",
"repo": "comma",
"rev": "1085a5af2907f537cae91c6279c98951dbc45cea",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "comma",
"type": "github"
}
},
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -126,16 +105,16 @@
}, },
"deploy": { "deploy": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"utils": "utils_2" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1711733382, "lastModified": 1711973905,
"narHash": "sha256-XuKlYhc9Hk6jMIIwWTP6CTQVUWi0Sq3nJApnUJk6bu8=", "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "2bad21828ee2c5d1e42588d5f4c53f5b10300c6a", "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,22 +182,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_10": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -284,38 +247,6 @@
} }
}, },
"flake-compat_6": { "flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_8": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -329,7 +260,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_9": { "flake-compat_7": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -345,6 +276,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_8": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -423,7 +370,7 @@
}, },
"flake-utils_10": { "flake-utils_10": {
"inputs": { "inputs": {
"systems": "systems_11" "systems": "systems_10"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -455,7 +402,7 @@
}, },
"flake-utils_12": { "flake-utils_12": {
"inputs": { "inputs": {
"systems": "systems_13" "systems": "systems_12"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -488,7 +435,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
@ -506,7 +453,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -524,7 +471,7 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -542,7 +489,7 @@
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -560,7 +507,7 @@
}, },
"flake-utils_7": { "flake-utils_7": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -578,7 +525,7 @@
}, },
"flake-utils_8": { "flake-utils_8": {
"inputs": { "inputs": {
"systems": "systems_9" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
@ -596,7 +543,7 @@
}, },
"flake-utils_9": { "flake-utils_9": {
"inputs": { "inputs": {
"systems": "systems_10" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -684,11 +631,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711625603, "lastModified": 1712093955,
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "rev": "80546b220e95a575c66c213af1b09fe255299438",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -705,11 +652,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711604890, "lastModified": 1711625603,
"narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -721,7 +668,7 @@
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
@ -763,11 +710,11 @@
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_3" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1710449465, "lastModified": 1710449465,
@ -786,7 +733,7 @@
"microvm": { "microvm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
@ -803,32 +750,10 @@
"type": "github" "type": "github"
} }
}, },
"naersk": {
"inputs": {
"nixpkgs": [
"comma",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community",
"repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
@ -852,11 +777,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711591334, "lastModified": 1711763326,
"narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +792,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1711241261, "lastModified": 1711846064,
"narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=", "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc", "rev": "90b1a963ff84dc532db92f678296ff2499a60a87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,27 +805,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat_7",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711761951,
"narHash": "sha256-De6fnc3EiBzaqtIZqPDfkODpS2WsOunVBcH7AOyzFEw=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "cf817213c972b089351ad42c49616076915f07bd",
"type": "github"
},
"original": {
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"type": "github"
}
},
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": "nixlib", "nixlib": "nixlib",
@ -909,11 +813,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711626141, "lastModified": 1711932680,
"narHash": "sha256-0qV1pHeIyUZ18cp8ijQnMf7uV+Uk4+UqTCC6yGSGWvk=", "narHash": "sha256-CEpVtyB7uyRprTuiG+lpWWMvM/C0CbY/dbBuxT5BDwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "63194fceafbfe583a9eb7d16ab499adc0a6c0bc2", "rev": "1f4c32ca4295bb7cca1e48a2f39b65490b249b0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1002,22 +906,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1710159071,
"narHash": "sha256-CT0WKgcmlcWZPZL/sSSICN/Vbm4Of0ZDgxc0GFf6sYU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0fbcc4b2e8571f4af39be41752581ea09dd9ab06",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1702272962, "lastModified": 1702272962,
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
@ -1033,7 +921,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1708475490, "lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
@ -1049,13 +937,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1712004559, "lastModified": 1712047400,
"narHash": "sha256-87vZKDepF3ZqpinX5zarC5Xb9dwpGgmfcl4Woy26lYA=", "narHash": "sha256-P1ddj7Anx1zQXyn1RqLcleA3ZL/8cmewWjdm2nR7mc8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5476cea4892cedbf6f8bbebdb93ba07e3f5f5e38", "rev": "43f956227e7bbcb11aa54ce1294f6b5bdf6c8fad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1064,13 +952,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1711523803, "lastModified": 1711703276,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1080,7 +968,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1645296114, "lastModified": 1645296114,
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
@ -1096,7 +984,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1696165369, "lastModified": 1696165369,
"narHash": "sha256-pd1cjFHCoEf9q5f9B0HhlOwwpBI9RP3HbUE6xjI7wAI=", "narHash": "sha256-pd1cjFHCoEf9q5f9B0HhlOwwpBI9RP3HbUE6xjI7wAI=",
@ -1115,19 +1003,19 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_6",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1711745924, "lastModified": 1712057047,
"narHash": "sha256-ZYVrOg12pWNbY1hx1lOu3cwER6xalEHUUIXnfbkCtUY=", "narHash": "sha256-o5KSQO82/sCgaaSsZONTeb+P47MXo0bbp+eID9I0CwI=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "4f83bcf2906c1c933316396221024f3482a7b086", "rev": "7baefc8aa587931827797db7fbd55a733179dc79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1138,11 +1026,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1711789378, "lastModified": 1712127152,
"narHash": "sha256-aFHVJ0j7p54FyjpfJ2nVMv5MDXrP4ttL8efcWu1lxf0=", "narHash": "sha256-LPFdS9oxJfLsIPn3/59p/n43EgUV3InMZdhlhmMg8WI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9c84c5419c332d79fbd2b3644c62f978beccfff9", "rev": "9d71b5e8ad6127de490d4715170ce32e767f2d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1153,7 +1041,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_9", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_9", "flake-utils": "flake-utils_9",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
@ -1166,11 +1054,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711519547, "lastModified": 1711760932,
"narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", "rev": "c11e43aed6f17336c25cd120eac886b96c455731",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1214,7 +1102,6 @@
"inputs": { "inputs": {
"attic": "attic", "attic": "attic",
"colmena": "colmena", "colmena": "colmena",
"comma": "comma",
"deploy": "deploy", "deploy": "deploy",
"essentials": "essentials", "essentials": "essentials",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
@ -1223,10 +1110,9 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"mailserver": "mailserver", "mailserver": "mailserver",
"microvm": "microvm", "microvm": "microvm",
"nixos-cosmic": "nixos-cosmic",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"t": "t", "t": "t",
@ -1351,21 +1237,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_13": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1511,24 +1382,6 @@
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@ -1543,9 +1396,9 @@
"type": "github" "type": "github"
} }
}, },
"utils_3": { "utils_2": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1709126324,
@ -1561,9 +1414,9 @@
"type": "github" "type": "github"
} }
}, },
"utils_4": { "utils_3": {
"inputs": { "inputs": {
"systems": "systems_12" "systems": "systems_11"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -1581,11 +1434,11 @@
}, },
"vault-secrets": { "vault-secrets": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_10", "flake-compat": "flake-compat_8",
"flake-utils": "flake-utils_11", "flake-utils": "flake-utils_11",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"utils": "utils_4" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1705066493, "lastModified": 1705066493,

20
flake.nix
View file

@ -6,9 +6,7 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable-small"; nixpkgs.url = "nixpkgs/nixos-unstable-small";
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena";
deploy.url = "github:serokell/deploy-rs"; deploy.url = "github:serokell/deploy-rs";
@ -19,8 +17,6 @@
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
comma.url = "github:nix-community/comma";
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
mailserver.inputs.nixpkgs.follows = "nixpkgs"; mailserver.inputs.nixpkgs.follows = "nixpkgs";
@ -46,14 +42,8 @@
attic.url = "github:zhaofengli/attic"; attic.url = "github:zhaofengli/attic";
attic.inputs.nixpkgs.follows = "nixpkgs"; attic.inputs.nixpkgs.follows = "nixpkgs";
# Website(s)
essentials.url = "github:jdonszelmann/essentials"; essentials.url = "github:jdonszelmann/essentials";
essentials.inputs.nixpkgs.follows = "nixpkgs"; essentials.inputs.nixpkgs.follows = "nixpkgs";
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -68,7 +58,6 @@
gnome-autounlock-keyring, gnome-autounlock-keyring,
lanzaboote, lanzaboote,
t, t,
nixos-cosmic,
... ...
}@inputs: }@inputs:
let let
@ -97,14 +86,6 @@
hostDefaults = { hostDefaults = {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
({ pkgs, self, ...}: {
system.replaceRuntimeDependencies = [
({
original = pkgs.xz;
replacement = pkgs.fixed-xz;
})
];
})
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
gnome-autounlock-keyring.nixosModules.default gnome-autounlock-keyring.nixosModules.default
./common ./common
@ -128,7 +109,6 @@
aoife = { aoife = {
modules = [ modules = [
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
nixos-cosmic.nixosModules.default
./common/desktop ./common/desktop
./hosts/thalassa/aoife ./hosts/thalassa/aoife
]; ];

6
hosts/thalassa/aoife/default.nix
View file

@ -44,9 +44,10 @@
home-manager.users.vivian = import ./home; home-manager.users.vivian = import ./home;
programs.hyprland.enable = true; programs.hyprland.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gnome-autounlock-keyring = { services.gnome-autounlock-keyring = {
enable = true; enable = true;
# target = "hyprland-session.target"; target = "hyprland-session.target";
}; };
services.interception-tools = { services.interception-tools = {
@ -60,9 +61,6 @@
''; '';
}; };
# services.desktopManager.cosmic.enable = true;
# services.displayManager.cosmic-greeter.enable = true;
# Enable Ozone rendering for Chromium and Electron apps. # Enable Ozone rendering for Chromium and Electron apps.
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

42
hosts/thalassa/aoife/home/hyprland.nix
View file

@ -3,7 +3,7 @@
systemd.user.services.mako = { systemd.user.services.mako = {
Install = { Install = {
WantedBy = [ "graphical-session.target" ]; WantedBy = [ "hyprland-session.target" ];
}; };
Service = { Service = {
Type = "dbus"; Type = "dbus";
@ -59,6 +59,7 @@
wireplumber = { wireplumber = {
format = "󰕾 {volume}%"; format = "󰕾 {volume}%";
format-muted = "󰖁"; format-muted = "󰖁";
on-click = "wpctl set-mute @DEFAULT_SINK@ toggle";
}; };
network = { network = {
@ -112,13 +113,20 @@
wayland.windowManager.hyprland = wayland.windowManager.hyprland =
let let
toggle_mirror = pkgs.writeScriptBin "toggle_mirror.sh" '' toggle_mirror = pkgs.writeScriptBin "toggle_mirror.sh" ''
#!/usr/bin/env bash #!${pkgs.stdenv.shell}
if [ $(hyprctl monitors all -j | ${pkgs.jq}/bin/jq '.[1].activeWorkspace.id') = '-1' ]; then if [ $(hyprctl monitors all -j | ${pkgs.jq}/bin/jq '.[1].activeWorkspace.id') = '-1' ]; then
hyprctl keyword monitor ",preferred,auto,1" hyprctl keyword monitor ",preferred,auto,1"
else else
hyprctl keyword monitor ",preferred,auto,1,mirror,eDP-1" hyprctl keyword monitor ",preferred,auto,1,mirror,eDP-1"
fi fi
''; '';
startup = pkgs.writeScriptBin "startup.sh" ''
#!${pkgs.stdenv.shell}
firefox &
discord &
element-desktop &
'';
in in
{ {
enable = true; enable = true;
@ -136,8 +144,7 @@
{ {
"$mod" = "SUPER"; "$mod" = "SUPER";
exec-once = [ exec-once = [
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "${startup}/bin/startup.sh"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
]; ];
monitor = [ monitor = [
"eDP-1, 3840x2400@60,0x0,2" "eDP-1, 3840x2400@60,0x0,2"
@ -148,7 +155,7 @@
}; };
general = { general = {
gaps_in = 5; gaps_in = 5;
gaps_out = 20; gaps_out = 10;
border_size = 2; border_size = 2;
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
"col.inactive_border" = "rgba(595959aa)"; "col.inactive_border" = "rgba(595959aa)";
@ -156,6 +163,17 @@
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
allow_tearing = false; allow_tearing = false;
}; };
group = {
"col.border_active" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
"col.border_inactive" = "rgba(595959aa)";
groupbar = {
font_size = 16;
"col.active" = "rgba(babbf1aa)";
"col.inactive" = "rgba(414559aa)";
text_color = "rgba(232634ff)";
};
};
decoration = { decoration = {
rounding = 10; rounding = 10;
@ -191,8 +209,10 @@
gestures.workspace_swipe = true; gestures.workspace_swipe = true;
misc = { misc = {
force_default_wallpaper = 1; force_default_wallpaper = 2;
disable_splash_rendering = true; disable_splash_rendering = true;
# disable_hyprland_logo = true;
disable_autoreload = true;
}; };
windowrulev2 = [ windowrulev2 = [
@ -201,6 +221,7 @@
"workspace 1 silent, class:^(discord)$" "workspace 1 silent, class:^(discord)$"
"workspace 2 silent, class:^(firefox)$" "workspace 2 silent, class:^(firefox)$"
"float,class:^(firefox)$,title:^(Picture-in-Picture)$" "float,class:^(firefox)$,title:^(Picture-in-Picture)$"
"group set always,onworkspace:1 "
]; ];
# l -> works when screen is locked # l -> works when screen is locked
@ -224,7 +245,7 @@
"$mod, D, exec, ${menu}" "$mod, D, exec, ${menu}"
"$mod, P, pseudo, # dwindle" "$mod, P, pseudo, # dwindle"
"$mod, J, togglesplit, # dwindle" "$mod, J, togglesplit, # dwindle"
"SUPER,m,fullscreen" "$mod,m,fullscreen"
# Move focus with arrow keys # Move focus with arrow keys
"$mod, left, movefocus, l" "$mod, left, movefocus, l"
@ -235,9 +256,14 @@
# Scratch workspace # Scratch workspace
"$mod, S, togglespecialworkspace, magic" "$mod, S, togglespecialworkspace, magic"
"$mod SHIFT, S, movetoworkspace, special:magic" "$mod SHIFT, S, movetoworkspace, special:magic"
# Groups aka Tabs
"$mod,g,togglegroup"
"$mod,tab,changegroupactive"
# PrintScreen # PrintScreen
",Print,exec, grimblast copysave area /home/vivian/cloud/Pictures/Screenshots/$(date --iso=seconds).png" ",Print,exec,${pkgs.grimblast}/bin/grimblast copysave area /home/vivian/cloud/Pictures/Screenshots/$(date --iso=seconds).png"
# Toggle Mirror for external displays on/off
",XF86Display,exec,${toggle_mirror}/bin/toggle_mirror.sh"
] ]
++ ( ++ (
# workspaces # workspaces

2
hosts/thalassa/aoife/home/waybar.css
View file

@ -56,7 +56,7 @@ window#waybar.hidden {
#workspaces button { #workspaces button {
color: @text; color: @text;
background: @background3; /* background: @background3; */
/* margin: 7px 5px 10px 5px; */ /* margin: 7px 5px 10px 5px; */
} }