Compare commits

..

No commits in common. "544e95bd6f03ae0652c1392e9ab61ac210a0cfa7" and "b0db2aaef17f69d61bef72c9fee981cc164d2538" have entirely different histories.

9 changed files with 511 additions and 515 deletions

View file

@ -159,16 +159,16 @@
"emacs": {
"flake": false,
"locked": {
"lastModified": 1731760530,
"narHash": "sha256-kTtJ+yTPrPJoHuswx1HKOMAInGonWbVDEOQMB/lpB0M=",
"ref": "emacs-30",
"rev": "fc52cb8d74151bcac18d534529517a0a1845ad2e",
"revCount": 174450,
"lastModified": 1729922710,
"narHash": "sha256-4D0nwCQlFsIUpG0wHf34XcdRxSk2qgEWTzAzP9f3ZWQ=",
"ref": "master",
"rev": "2a6af880b0958d527a4d32005ef9acf3bc4ea030",
"revCount": 175318,
"type": "git",
"url": "https://git.savannah.gnu.org/git/emacs.git"
},
"original": {
"ref": "emacs-30",
"ref": "master",
"type": "git",
"url": "https://git.savannah.gnu.org/git/emacs.git"
}
@ -328,6 +328,24 @@
"type": "github"
}
},
"flake-parts_10": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1678379998,
"narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -390,6 +408,48 @@
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": [
"nix-fast-build",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_7": {
"inputs": {
"nixpkgs-lib": [
"nix-snapshotter",
@ -410,7 +470,7 @@
"type": "github"
}
},
"flake-parts_6": {
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": [
"nixos-anywhere",
@ -431,7 +491,7 @@
"type": "github"
}
},
"flake-parts_7": {
"flake-parts_9": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
@ -449,24 +509,6 @@
"type": "github"
}
},
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1678379998,
"narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-schemas": {
"locked": {
"lastModified": 1721999734,
@ -935,6 +977,49 @@
"type": "github"
}
},
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_5",
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": "nixpkgs_9",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1730233746,
"narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=",
"owner": "magicrb",
"repo": "nix-eval-jobs",
"rev": "aa0d6783d6d537dd42f02928fcc6d49c70c5fc61",
"type": "github"
},
"original": {
"owner": "magicrb",
"ref": "passthru-nix",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-fast-build": {
"inputs": {
"flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_10",
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1730233893,
"narHash": "sha256-OrEp/wJugnFVG7UQo88y/6xHV7nZBwbfSYm7BvIftZg=",
"owner": "magicrb",
"repo": "nix-fast-build",
"rev": "d225647dbb5acbcb76c9f0e1b3ee9093a0a3d94e",
"type": "github"
},
"original": {
"owner": "magicrb",
"ref": "reference-lock-file",
"repo": "nix-fast-build",
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": [
@ -981,6 +1066,27 @@
"type": "github"
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-mode": {
"flake": false,
"locked": {
@ -1000,8 +1106,8 @@
"nix-snapshotter": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_9"
"flake-parts": "flake-parts_7",
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1715438114,
@ -1042,8 +1148,8 @@
},
"nixng": {
"inputs": {
"nixpkgs": "nixpkgs_10",
"treefmt-nix": "treefmt-nix_2"
"nixpkgs": "nixpkgs_12",
"treefmt-nix": "treefmt-nix_4"
},
"locked": {
"lastModified": 1729011732,
@ -1061,7 +1167,7 @@
},
"nixng_2": {
"inputs": {
"nixpkgs": "nixpkgs_17"
"nixpkgs": "nixpkgs_19"
},
"locked": {
"lastModified": 1686222921,
@ -1078,11 +1184,11 @@
"nixos-anywhere": {
"inputs": {
"disko": "disko_2",
"flake-parts": "flake-parts_6",
"flake-parts": "flake-parts_8",
"nixos-images": "nixos-images",
"nixos-stable": "nixos-stable",
"nixpkgs": "nixpkgs_12",
"treefmt-nix": "treefmt-nix_3"
"nixpkgs": "nixpkgs_14",
"treefmt-nix": "treefmt-nix_5"
},
"locked": {
"lastModified": 1716883520,
@ -1300,6 +1406,37 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1723957280,
"narHash": "sha256-J08Yqf2IJ73y7myI69qEKsQ048ibweG6FeJeCxbIdB4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "abcef4da4ebb72240bddc370a27263627e64877f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1704420045,
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1723556749,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
@ -1315,7 +1452,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_13": {
"locked": {
"lastModified": 1726871744,
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
@ -1331,7 +1468,7 @@
"type": "github"
}
},
"nixpkgs_12": {
"nixpkgs_14": {
"locked": {
"lastModified": 1702310776,
"narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=",
@ -1347,7 +1484,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_15": {
"locked": {
"lastModified": 1686412476,
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
@ -1360,7 +1497,7 @@
"type": "indirect"
}
},
"nixpkgs_14": {
"nixpkgs_16": {
"locked": {
"lastModified": 1710765496,
"narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
@ -1376,7 +1513,7 @@
"type": "github"
}
},
"nixpkgs_15": {
"nixpkgs_17": {
"locked": {
"lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
@ -1392,7 +1529,7 @@
"type": "github"
}
},
"nixpkgs_16": {
"nixpkgs_18": {
"locked": {
"lastModified": 1676569297,
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
@ -1405,7 +1542,7 @@
"type": "indirect"
}
},
"nixpkgs_17": {
"nixpkgs_19": {
"locked": {
"lastModified": 1668984258,
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
@ -1421,22 +1558,6 @@
"type": "github"
}
},
"nixpkgs_18": {
"locked": {
"lastModified": 1693565476,
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716914467,
@ -1453,6 +1574,22 @@
"type": "github"
}
},
"nixpkgs_20": {
"locked": {
"lastModified": 1693565476,
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1716542732,
@ -1551,22 +1688,23 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1704420045,
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
"lastModified": 1723221148,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"notnft": {
"inputs": {
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1726605850,
@ -1703,7 +1841,7 @@
"inputs": {
"flake-compat": "flake-compat_4",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs_14",
"nixpkgs": "nixpkgs_16",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
@ -1746,22 +1884,6 @@
"type": "github"
}
},
"qmk": {
"flake": false,
"locked": {
"lastModified": 1731694548,
"narHash": "sha256-ppPpAfi3rI5ouQhJv0BaunKfWPh57ggDdu+qEpDlRVc=",
"owner": "qmk",
"repo": "qmk_firmware",
"rev": "f4e58eeff4a19bf1e2c38ed860193e455fe8703f",
"type": "github"
},
"original": {
"owner": "qmk",
"repo": "qmk_firmware",
"type": "github"
}
},
"root": {
"inputs": {
"buildbot-nix": "buildbot-nix",
@ -1783,6 +1905,8 @@
"nil": "nil",
"nix": "nix_2",
"nix-empty-flake": "nix-empty-flake",
"nix-eval-jobs": "nix-eval-jobs",
"nix-fast-build": "nix-fast-build",
"nix-gaming": "nix-gaming",
"nix-snapshotter": "nix-snapshotter",
"nixng": "nixng",
@ -1795,7 +1919,6 @@
"notnft": "notnft",
"percept": "percept",
"pre-commit-hooks": "pre-commit-hooks_3",
"qmk": "qmk",
"secret": "secret",
"thingiverse-downloader": "thingiverse-downloader",
"tuxedo-nixos": "tuxedo-nixos",
@ -2025,7 +2148,49 @@
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_11"
"nixpkgs": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723303070,
"narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "14c092e0326de759e16b37535161b3cb9770cea3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nix-fast-build",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723808491,
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_4": {
"inputs": {
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1727984844,
@ -2041,7 +2206,7 @@
"type": "github"
}
},
"treefmt-nix_3": {
"treefmt-nix_5": {
"inputs": {
"nixpkgs": [
"nixos-anywhere",
@ -2123,14 +2288,14 @@
},
"uk3s-nix": {
"inputs": {
"flake-parts": "flake-parts_7",
"flake-parts": "flake-parts_9",
"nix-snapshotter": [
"nix-snapshotter"
],
"nixng": [
"nixng"
],
"nixpkgs": "nixpkgs_15"
"nixpkgs": "nixpkgs_17"
},
"locked": {
"lastModified": 1730556797,
@ -2148,8 +2313,8 @@
},
"uterranix": {
"inputs": {
"flake-parts": "flake-parts_8",
"nixpkgs": "nixpkgs_16",
"flake-parts": "flake-parts_10",
"nixpkgs": "nixpkgs_18",
"terranix": "terranix"
},
"locked": {
@ -2210,7 +2375,7 @@
"modus-themes": "modus-themes",
"nix-mode": "nix-mode",
"nixng": "nixng_2",
"nixpkgs": "nixpkgs_18",
"nixpkgs": "nixpkgs_20",
"org-special-block-extras": "org-special-block-extras",
"org-thtml": "org-thtml",
"s-el": "s-el",

View file

@ -159,16 +159,16 @@
"emacs": {
"flake": false,
"locked": {
"lastModified": 1731760530,
"narHash": "sha256-kTtJ+yTPrPJoHuswx1HKOMAInGonWbVDEOQMB/lpB0M=",
"ref": "emacs-30",
"rev": "fc52cb8d74151bcac18d534529517a0a1845ad2e",
"revCount": 174450,
"lastModified": 1729922710,
"narHash": "sha256-4D0nwCQlFsIUpG0wHf34XcdRxSk2qgEWTzAzP9f3ZWQ=",
"ref": "master",
"rev": "2a6af880b0958d527a4d32005ef9acf3bc4ea030",
"revCount": 175318,
"type": "git",
"url": "https://git.savannah.gnu.org/git/emacs.git"
},
"original": {
"ref": "emacs-30",
"ref": "master",
"type": "git",
"url": "https://git.savannah.gnu.org/git/emacs.git"
}
@ -328,6 +328,24 @@
"type": "github"
}
},
"flake-parts_10": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1678379998,
"narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -390,6 +408,48 @@
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": [
"nix-fast-build",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_7": {
"inputs": {
"nixpkgs-lib": [
"nix-snapshotter",
@ -410,7 +470,7 @@
"type": "github"
}
},
"flake-parts_6": {
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": [
"nixos-anywhere",
@ -431,7 +491,7 @@
"type": "github"
}
},
"flake-parts_7": {
"flake-parts_9": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
@ -449,24 +509,6 @@
"type": "github"
}
},
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1678379998,
"narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-schemas": {
"locked": {
"lastModified": 1721999734,
@ -935,6 +977,49 @@
"type": "github"
}
},
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_5",
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": "nixpkgs_9",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1730233746,
"narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=",
"owner": "magicrb",
"repo": "nix-eval-jobs",
"rev": "aa0d6783d6d537dd42f02928fcc6d49c70c5fc61",
"type": "github"
},
"original": {
"owner": "magicrb",
"ref": "passthru-nix",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-fast-build": {
"inputs": {
"flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_10",
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1730233893,
"narHash": "sha256-OrEp/wJugnFVG7UQo88y/6xHV7nZBwbfSYm7BvIftZg=",
"owner": "magicrb",
"repo": "nix-fast-build",
"rev": "d225647dbb5acbcb76c9f0e1b3ee9093a0a3d94e",
"type": "github"
},
"original": {
"owner": "magicrb",
"ref": "reference-lock-file",
"repo": "nix-fast-build",
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": [
@ -981,6 +1066,27 @@
"type": "github"
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-mode": {
"flake": false,
"locked": {
@ -1000,8 +1106,8 @@
"nix-snapshotter": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_9"
"flake-parts": "flake-parts_7",
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1715438114,
@ -1042,8 +1148,8 @@
},
"nixng": {
"inputs": {
"nixpkgs": "nixpkgs_10",
"treefmt-nix": "treefmt-nix_2"
"nixpkgs": "nixpkgs_12",
"treefmt-nix": "treefmt-nix_4"
},
"locked": {
"lastModified": 1729011732,
@ -1061,7 +1167,7 @@
},
"nixng_2": {
"inputs": {
"nixpkgs": "nixpkgs_17"
"nixpkgs": "nixpkgs_19"
},
"locked": {
"lastModified": 1686222921,
@ -1078,11 +1184,11 @@
"nixos-anywhere": {
"inputs": {
"disko": "disko_2",
"flake-parts": "flake-parts_6",
"flake-parts": "flake-parts_8",
"nixos-images": "nixos-images",
"nixos-stable": "nixos-stable",
"nixpkgs": "nixpkgs_12",
"treefmt-nix": "treefmt-nix_3"
"nixpkgs": "nixpkgs_14",
"treefmt-nix": "treefmt-nix_5"
},
"locked": {
"lastModified": 1716883520,
@ -1300,6 +1406,37 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1723957280,
"narHash": "sha256-J08Yqf2IJ73y7myI69qEKsQ048ibweG6FeJeCxbIdB4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "abcef4da4ebb72240bddc370a27263627e64877f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1704420045,
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1723556749,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
@ -1315,7 +1452,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_13": {
"locked": {
"lastModified": 1726871744,
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
@ -1331,7 +1468,7 @@
"type": "github"
}
},
"nixpkgs_12": {
"nixpkgs_14": {
"locked": {
"lastModified": 1702310776,
"narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=",
@ -1347,7 +1484,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_15": {
"locked": {
"lastModified": 1686412476,
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
@ -1360,7 +1497,7 @@
"type": "indirect"
}
},
"nixpkgs_14": {
"nixpkgs_16": {
"locked": {
"lastModified": 1710765496,
"narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
@ -1376,7 +1513,7 @@
"type": "github"
}
},
"nixpkgs_15": {
"nixpkgs_17": {
"locked": {
"lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
@ -1392,7 +1529,7 @@
"type": "github"
}
},
"nixpkgs_16": {
"nixpkgs_18": {
"locked": {
"lastModified": 1676569297,
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
@ -1405,7 +1542,7 @@
"type": "indirect"
}
},
"nixpkgs_17": {
"nixpkgs_19": {
"locked": {
"lastModified": 1668984258,
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
@ -1421,22 +1558,6 @@
"type": "github"
}
},
"nixpkgs_18": {
"locked": {
"lastModified": 1693565476,
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716914467,
@ -1453,6 +1574,22 @@
"type": "github"
}
},
"nixpkgs_20": {
"locked": {
"lastModified": 1693565476,
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1716542732,
@ -1551,22 +1688,23 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1704420045,
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
"lastModified": 1723221148,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"notnft": {
"inputs": {
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1726605850,
@ -1703,7 +1841,7 @@
"inputs": {
"flake-compat": "flake-compat_4",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs_14",
"nixpkgs": "nixpkgs_16",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
@ -1749,11 +1887,11 @@
"qmk": {
"flake": false,
"locked": {
"lastModified": 1731694548,
"narHash": "sha256-ppPpAfi3rI5ouQhJv0BaunKfWPh57ggDdu+qEpDlRVc=",
"lastModified": 1730287613,
"narHash": "sha256-6+BxCybrZdX1gz45YQvKbQAWTo9wRKT3Vl1ADqeRaQI=",
"owner": "qmk",
"repo": "qmk_firmware",
"rev": "f4e58eeff4a19bf1e2c38ed860193e455fe8703f",
"rev": "465cbc87de0f9e92663cf4bb1a5e89739dbb5904",
"type": "github"
},
"original": {
@ -1783,6 +1921,8 @@
"nil": "nil",
"nix": "nix_2",
"nix-empty-flake": "nix-empty-flake",
"nix-eval-jobs": "nix-eval-jobs",
"nix-fast-build": "nix-fast-build",
"nix-gaming": "nix-gaming",
"nix-snapshotter": "nix-snapshotter",
"nixng": "nixng",
@ -2027,7 +2167,49 @@
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_11"
"nixpkgs": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723303070,
"narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "14c092e0326de759e16b37535161b3cb9770cea3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nix-fast-build",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723808491,
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_4": {
"inputs": {
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1727984844,
@ -2043,7 +2225,7 @@
"type": "github"
}
},
"treefmt-nix_3": {
"treefmt-nix_5": {
"inputs": {
"nixpkgs": [
"nixos-anywhere",
@ -2125,14 +2307,14 @@
},
"uk3s-nix": {
"inputs": {
"flake-parts": "flake-parts_7",
"flake-parts": "flake-parts_9",
"nix-snapshotter": [
"nix-snapshotter"
],
"nixng": [
"nixng"
],
"nixpkgs": "nixpkgs_15"
"nixpkgs": "nixpkgs_17"
},
"locked": {
"lastModified": 1730556797,
@ -2150,8 +2332,8 @@
},
"uterranix": {
"inputs": {
"flake-parts": "flake-parts_8",
"nixpkgs": "nixpkgs_16",
"flake-parts": "flake-parts_10",
"nixpkgs": "nixpkgs_18",
"terranix": "terranix"
},
"locked": {
@ -2212,7 +2394,7 @@
"modus-themes": "modus-themes",
"nix-mode": "nix-mode",
"nixng": "nixng_2",
"nixpkgs": "nixpkgs_18",
"nixpkgs": "nixpkgs_20",
"org-special-block-extras": "org-special-block-extras",
"org-thtml": "org-thtml",
"s-el": "s-el",

View file

@ -103,7 +103,6 @@
nixos/systems/grasshopper
nixos/systems/inkbook
nixos/systems/hela
nixos/systems/saw
nixng/containers/ingress-blowhole
nixng/containers/ingress-toothpick

View file

@ -1,208 +0,0 @@
# SPDX-FileCopyrightText: 2024 Richard Brežák <richard@brezak.sk>
#
# SPDX-License-Identifier: LGPL-3.0-or-later
{
inputs,
lib',
config,
...
}: let
inherit
(lib')
flip
mapAttrs
singleton
;
config' = config;
in {
flake.nixosConfigurations.saw = inputs.nixpkgs-stable.lib.nixosSystem {
system = "x86_64-linux";
# lib = lib';
specialArgs = {
config' = config';
inputs' = inputs;
secret = lib'.loadSecrets inputs.secret;
};
modules =
singleton
({
pkgs,
config,
lib,
...
}: let
river-gtk = pkgs.river.overrideAttrs (final: prev: {
nativeBuildInputs =
prev.nativeBuildInputs
++ (with pkgs; [
makeWrapper
wrapGAppsHook3
]);
buildInputs =
prev.buildInputs
++ (with pkgs; [
gdk-pixbuf
gsettings-desktop-schemas
glib
gtk3
]);
postFixup = ''
gappsWrapperArgsHook
wrapProgram $out/bin/river \
"''${gappsWrapperArgs[@]}"
'';
});
squeekboard = pkgs.squeekboard.overrideAttrs (final: prev: {
patches =
(prev.patches or [])
++ [
inputs.self.patches.squeekboard-layer-overlay
];
});
kodi-wayland = pkgs.kodi-wayland.withPackages (ps: [
pkgs.kodi-wayland.pythonPackages.pillow
]);
in {
imports = [
inputs.disko.nixosModules.default
inputs.impermenance.nixosModules.impermanence
./nixpkgs.nix
./users.nix
../../common/remote_access.nix
./disko.nix
];
security.rtkit.enable = true;
services.pipewire = {
enable = true;
wireplumber.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
jack.enable = true;
pulse.enable = true;
};
programs.river = {
enable = true;
package = river-gtk;
};
services.greetd = {
enable = true;
settings = {
default_session = {
command = "${lib.getExe pkgs.cage} -s -- ${lib.getExe pkgs.greetd.regreet}";
};
};
};
xdg.portal = {
config.common.default = [
"gtk"
];
enable = true;
xdgOpenUsePortal = true;
extraPortals = singleton pkgs.xdg-desktop-portal-gtk;
};
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/var/log"
"/var/lib/nixos"
];
files = [
"/etc/ssh/ssh_host_rsa_key"
"/etc/ssh/ssh_host_rsa_key.pub"
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_ed25519_key.pub"
];
users.main = {
directories = [
".kodi"
];
};
};
home-manager.users.main = {
home.file.".config/river/init".executable = true;
home.file.".config/river/init".text = ''
# riverctl default-layout rivercarro
# ${lib.getExe pkgs.rivercarro} -outer-gaps 0 &
# riverctl send-layout-cmd rivercarro "main-location monocle"
# riverctl spawn ${lib.getExe squeekboard}
riverctl spawn ${lib.getExe kodi-wayland}
'';
home.file.".config/lavalauncher/active.conf".text = let
launch = {
jellyfin = pkgs.writeShellScript "launch-jellyfin" ''
${lib.getExe pkgs.librewolf} http://jellyfin.in.redalder.org --kiosk
'';
pavucontrol = pkgs.writeShellScript "launch-pavucontrol" ''
${lib.getExe pkgs.pavucontrol} & disown
sleep 0.1
riverctl toggle-fullscreen
'';
next = pkgs.writeShellScript "show-next" ''
riverctl toggle-fullscreen
riverctl focus-view next
riverctl toggle-fullscreen
'';
};
in ''
global-settings
{
watch-config-file = true;
}
bar {
exclusive-zone = off;
alignment = center;
position = right;
layer = overlay;
button {
command = ${launch.jellyfin};
}
button {
command = ${launch.pavucontrol};
}
button {
command = ${launch.next};
}
}
'';
};
# xdg.portal.config.common = {
# # Use xdg-desktop-portal-gtk for every portal interface...
# default = "gtk";
# # ... except for the ScreenCast, Screenshot and Secret
# "org.freedesktop.impl.portal.ScreenCast" = "wlr";
# "org.freedesktop.impl.portal.Screenshot" = "wlr";
# # ignore inhibit bc gtk portal always returns as success,
# # despite sway/the wlr portal not having an implementation,
# # stopping firefox from using wayland idle-inhibit
# "org.freedesktop.impl.portal.Inhibit" = "none";
# };
# services.cage.program = "${lib.getExe pkgs.ungoogled-chromium} --kiosk --new-window --noerrdialogs --disable-infobars http://jellyfin.in.redalder.org";
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
time.timeZone = "Europe/Amsterdam";
system.stateVersion = "24.05";
});
};
}

View file

@ -1,94 +0,0 @@
{
lib,
config,
...
}: {
boot.initrd.systemd.enable = true;
boot.loader.efi = {
efiSysMountPoint = "/boot";
};
boot.loader.grub = {
devices = ["nodev"];
efiInstallAsRemovable = true;
efiSupport = true;
};
fileSystems = {
"/persist".neededForBoot = true;
"/nix" = lib.mapAttrs (_: lib.mkForce) {
fsType = "auto";
device = "/persist/nix";
options = ["x-initrd.mount" "bind"];
neededForBoot = true;
};
};
disko.devices = {
nodev."/tmp" = {
fsType = "tmpfs";
mountOptions = [
"size=256M"
"mode=755"
"noexec"
];
};
nodev."/" = {
fsType = "tmpfs";
mountOptions = [
"size=128M"
"mode=755"
"noexec"
];
};
nodev."/nix" = {
fsType = "ext4";
device = "/dev/disk/by-id/ata-SK_hynix_SC311_SATA_128GB_MJ88N52701150940J-part3";
mountOptions = [
"X-mount.subdir=nix"
];
preMountHook = ''
tmpdir=$(mktemp -d)
mount /dev/disk/by-id/ata-SK_hynix_SC311_SATA_128GB_MJ88N52701150940J-part3 $tmpdir
mkdir $tmpdir/nix
umount $tmpdir
'';
};
disk.ssd = {
device = "/dev/disk/by-id/ata-SK_hynix_SC311_SATA_128GB_MJ88N52701150940J";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "2048M";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = ["umask=0077"];
};
};
swap = {
size = "8192M";
content.type = "swap";
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/persist";
};
};
};
};
};
};
}

View file

@ -1,10 +0,0 @@
{
inputs',
config',
lib,
...
}: {
imports = [
../../common/nixpkgs.nix
];
}

View file

@ -1,24 +0,0 @@
{
inputs',
config',
secret,
lib,
...
}: {
imports = [
inputs'.home-manager-stable.nixosModules.default
../../common/users.nix
];
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = {
config' = config';
inputs' = inputs';
secret = secret;
};
home-manager.users.main = {
imports = [(inputs'.self + "/home-manager/modules/profiles/server.nix")];
home.stateVersion = "24.05";
};
}

View file

@ -1,13 +0,0 @@
diff --git a/src/panel.c b/src/panel.c
index a9942c8..63ade5c 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -79,7 +79,7 @@ panel_manager_request_widget (struct panel_manager *self, struct wl_output *outp
"anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
| ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
- "layer", ZWLR_LAYER_SHELL_V1_LAYER_TOP,
+ "layer", ZWLR_LAYER_SHELL_V1_LAYER_OVER,
"kbd-interactivity", FALSE,
"exclusive-zone", height,
"namespace", "osk",

1
test
View file

@ -1 +0,0 @@
2