daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 22:57:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:41f9cd1c570744d687dde9abcabf41234fd18899
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:389d07413e1c377b2b21021d42d6bff320f98e43
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

No commits in common. "41f9cd1c570744d687dde9abcabf41234fd18899" and "389d07413e1c377b2b21021d42d6bff320f98e43" have entirely different histories.
41f9cd1c57 ... 389d07413e

5 changed files with 29 additions and 38 deletions
Show stats Expand all files Collapse all files

40
flake.lock
View file

@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1721332628, "lastModified": 1721248202,
"narHash": "sha256-kEB88spCIG7xTvKPlkghDNqZz26YHa0B06Ku2zsGFgo=", "narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8e15f91c2417c8f05d69a93f1294185ccc5f8f3e", "rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9",
"revCount": 4931, "revCount": 4930,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721324432, "lastModified": 1721314880,
"narHash": "sha256-SkALa1bLiyROFslXDfBZeitmOSUVUU0+3ewDvDYfxsc=", "narHash": "sha256-39RhKptnozRK63T4l6TcXGKjCXsvcetC4zCMj+0Xthw=",
"rev": "5ee1e6ea9887a54f0af3a66528abc04b17611516", "rev": "7b1abf81076c93a84becc310722013e44d850002",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5ee1e6ea9887a54f0af3a66528abc04b17611516.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7b1abf81076c93a84becc310722013e44d850002.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -679,11 +679,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1721317023, "lastModified": 1721048083,
"narHash": "sha256-U3vjp0cD8UaLcHgHUkt3Xn2dyjRBczkRElC6QmJRo1A=", "narHash": "sha256-9+v7DYzlQn0djo2j11Ges0uj5WzWajpob/Y3WcsEFks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "b8d5814544f54426f032ca6f783a00920dc96809", "rev": "7421424feb2e68a173f6fd218bbf71eb352404e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1721303309, "lastModified": 1721116560,
"narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=", "narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed", "rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1721138476, "lastModified": 1720957393,
"narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1150,11 +1150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721352101, "lastModified": 1721306038,
"narHash": "sha256-u1lIAYCYE+GJceU4xE6mWY4EQztBqxmFKjDme30xnq4=", "narHash": "sha256-eK+XZUOjz1864Lo7qf8xfLNIL7aeaFUbug9B0k07o08=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "2822a7f996bfb89ed6ea021718e21f93817d48d8", "rev": "7eefb0631345741feb4b31b94898ab20d67f7594",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
lib/extended.nix
View file

@ -64,7 +64,9 @@ let
]); ]);
flakeVer = flakeVer =
flake: "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}"; flake:
"${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
isNixFile = p: hasSuffix ".nix" p; isNixFile = p: hasSuffix ".nix" p;
isDefaultNixFile = p: hasSuffix "default.nix" p; isDefaultNixFile = p: hasSuffix "default.nix" p;

9
modules/languages/roc.nix
View file

@ -16,14 +16,13 @@ let
inherit version; inherit version;
}; };
lang-server = rocPkgs.lang-server.overrideAttrs { inherit version; }; lang-server = rocPkgs.lang-server.overrideAttrs {
inherit version;
};
in in
{ {
config = mkIfIn "roc" cfg { config = mkIfIn "roc" cfg {
environment.systemPackages = [ environment.systemPackages = [roc lang-server];
roc
lang-server
];
}; };
} }

12
modules/nix.nix
View file

@ -2,13 +2,9 @@
inputs, inputs,
self, self,
pkgs, pkgs,
lib,
enabled, enabled,
... ...
}: }:
let
inherit (lib) makeBinPath;
in
{ {
imports = [ inputs.nix-index-database.nixosModules.nix-index ]; imports = [ inputs.nix-index-database.nixosModules.nix-index ];
@ -46,13 +42,7 @@ in
system.activationScripts.diff = '' system.activationScripts.diff = ''
if [[ -e /run/current-system ]]; then if [[ -e /run/current-system ]]; then
PATH=$PATH:${ ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
makeBinPath [
pkgs.nvd
pkgs.nix
]
}
nvd diff /run/current-system "$systemConfig"
fi fi
''; '';