diff options
Diffstat (limited to '')
| -rw-r--r-- | common/common.nix | 1 | ||||
| -rw-r--r-- | home/packages.nix | 2 | ||||
| -rw-r--r-- | inputs.nix | 8 | ||||
| -rw-r--r-- | npins/sources.json | 38 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 2 |
5 files changed, 25 insertions, 26 deletions
diff --git a/common/common.nix b/common/common.nix index b26009f..02fec64 100644 --- a/common/common.nix +++ b/common/common.nix @@ -6,7 +6,6 @@ nixpkgs.flake = inputs.nixpkgs; unstable.flake = inputs.nixpkgs-unstable; }; - nix.package = pkgs.lix; nix.nixPath = lib.mkForce [ "nixpkgs=${inputs.nixpkgs}" "unstable=${inputs.nixpkgs-unstable}"]; diff --git a/home/packages.nix b/home/packages.nix index d21c76e..554484c 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -15,7 +15,7 @@ in dino # graphics & audio audacity blender darktable ffmpeg-full - gimp-with-plugins inkscape krita pavucontrol + gimp-with-plugins inkscape pavucontrol # krita gst_all_1.gstreamer vimiv-qt # LaTeX & documents xournal pandoc zathura pdfpc @@ -30,7 +30,7 @@ let (import sources.rust-overlay) deploy-rs.overlay (import ./pkgs/overlay.nix { inherit inputs; }) - # lix-overlay + lix-overlay ]; } // { outPath = sources.nixpkgs.outPath; }; @@ -52,8 +52,8 @@ let simple-nixos-mailserver = import sources.simple-nixos-mailserver; - # lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" { - # lix = sources.lix; - # }; + lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" { + lix = sources.lix; + }; }; in inputs diff --git a/npins/sources.json b/npins/sources.json index 0d3550c..77c29db 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -78,9 +78,9 @@ "repo": "home-manager" }, "branch": "release-24.11", - "revision": "613691f285dad87694c2ba1c9e6298d04736292d", - "url": "https://github.com/nix-community/home-manager/archive/613691f285dad87694c2ba1c9e6298d04736292d.tar.gz", - "hash": "1lvws93d1hq36lf1j1cfq6lzh1cgjrad8jhjw7vr987my5cfv450" + "revision": "bd65bc3cde04c16755955630b344bc9e35272c56", + "url": "https://github.com/nix-community/home-manager/archive/bd65bc3cde04c16755955630b344bc9e35272c56.tar.gz", + "hash": "15k41il0mvmwyv6jns4z8k6khhmb22jk5gpcqs1paym3l01g6abn" }, "isabelle-utils": { "type": "Git", @@ -100,9 +100,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/lix" }, "branch": "main", - "revision": "5c7ea4f446de58aa64f78087bb4ec26b9c4111aa", + "revision": "98d9fd0584af4a21965689332551875ef709af49", "url": null, - "hash": "00vz7s77f3nvgf5i6j86lk24r8yd245v4d42aa7dc8brmly7wfss" + "hash": "1rjs3q3j9mg705rj5xb2xhy285n9jxr44ajjzx2cpcsg7svi3n1w" }, "lix-nixos-module": { "type": "Git", @@ -111,9 +111,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/nixos-module" }, "branch": "main", - "revision": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", + "revision": "690f7c0fa2935bf591cccf4d7312b3e0f470298b", "url": null, - "hash": "0zg60199bg0r4jqjqfbs7s80l2k41xjqmmmm079qzg1ksgby9qqz" + "hash": "08b5l0wkfkzq051rndpy2r6q20afq7dy5b3q75x2im6ag95jkcp8" }, "nixos-mailserver": { "type": "Git", @@ -135,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixos-24.11", - "revision": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", - "url": "https://github.com/NixOS/nixpkgs/archive/3ffbbdbac0566a0977da3d2657b89cbcfe9a173b.tar.gz", - "hash": "0m3zh14is40vixpv125alyacd22835v0v845dsnk5d68wvwhikq2" + "revision": "107d5ef05c0b1119749e381451389eded30fb0d5", + "url": "https://github.com/NixOS/nixpkgs/archive/107d5ef05c0b1119749e381451389eded30fb0d5.tar.gz", + "hash": "0zymjff39r09hviifvr06vwx1il9pzy46n0f7lnay30pd718y3a3" }, "nixpkgs-unstable": { "type": "Git", @@ -147,9 +147,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "6d97d419e5a9b36e6293887a89a078cf85f5a61b", - "url": "https://github.com/NixOS/nixpkgs/archive/6d97d419e5a9b36e6293887a89a078cf85f5a61b.tar.gz", - "hash": "10y6ply5jhg9pwq13zldmipxh8dscmawx5syi1i6rb773xnnr452" + "revision": "aa6ae0afa6adeb5c202a168e51eda1d3da571117", + "url": "https://github.com/NixOS/nixpkgs/archive/aa6ae0afa6adeb5c202a168e51eda1d3da571117.tar.gz", + "hash": "1kbg6limdl7f21vr36g7qlrimm8lxr97b6kvxkz91yfdffn942p9" }, "ntfy-matrix-bot": { "type": "Git", @@ -181,9 +181,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "10faa81b4c0135a04716cbd1649260d82b2890cd", - "url": "https://github.com/oxalica/rust-overlay/archive/10faa81b4c0135a04716cbd1649260d82b2890cd.tar.gz", - "hash": "0dpy86m80546lh1lxb16bhil488jw9gg8nnz1gfmrnzl08n7rhx5" + "revision": "275c824ed9e90e7fd4f96d187bde3670062e721f", + "url": "https://github.com/oxalica/rust-overlay/archive/275c824ed9e90e7fd4f96d187bde3670062e721f.tar.gz", + "hash": "1j2g5bhjnm01qr1hinvm434mqkbg90h03fmccw7fcmqdr52j4iz5" }, "showrt": { "type": "Git", @@ -216,9 +216,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", - "url": "https://github.com/Mic92/sops-nix/archive/bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27.tar.gz", - "hash": "0kyfqv0n6s1blpr72m6ijrpf6hghvs5ifkj9gkw3gsmlyip26db6" + "revision": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", + "url": "https://github.com/Mic92/sops-nix/archive/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6.tar.gz", + "hash": "0ymzqb59ipgylxincai79zp4ghr784lylagxy9a8dik0w7vh8x8r" }, "traveltext": { "type": "Git", diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index f8d5a8f..5c82377 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -21,7 +21,7 @@ in src = fetchgit { url = "https://stuebinm.eu/git/git-annex-remote-remarkable2"; rev = "refs/heads/main"; - hash = "sha256-ZDoZFFADti3ZwLZqeP/F3BbW+Csuprw6+1LBBQIjnlo="; + hash = "sha256-Lgo+9FxJQ/ozBf79llYBu10JYMDvXn2vYkHbOZjRu/Y="; }; cargoLock.lockFile = "${src.outPath}/Cargo.lock"; }) { }; |