Compare commits
9 commits
34ce013bf5
...
dac309eb2b
Author | SHA1 | Date | |
---|---|---|---|
chayleaf | dac309eb2b | ||
chayleaf | 77c32a9a16 | ||
chayleaf | 6ab0a2133c | ||
chayleaf | 22edb5bf53 | ||
chayleaf | 7bb8eebf70 | ||
chayleaf | 5b7e3df230 | ||
chayleaf | ab682c1135 | ||
chayleaf | 449f873faa | ||
chayleaf | 8ac7a4c10a |
266
flake.lock
266
flake.lock
|
@ -20,11 +20,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718371084,
|
"lastModified": 1723293904,
|
||||||
"narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
|
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "3a56735779db467538fb2e577eda28a9daacaca6",
|
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -65,15 +65,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719797756,
|
"lastModified": 1722902027,
|
||||||
"narHash": "sha256-TGZthxgxLdT8boadFm6+MK7HZlIxN1u1V+x3hu+Fd8I=",
|
"narHash": "sha256-STgis1RRrrerOrI/l7bBeJS8HR3ZHlsAhZ4NXO1eIi0=",
|
||||||
"owner": "nix-community",
|
"owner": "qowoz",
|
||||||
"repo": "buildbot-nix",
|
"repo": "buildbot-nix",
|
||||||
"rev": "0b56574a5c823097771487d1bac952c3549fe9fb",
|
"rev": "f43d4ee9e3325a486928ddc3d04956844b3baf56",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "qowoz",
|
||||||
|
"ref": "skipped-build-workers",
|
||||||
"repo": "buildbot-nix",
|
"repo": "buildbot-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -109,11 +110,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718936559,
|
"lastModified": 1718998007,
|
||||||
"narHash": "sha256-/wQ/mLp65bRgv42V8c86SKxr8jLLwinh3WVS0k93vq0=",
|
"narHash": "sha256-2ByOTMmdtoD5CDVq5O/VFdz2u9xLtk5z3NpFsWOmIyA=",
|
||||||
"owner": "chayleaf",
|
"owner": "chayleaf",
|
||||||
"repo": "coop-fd",
|
"repo": "coop-fd",
|
||||||
"rev": "d493b50550988a5a07421248102ebfdf68f4a046",
|
"rev": "f71ac2a8a62cc53896a2c0d6649c1451e86f8135",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -172,11 +173,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719733833,
|
"lastModified": 1723426710,
|
||||||
"narHash": "sha256-6h2EqZU9bL9rHlXE+2LCBgnDImejzbS+4dYsNDDFlkY=",
|
"narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "d185770ea261fb5cf81aa5ad1791b93a7834d12c",
|
"rev": "0d510fe40b56ed74907a021d7e1ffd0042592914",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -271,11 +272,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719745305,
|
"lastModified": 1722555600,
|
||||||
"narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
|
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
|
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -289,11 +290,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717285511,
|
"lastModified": 1722555600,
|
||||||
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
|
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
|
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -304,7 +305,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
@ -320,24 +321,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1705309234,
|
|
||||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -360,11 +343,11 @@
|
||||||
},
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708968331,
|
"lastModified": 1719091691,
|
||||||
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
|
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "impermanence",
|
"repo": "impermanence",
|
||||||
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
|
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -376,15 +359,16 @@
|
||||||
"mobile-nixos": {
|
"mobile-nixos": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720660935,
|
"lastModified": 1723685418,
|
||||||
"narHash": "sha256-GnDGoVaObUjnYdCHUSIYVE1anMElis+Pq+RY30LFlIk=",
|
"narHash": "sha256-ZDgzeknbWB7ZS4DfbQrYZC1iWcWnL5Zhr9c6iwP26yk=",
|
||||||
"owner": "NixOS",
|
"owner": "chayleaf",
|
||||||
"repo": "mobile-nixos",
|
"repo": "mobile-nixos",
|
||||||
"rev": "31704f8a55f5773c9b4e7adb7408a142d142e1f2",
|
"rev": "71e6bb4a74b91f4a45cb5387670423a56bbfad36",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "chayleaf",
|
||||||
|
"ref": "sdm845",
|
||||||
"repo": "mobile-nixos",
|
"repo": "mobile-nixos",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -409,11 +393,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719876004,
|
"lastModified": 1723586765,
|
||||||
"narHash": "sha256-YIGAUeEVgJ/Qpn+YUoyR9HjV6j01W+5vOKRYpqsx+gw=",
|
"narHash": "sha256-2YtIQm1DOph5fXkEySRdKAYSiWJK8ztc1NxoUnjvfSs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "infra",
|
"repo": "infra",
|
||||||
"rev": "766a23a468858d2413f12bec828860158abaadf1",
|
"rev": "177e5a2fbfeb70bbf86d7ca7efdfd5d1870678db",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -430,11 +414,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719128254,
|
"lastModified": 1722924007,
|
||||||
"narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
|
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "50581970f37f06a4719001735828519925ef8310",
|
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -448,14 +432,15 @@
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
],
|
||||||
|
"umu": "umu"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717896375,
|
"lastModified": 1723425928,
|
||||||
"narHash": "sha256-qI8f1XSFo1X29+RSVmYo5hDAMKKULnpmIZbRl77u21A=",
|
"narHash": "sha256-BFj0H0h3+hTCTsHTMCzmO7hQL3ym2MTgIdQe1SN1wPw=",
|
||||||
"owner": "fufexan",
|
"owner": "fufexan",
|
||||||
"repo": "nix-gaming",
|
"repo": "nix-gaming",
|
||||||
"rev": "6ed58348c20bab127555a3645e832591d2611f0c",
|
"rev": "cd19f284c40ce697db66314d0b7d29e41d47eb6b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -471,11 +456,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717919703,
|
"lastModified": 1723352546,
|
||||||
"narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=",
|
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6",
|
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -486,11 +471,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717828156,
|
"lastModified": 1723310128,
|
||||||
"narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=",
|
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "057a7996d012f342a38a26261ee529cebb1755ef",
|
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -506,14 +491,16 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"utils": "utils"
|
"nixpkgs-24_05": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717515088,
|
"lastModified": 1722877200,
|
||||||
"narHash": "sha256-nWOLpPA7+k7V1OjXTuxdsVd5jeeI0b13Di57wvnqkic=",
|
"narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "0d51a32e4799d081f260eb4db37145f5f4ee7456",
|
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -529,11 +516,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720913908,
|
"lastModified": 1721190060,
|
||||||
"narHash": "sha256-AZ0AcL1ze6gS8EmwRpuR04MXCLb/NDLjp9n+Gs4IhFQ=",
|
"narHash": "sha256-vWymGrTWE5tpzDMuVRRMNh7nQRYY4sTs8xYfG6Yeqk4=",
|
||||||
"owner": "chayleaf",
|
"owner": "chayleaf",
|
||||||
"repo": "nixos-router",
|
"repo": "nixos-router",
|
||||||
"rev": "38088dc1745350db709e9f2cf777979b5217f671",
|
"rev": "4c8feecbd2c569bc511781a492b37dc6e5c29669",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -544,11 +531,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719824438,
|
"lastModified": 1723316219,
|
||||||
"narHash": "sha256-pY0wosAgcr9W4vmGML0T3BVhQiGuKoozCbs2t+Je1zc=",
|
"narHash": "sha256-2B9qh8QBvw3kV/8cHc7ZJcrbVsRwP8wKjkwPXTSz76Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7f993cdf26ccef564eabf31fdb40d140821e12bc",
|
"rev": "bef98989a27429e1cb9e3d9c25701ba2da742af2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -560,30 +547,30 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-kernel": {
|
"nixpkgs-kernel": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717974879,
|
"lastModified": 1723362943,
|
||||||
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
|
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
|
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
|
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717284937,
|
"lastModified": 1722555339,
|
||||||
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
|
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-update": {
|
"nixpkgs-update": {
|
||||||
|
@ -603,11 +590,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719362107,
|
"lastModified": 1722969327,
|
||||||
"narHash": "sha256-Vrd+Y3odIIXjlUwSDOjyrhf6V4svB5njtGH9i0NJIxc=",
|
"narHash": "sha256-P8g6kDgZYMwxqmp8FRRZOwwBjkT4ILifvXV0fOz9ofY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-update",
|
"repo": "nixpkgs-update",
|
||||||
"rev": "d49fec1752e0bcb69f156a86ba5b93e14aaca2c3",
|
"rev": "503f7b0d94b6eb780a51823972e6ab0204b0a137",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -648,15 +635,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720888318,
|
"lastModified": 1723686439,
|
||||||
"narHash": "sha256-s5Pf3Es1reWTvHiz0YNuVknH/0RGo2vu+8MyeKT7VWo=",
|
"narHash": "sha256-sgHQqIDtHQUivF5vqa+k4iwbc/cx8F6x6IvXTlNd4Pg=",
|
||||||
"owner": "chayleaf",
|
"owner": "chayleaf",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "81b52fd15be6a3331668cc7bbaab4aec7c654472",
|
"rev": "43a0d4fefbfb1a9bc2f109769610038fcfae5ea0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "chayleaf",
|
"owner": "chayleaf",
|
||||||
|
"ref": "ci",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -703,11 +691,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717921035,
|
"lastModified": 1723664702,
|
||||||
"narHash": "sha256-TxZv3M3M2EromaaJCbRKWWjrnk9DSeJ139K4DkJlhAg=",
|
"narHash": "sha256-ErRJ3oUHFOzUXoDAzws/h5u7c6dCExETjmm5uIFL/QY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "02f829e2432d4204370445272084ce22761ba4bc",
|
"rev": "7bcbb0362c92f230ba4a2c5ad227e04f84fc1ce0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -783,17 +771,16 @@
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717899611,
|
"lastModified": 1723602049,
|
||||||
"narHash": "sha256-9Z95F8lnY/5sOf7Z4IdABKz1ulB0ueNrZU864rQj280=",
|
"narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "1f536afad5c18ea4ae6bb592c3fef038e1e33568",
|
"rev": "ea0bf33a11a26a62c60123c49d96011da396602c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -814,11 +801,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719716556,
|
"lastModified": 1722897572,
|
||||||
"narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=",
|
"narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6",
|
"rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -835,11 +822,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719835186,
|
"lastModified": 1723423676,
|
||||||
"narHash": "sha256-o0FB8SQVLOnbsYTk2Bt6gXwsfqEv4ZHsGP50/kM/gR0=",
|
"narHash": "sha256-E+DdXV2cFj77vU35cVNoEEE5YueE075HXiJLXwAxJ0k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "srvos",
|
"repo": "srvos",
|
||||||
"rev": "14b3b0aa48fa291f1be26ab8948d5b9eadaed0b8",
|
"rev": "a7cc81cd76c4c07bb7db01b731199ecd4be17305",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -878,36 +865,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -916,11 +873,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719749022,
|
"lastModified": 1723402464,
|
||||||
"narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
|
"narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
|
"rev": "c9f97032be6816fa234f24803b8ae79dc7753a91",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -929,6 +886,31 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"umu": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nix-gaming",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"dir": "packaging/nix",
|
||||||
|
"lastModified": 1723319758,
|
||||||
|
"narHash": "sha256-4WYwxNzH/95Vj0IqR2xh4gyiSn8H9bGnBECFWy4vjIk=",
|
||||||
|
"ref": "refs/heads/main",
|
||||||
|
"rev": "74656e9da4008f75f3b1d136dbaf1172bf6c232f",
|
||||||
|
"revCount": 697,
|
||||||
|
"submodules": true,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"dir": "packaging/nix",
|
||||||
|
"submodules": true,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
|
||||||
|
}
|
||||||
|
},
|
||||||
"unbound-rust-mod": {
|
"unbound-rust-mod": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane_2",
|
"crane": "crane_2",
|
||||||
|
@ -949,24 +931,6 @@
|
||||||
"repo": "unbound-rust-mod",
|
"repo": "unbound-rust-mod",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709126324,
|
|
||||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -3,15 +3,15 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nix-community-infra.url = "github:nix-community/infra";
|
nix-community-infra.url = "github:nix-community/infra";
|
||||||
nixpkgs-kernel.url = "github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3";
|
nixpkgs-kernel.url = "github:NixOS/nixpkgs/a58bc8ad779655e790115244571758e8de055e3d";
|
||||||
nixpkgs.url = "github:chayleaf/nixpkgs";
|
nixpkgs.url = "github:chayleaf/nixpkgs/ci";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:nix-community/nix-index-database";
|
url = "github:nix-community/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
mobile-nixos = {
|
mobile-nixos = {
|
||||||
url = "github:NixOS/mobile-nixos";
|
url = "github:chayleaf/mobile-nixos/sdm845";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
osu-wine = {
|
osu-wine = {
|
||||||
|
@ -51,6 +51,7 @@
|
||||||
nixos-mailserver = {
|
nixos-mailserver = {
|
||||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.nixpkgs-24_05.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
unbound-rust-mod = {
|
unbound-rust-mod = {
|
||||||
url = "github:chayleaf/unbound-rust-mod";
|
url = "github:chayleaf/unbound-rust-mod";
|
||||||
|
|
|
@ -103,6 +103,9 @@ commonConfig = {
|
||||||
inherit modifier;
|
inherit modifier;
|
||||||
startup = [
|
startup = [
|
||||||
{ command = toString (pkgs.writeShellScript "init-wm" ''
|
{ command = toString (pkgs.writeShellScript "init-wm" ''
|
||||||
|
${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
|
||||||
|
/run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
|
||||||
|
/run/current-system/sw/bin/systemctl --user start xdg-desktop-portal-gtk.service || true
|
||||||
${lib.optionalString config.phone.enable ''
|
${lib.optionalString config.phone.enable ''
|
||||||
${pkgs.procps}/bin/pkill -x wvkbd-mobintl
|
${pkgs.procps}/bin/pkill -x wvkbd-mobintl
|
||||||
${pkgs.wvkbd}/bin/wvkbd-mobintl --hidden -l full,special,cyrillic,emoji&
|
${pkgs.wvkbd}/bin/wvkbd-mobintl --hidden -l full,special,cyrillic,emoji&
|
||||||
|
@ -285,7 +288,15 @@ in
|
||||||
config = commonConfig // {
|
config = commonConfig // {
|
||||||
bars = [
|
bars = [
|
||||||
{
|
{
|
||||||
command = "${config.programs.waybar.package}/bin/waybar";
|
command = toString (pkgs.writeShellScript "run-waybar" ''
|
||||||
|
${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
|
||||||
|
/run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE || true
|
||||||
|
/run/current-system/sw/bin/systemctl --user start xdg-desktop-portal-gtk.service || true
|
||||||
|
while true; do
|
||||||
|
${config.programs.waybar.package}/bin/waybar > ~/var/waybar.log 2>&1
|
||||||
|
sleep 5 || true
|
||||||
|
done
|
||||||
|
'');
|
||||||
mode = "dock";
|
mode = "dock";
|
||||||
position = "top";
|
position = "top";
|
||||||
hiddenState = "hide";
|
hiddenState = "hide";
|
||||||
|
@ -390,7 +401,7 @@ in
|
||||||
startup = [
|
startup = [
|
||||||
{
|
{
|
||||||
always = true;
|
always = true;
|
||||||
command = "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP";
|
command = "${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; /run/current-system/sw/bin/systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; /run/current-system/sw/bin/systemctl --user reset-failed && /run/current-system/sw/bin/systemctl --user start sway-session.target && ${pkgs.sway}/bin/swaymsg -mt subscribe '[]' || true && /run/current-system/sw/bin/systemctl --user stop sway-session.target";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store --no-persist";
|
command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store --no-persist";
|
||||||
|
@ -487,7 +498,7 @@ in
|
||||||
home.packages = lib.mkIf config.wayland.windowManager.sway.enable (with pkgs; [
|
home.packages = lib.mkIf config.wayland.windowManager.sway.enable (with pkgs; [
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
xdg-desktop-portal-wlr
|
# xdg-desktop-portal-wlr
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
]);
|
]);
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
|
|
|
@ -21,7 +21,25 @@
|
||||||
});*/
|
});*/
|
||||||
settings = let
|
settings = let
|
||||||
layer = if config.phone.enable then "overlay" else "top";
|
layer = if config.phone.enable then "overlay" else "top";
|
||||||
in lib.toList {
|
in lib.optionals config.phone.enable [
|
||||||
|
{
|
||||||
|
inherit layer;
|
||||||
|
position = "top";
|
||||||
|
ipc = true;
|
||||||
|
height = 40;
|
||||||
|
clock = {
|
||||||
|
interval = 5;
|
||||||
|
format = "{:%Y-%m-%d %H:%M:%S}";
|
||||||
|
};
|
||||||
|
cpu = {
|
||||||
|
# format = "{usage}% ";
|
||||||
|
format = "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}";
|
||||||
|
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||||
|
};
|
||||||
|
modules-left = [ "cpu" ];
|
||||||
|
modules-right = [ "clock" ];
|
||||||
|
}
|
||||||
|
] ++ lib.toList {
|
||||||
inherit layer;
|
inherit layer;
|
||||||
position = "top";
|
position = "top";
|
||||||
ipc = true;
|
ipc = true;
|
||||||
|
@ -152,23 +170,6 @@
|
||||||
min-length = 2;
|
min-length = 2;
|
||||||
};
|
};
|
||||||
} ++ lib.optionals config.phone.enable [
|
} ++ lib.optionals config.phone.enable [
|
||||||
{
|
|
||||||
inherit layer;
|
|
||||||
position = "top";
|
|
||||||
ipc = true;
|
|
||||||
height = 40;
|
|
||||||
clock = {
|
|
||||||
interval = 5;
|
|
||||||
format = "{:%Y-%m-%d %H:%M:%S}";
|
|
||||||
};
|
|
||||||
cpu = {
|
|
||||||
# format = "{usage}% ";
|
|
||||||
format = "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}";
|
|
||||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
|
||||||
};
|
|
||||||
modules-left = [ "cpu" ];
|
|
||||||
modules-right = [ "clock" ];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
inherit layer;
|
inherit layer;
|
||||||
position = "bottom";
|
position = "bottom";
|
||||||
|
|
|
@ -22,24 +22,24 @@
|
||||||
"pinned": false,
|
"pinned": false,
|
||||||
"src": {
|
"src": {
|
||||||
"name": null,
|
"name": null,
|
||||||
"sha256": "sha256-4jh3mDm1GpR9tQBkzx9BRsJ5awNrBgRzylyRB04LqIE=",
|
"sha256": "sha256-vpr4DVWI7TZWb+roijpX5kJRPOJT4wZhT/ZnRrkgZKI=",
|
||||||
"type": "url",
|
"type": "url",
|
||||||
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-7/GE-Proton9-7.tar.gz"
|
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-11/GE-Proton9-11.tar.gz"
|
||||||
},
|
},
|
||||||
"version": "GE-Proton9-7"
|
"version": "GE-Proton9-11"
|
||||||
},
|
},
|
||||||
"searxng": {
|
"searxng": {
|
||||||
"cargoLocks": null,
|
"cargoLocks": null,
|
||||||
"date": "2024-06-07",
|
"date": "2024-08-09",
|
||||||
"extract": null,
|
"extract": null,
|
||||||
"name": "searxng",
|
"name": "searxng",
|
||||||
"passthru": null,
|
"passthru": null,
|
||||||
"pinned": false,
|
"pinned": false,
|
||||||
"src": {
|
"src": {
|
||||||
"sha256": "sha256-WWbpfZZei3kOdN607/J2M1oSzbPZKaLbsU5gO2kIc90=",
|
"sha256": "sha256-2QetT4xLlyKAC/eiIhShYRMRwFU9dJm6Ah5wS84Rgf8=",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/searxng/searxng/archive/f5eb56b63f250c7804e5e1cf4426e550bc933906.tar.gz"
|
"url": "https://github.com/searxng/searxng/archive/f1c05e7c16e59a8d5d98640bc057958ea268cddf.tar.gz"
|
||||||
},
|
},
|
||||||
"version": "f5eb56b63f250c7804e5e1cf4426e550bc933906"
|
"version": "f1c05e7c16e59a8d5d98640bc057958ea268cddf"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -12,19 +12,19 @@
|
||||||
};
|
};
|
||||||
proton-ge = {
|
proton-ge = {
|
||||||
pname = "proton-ge";
|
pname = "proton-ge";
|
||||||
version = "GE-Proton9-7";
|
version = "GE-Proton9-11";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-7/GE-Proton9-7.tar.gz";
|
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-11/GE-Proton9-11.tar.gz";
|
||||||
sha256 = "sha256-4jh3mDm1GpR9tQBkzx9BRsJ5awNrBgRzylyRB04LqIE=";
|
sha256 = "sha256-vpr4DVWI7TZWb+roijpX5kJRPOJT4wZhT/ZnRrkgZKI=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
searxng = {
|
searxng = {
|
||||||
pname = "searxng";
|
pname = "searxng";
|
||||||
version = "f5eb56b63f250c7804e5e1cf4426e550bc933906";
|
version = "f1c05e7c16e59a8d5d98640bc057958ea268cddf";
|
||||||
src = fetchTarball {
|
src = fetchTarball {
|
||||||
url = "https://github.com/searxng/searxng/archive/f5eb56b63f250c7804e5e1cf4426e550bc933906.tar.gz";
|
url = "https://github.com/searxng/searxng/archive/f1c05e7c16e59a8d5d98640bc057958ea268cddf.tar.gz";
|
||||||
sha256 = "sha256-WWbpfZZei3kOdN607/J2M1oSzbPZKaLbsU5gO2kIc90=";
|
sha256 = "sha256-2QetT4xLlyKAC/eiIhShYRMRwFU9dJm6Ah5wS84Rgf8=";
|
||||||
};
|
};
|
||||||
date = "2024-06-07";
|
date = "2024-08-09";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,10 +23,10 @@
|
||||||
};
|
};
|
||||||
"rikaitan" = buildFirefoxXpiAddon {
|
"rikaitan" = buildFirefoxXpiAddon {
|
||||||
pname = "rikaitan";
|
pname = "rikaitan";
|
||||||
version = "24.5.21.0";
|
version = "24.7.31.0";
|
||||||
addonId = "tatsu@autistici.org";
|
addonId = "tatsu@autistici.org";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4291845/rikaitan-24.5.21.0.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4337076/rikaitan-24.7.31.0.xpi";
|
||||||
sha256 = "a2a94d88af04023f14daaafda1f6ca7a7197f2ab92ada08ee2e9e4292d57a391";
|
sha256 = "be4b8484221aa8eb4348d1880de988d6f19f3b9ca53deda3fca657dfa2ce3108";
|
||||||
meta = with lib;
|
meta = with lib;
|
||||||
{
|
{
|
||||||
homepage = "https://github.com/Ajatt-Tools/rikaitan";
|
homepage = "https://github.com/Ajatt-Tools/rikaitan";
|
||||||
|
@ -38,6 +38,7 @@
|
||||||
"unlimitedStorage"
|
"unlimitedStorage"
|
||||||
"declarativeNetRequest"
|
"declarativeNetRequest"
|
||||||
"scripting"
|
"scripting"
|
||||||
|
"contextMenus"
|
||||||
"http://*/*"
|
"http://*/*"
|
||||||
"https://*/*"
|
"https://*/*"
|
||||||
"file://*/*"
|
"file://*/*"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 466d750b96184b793d276d9d0e30d37af4477fea Mon Sep 17 00:00:00 2001
|
From c4690b1496ca34c416869d2932abfa112a93f188 Mon Sep 17 00:00:00 2001
|
||||||
From: chayleaf <chayleaf-git@pavluk.org>
|
From: chayleaf <chayleaf-git@pavluk.org>
|
||||||
Date: Wed, 14 Aug 2024 08:17:44 +0700
|
Date: Wed, 14 Aug 2024 08:17:44 +0700
|
||||||
Subject: [PATCH 2/2] mobile: don't idle_notify for volume keys
|
Subject: [PATCH 1/2] mobile: don't idle_notify for volume keys
|
||||||
|
|
||||||
---
|
---
|
||||||
sway/input/keyboard.c | 4 +++-
|
sway/input/keyboard.c | 4 +++-
|
|
@ -1,26 +0,0 @@
|
||||||
From 7fead3cd2158fe913775ede5651291cf5f4ccf4d Mon Sep 17 00:00:00 2001
|
|
||||||
From: chayleaf <chayleaf-git@pavluk.org>
|
|
||||||
Date: Wed, 14 Aug 2024 07:32:11 +0700
|
|
||||||
Subject: [PATCH 1/2] mobile: reverse layer order
|
|
||||||
|
|
||||||
This makes exclusive anchored layers that were added first be first
|
|
||||||
---
|
|
||||||
sway/desktop/layer_shell.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
|
|
||||||
index 8c6cedfe..41a638ee 100644
|
|
||||||
--- a/sway/desktop/layer_shell.c
|
|
||||||
+++ b/sway/desktop/layer_shell.c
|
|
||||||
@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
|
|
||||||
struct wlr_box full_area = { 0 };
|
|
||||||
wlr_output_effective_resolution(output->wlr_output,
|
|
||||||
&full_area.width, &full_area.height);
|
|
||||||
- wl_list_for_each(sway_layer, list, link) {
|
|
||||||
+ wl_list_for_each_reverse(sway_layer, list, link) {
|
|
||||||
struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
|
|
||||||
struct wlr_layer_surface_v1_state *state = &layer->current;
|
|
||||||
if (exclusive != (state->exclusive_zone > 0)) {
|
|
||||||
--
|
|
||||||
2.44.1
|
|
||||||
|
|
46
pkgs/sway/0002-mobile-reverse-layer-order.patch
Normal file
46
pkgs/sway/0002-mobile-reverse-layer-order.patch
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
From 0d352dff09bab4536d2e182538641af1c6d2a1ef Mon Sep 17 00:00:00 2001
|
||||||
|
From: chayleaf <chayleaf-git@pavluk.org>
|
||||||
|
Date: Wed, 14 Aug 2024 07:32:11 +0700
|
||||||
|
Subject: [PATCH 2/2] mobile: reverse layer order
|
||||||
|
|
||||||
|
This makes exclusive anchored layers that were added first be first
|
||||||
|
---
|
||||||
|
sway/desktop/layer_shell.c | 12 ++++++------
|
||||||
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
|
||||||
|
index 8c6cedfe..4afca0b7 100644
|
||||||
|
--- a/sway/desktop/layer_shell.c
|
||||||
|
+++ b/sway/desktop/layer_shell.c
|
||||||
|
@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
|
||||||
|
struct wlr_box full_area = { 0 };
|
||||||
|
wlr_output_effective_resolution(output->wlr_output,
|
||||||
|
&full_area.width, &full_area.height);
|
||||||
|
- wl_list_for_each(sway_layer, list, link) {
|
||||||
|
+ wl_list_for_each_reverse(sway_layer, list, link) {
|
||||||
|
struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
|
||||||
|
struct wlr_layer_surface_v1_state *state = &layer->current;
|
||||||
|
if (exclusive != (state->exclusive_zone > 0)) {
|
||||||
|
@@ -214,14 +214,14 @@ void arrange_layers(struct sway_output *output) {
|
||||||
|
wlr_output_effective_resolution(output->wlr_output,
|
||||||
|
&usable_area.width, &usable_area.height);
|
||||||
|
|
||||||
|
- // Arrange exclusive surfaces from top->bottom
|
||||||
|
- arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
||||||
|
- &usable_area, true);
|
||||||
|
- arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
||||||
|
+ // Arrange exclusive surfaces from bottom->top
|
||||||
|
+ arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
||||||
|
&usable_area, true);
|
||||||
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
|
||||||
|
&usable_area, true);
|
||||||
|
- arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
||||||
|
+ arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
||||||
|
+ &usable_area, true);
|
||||||
|
+ arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
||||||
|
&usable_area, true);
|
||||||
|
|
||||||
|
if (memcmp(&usable_area, &output->usable_area,
|
||||||
|
--
|
||||||
|
2.44.1
|
||||||
|
|
|
@ -37,7 +37,6 @@ in
|
||||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
"net.ipv4.tcp_congestion_control" = "bbr";
|
||||||
};
|
};
|
||||||
|
|
||||||
# as expected, systemd initrd didn't work well, and i really cba to debug it
|
|
||||||
networking.useDHCP = false;
|
networking.useDHCP = false;
|
||||||
networking.useNetworkd = true;
|
networking.useNetworkd = true;
|
||||||
systemd.network = {
|
systemd.network = {
|
||||||
|
|
|
@ -41,8 +41,8 @@ in {
|
||||||
src = pkgs.fetchFromGitLab {
|
src = pkgs.fetchFromGitLab {
|
||||||
owner = "sdm845-mainline";
|
owner = "sdm845-mainline";
|
||||||
repo = "alsa-ucm-conf";
|
repo = "alsa-ucm-conf";
|
||||||
rev = "9ed12836b269764c4a853411d38ccb6abb70b383";
|
rev = "aaa7889f7a6de640b4d78300e118457335ad16c0";
|
||||||
hash = "sha256-QvGZGLEmqE+sZpd15fHb+9+MmoD5zoGT+pYqyWZLdkM=";
|
hash = "sha256-2P5ZTrI1vCJ99BcZVPlkH4sv1M6IfAlaXR6ZjAdy4HQ=";
|
||||||
};
|
};
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
substituteInPlace ucm2/lib/card-init.conf --replace '"/bin' '"/run/current-system/sw/bin'
|
substituteInPlace ucm2/lib/card-init.conf --replace '"/bin' '"/run/current-system/sw/bin'
|
||||||
|
@ -124,8 +124,11 @@ in {
|
||||||
# ignoreConfigErrors = false;
|
# ignoreConfigErrors = false;
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
{
|
{
|
||||||
name = "linux_6_9";
|
name = "linux_6_10";
|
||||||
patch = ./linux_6_9.patch;
|
patch = pkgs.fetchpatch {
|
||||||
|
url = "https://github.com/chayleaf/linux-sdm845/compare/v6.10.3...e81e06b6ac82b46d849f3c981a55d87572544c38.patch";
|
||||||
|
hash = "sha256-KYK2RMbSAkHIrXYdB0jhCifcNdH5qa010FGs6KyU8Ug=";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "config_fixes";
|
name = "config_fixes";
|
||||||
|
@ -141,9 +144,6 @@ in {
|
||||||
# fix build
|
# fix build
|
||||||
LENOVO_YOGA_C630_EC = no;
|
LENOVO_YOGA_C630_EC = no;
|
||||||
RPMSG_QCOM_GLINK_SMEM = yes;
|
RPMSG_QCOM_GLINK_SMEM = yes;
|
||||||
# useless lines, remove on update
|
|
||||||
DM_MIRROR = no;
|
|
||||||
DM_ZERO = no;
|
|
||||||
# for adb and stuff (doesn't have to be built-in, but it's easier that way)
|
# for adb and stuff (doesn't have to be built-in, but it's easier that way)
|
||||||
USB_FUNCTIONFS = yes;
|
USB_FUNCTIONFS = yes;
|
||||||
USB_LIBCOMPOSITE = yes;
|
USB_LIBCOMPOSITE = yes;
|
||||||
|
|
|
@ -149,20 +149,13 @@
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
};
|
};
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
netrc-file = "/secrets/netrc";
|
|
||||||
trusted-users = [ "hydra-builder" ];
|
trusted-users = [ "hydra-builder" ];
|
||||||
substituters = [
|
|
||||||
"https://binarycache.pavluk.org"
|
|
||||||
"https://cache.nixos.org/"
|
|
||||||
];
|
|
||||||
trusted-substituters = [
|
trusted-substituters = [
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://nix-gaming.cachix.org"
|
"https://nix-gaming.cachix.org"
|
||||||
"https://nixpkgs-wayland.cachix.org"
|
"https://nixpkgs-wayland.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"binarycache.pavluk.org:Vk0ms/vSqoOV2JXeNVOroc8EfilgVxCCUtpCShGIKsQ="
|
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
|
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
|
||||||
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
linkConfig.MACAddress = config.phone.mac;
|
linkConfig.MACAddress = config.phone.mac;
|
||||||
};
|
};
|
||||||
|
|
||||||
sound.enable = true;
|
|
||||||
services.logind.powerKey = "ignore";
|
services.logind.powerKey = "ignore";
|
||||||
services.logind.powerKeyLongPress = "poweroff";
|
services.logind.powerKeyLongPress = "poweroff";
|
||||||
hardware.sensor.iio.enable = true;
|
hardware.sensor.iio.enable = true;
|
||||||
|
@ -62,7 +61,7 @@
|
||||||
programs.sway.enable = true;
|
programs.sway.enable = true;
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
|
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
|
||||||
};
|
};
|
||||||
# services.xserver.desktopManager.phosh = {
|
# services.xserver.desktopManager.phosh = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
|
|
|
@ -205,6 +205,18 @@ in {
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.dbus.enable = true;
|
services.dbus.enable = true;
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
|
||||||
|
nix.settings = {
|
||||||
|
netrc-file = "/secrets/netrc";
|
||||||
|
substituters = [
|
||||||
|
"https://binarycache.pavluk.org"
|
||||||
|
"https://cache.nixos.org/"
|
||||||
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
"binarycache.pavluk.org:Vk0ms/vSqoOV2JXeNVOroc8EfilgVxCCUtpCShGIKsQ="
|
||||||
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
|
];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
12
update.sh
12
update.sh
|
@ -7,9 +7,9 @@ mozilla-addons-to-nix \
|
||||||
./pkgs/firefox-addons/addons.json \
|
./pkgs/firefox-addons/addons.json \
|
||||||
./pkgs/firefox-addons/generated.nix || echo "failed to update firefox addons"
|
./pkgs/firefox-addons/generated.nix || echo "failed to update firefox addons"
|
||||||
nix flake update
|
nix flake update
|
||||||
if [ -z ${SUDO_ASKPASS+x} ]; then
|
#if [ -z ${SUDO_ASKPASS+x} ]; then
|
||||||
sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
|
# sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
|
||||||
else
|
#else
|
||||||
sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
|
# sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
|
||||||
fi
|
#fi
|
||||||
home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
|
#home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
|
||||||
|
|
Loading…
Reference in a new issue