nix: updated inputs (24.05)

This commit is contained in:
Primrose 2024-06-01 14:32:14 +02:00
parent c8c56bc433
commit 125e7f3c33
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
12 changed files with 60 additions and 169 deletions

View file

@ -5,7 +5,7 @@
...
}:
let
inherit (pkgs) unstable myPkgs;
inherit (pkgs) myPkgs;
in
{
options.extra = {
@ -38,7 +38,7 @@ in
home = {
username = lib.mkDefault "leana";
homeDirectory = lib.mkDefault "/home/leana";
stateVersion = "23.11";
stateVersion = "24.05";
};
programs = {
@ -57,7 +57,7 @@ in
pkgs.rsync
# nix
unstable.nixfmt-rfc-style
pkgs.nixfmt-rfc-style
# utils
pkgs.tree

View file

@ -1,13 +1,10 @@
{ pkgs, ... }:
let
inherit (pkgs) unstable;
in
{
programs.direnv = {
enable = true;
nix-direnv = {
enable = true;
package = unstable.nix-direnv;
package = pkgs.nix-direnv;
};
config = builtins.fromTOML ''
[global]

View file

@ -1,6 +1,6 @@
{ pkgs, lib, ... }:
let
inherit (pkgs) myPkgs unstable ghc-pin;
inherit (pkgs) myPkgs ghc-pin;
in
{
imports = [ ./fonts.nix ];
@ -10,10 +10,10 @@ in
home.packages = [
ghc-pin.ghc
ghc-pin.haskell-language-server
unstable.qmk
unstable.wally-cli
pkgs.qmk
pkgs.wally-cli
unstable.cargo
pkgs.cargo
pkgs.nix-inspect
pkgs.nix-visualize
pkgs.deploy-rs

View file

@ -1,61 +0,0 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1704295289,
"narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View file

@ -1,39 +0,0 @@
{
description = ''
Bring XMonad library to $PATH for the language server to work
'';
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
};
outputs =
{
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
devShell = pkgs.mkShell {
packages = [
(pkgs.haskell.packages.ghc947.ghcWithPackages (
hpkgs: with hpkgs; [
haskell-language-server
stylish-haskell
xmonad
xmonad-contrib
neat-interpolation
]
))
];
};
}
);
}