update to nixpkgs 439b1605
parent
47b8a4fb9e
commit
e0586a8d97
|
@ -46,8 +46,20 @@ in {
|
||||||
ivy-hydra
|
ivy-hydra
|
||||||
swiper
|
swiper
|
||||||
magit
|
magit
|
||||||
forge
|
#forge # todo: doesn't build
|
||||||
avy
|
avy
|
||||||
|
lsp-mode
|
||||||
|
(lsp-ui.overrideAttrs (o: {
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "emacs-lsp";
|
||||||
|
repo = "lsp-ui";
|
||||||
|
rev = "240a7de26400cf8b13312c3f9acf7ce653bdaa8a";
|
||||||
|
sha256 = "1zscdjlnkx43i4kw2qmlvji23xfpw7n5y4v99ld33205dg905fsy";
|
||||||
|
};
|
||||||
|
}))
|
||||||
|
lsp-haskell
|
||||||
|
flycheck
|
||||||
|
lsp-ivy
|
||||||
]) ++ (with epkgs.melpaPackages; [
|
]) ++ (with epkgs.melpaPackages; [
|
||||||
epkgs.undo-tree
|
epkgs.undo-tree
|
||||||
epkgs.notmuch
|
epkgs.notmuch
|
||||||
|
@ -84,22 +96,23 @@ in {
|
||||||
vue-mode
|
vue-mode
|
||||||
solarized-theme
|
solarized-theme
|
||||||
#wlrctl
|
#wlrctl
|
||||||
(epkgs.melpaBuild {
|
nix-mode
|
||||||
pname = "nix-mode";
|
# (epkgs.melpaBuild {
|
||||||
version = "1.4.0";
|
# pname = "nix-mode";
|
||||||
packageRequires = [ json-mode epkgs.mmm-mode company ];
|
# version = "1.4.0";
|
||||||
recipe = pkgs.writeText "recipe" ''
|
# packageRequires = [ json-mode epkgs.mmm-mode company ];
|
||||||
(nix-mode
|
# recipe = pkgs.writeText "recipe" ''
|
||||||
:repo "nixos/nix-mode" :fetcher github
|
# (nix-mode
|
||||||
:files ("nix*.el"))
|
# :repo "nixos/nix-mode" :fetcher github
|
||||||
'';
|
# :files ("nix*.el"))
|
||||||
src = pkgs.fetchFromGitHub {
|
# '';
|
||||||
owner = "nixos";
|
# src = pkgs.fetchFromGitHub {
|
||||||
repo = "nix-mode";
|
# owner = "nixos";
|
||||||
rev = "ddf091708b9069f1fe0979a7be4e719445eed918";
|
# repo = "nix-mode";
|
||||||
sha256 = "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad";
|
# rev = "ddf091708b9069f1fe0979a7be4e719445eed918";
|
||||||
};
|
# sha256 = "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad";
|
||||||
})
|
# };
|
||||||
|
# })
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
git = {
|
git = {
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "5df3462dda05d8e44669cf374776274e1bc47d0a",
|
"rev": "50f1ef189623aad54410bc935e6f4b4a3aed98cf",
|
||||||
"sha256": "0ggmkg4shf9948wpwb0s40bjvwijvhv2wykrkayclvp419kbrfxq",
|
"sha256": "0wyn326n7q0g6xdqpw3ch5n8fv77w185nvxvyj7cblbim0ma3h1f",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nix-community/emacs-overlay/archive/5df3462dda05d8e44669cf374776274e1bc47d0a.tar.gz",
|
"url": "https://github.com/nix-community/emacs-overlay/archive/50f1ef189623aad54410bc935e6f4b4a3aed98cf.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
|
@ -17,10 +17,10 @@
|
||||||
"homepage": "https://nix-community.github.io/home-manager/",
|
"homepage": "https://nix-community.github.io/home-manager/",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0e6c61a44092e98ba1d75b41f4f947843dc7814d",
|
"rev": "59be1f4983ee3689de3172716a6c7e95a6a37bb7",
|
||||||
"sha256": "0i6qjkyvxbnnvk984781wgkycdrgwf6cpbln7w35gfab18h7mnzy",
|
"sha256": "1q9q5aagmhmnjdx0smf7x5jw7m8fp0vxb948xn9946vkxxya7d4c",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nix-community/home-manager/archive/0e6c61a44092e98ba1d75b41f4f947843dc7814d.tar.gz",
|
"url": "https://github.com/nix-community/home-manager/archive/59be1f4983ee3689de3172716a6c7e95a6a37bb7.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"niv": {
|
"niv": {
|
||||||
|
@ -29,10 +29,10 @@
|
||||||
"homepage": "https://github.com/nmattia/niv",
|
"homepage": "https://github.com/nmattia/niv",
|
||||||
"owner": "nmattia",
|
"owner": "nmattia",
|
||||||
"repo": "niv",
|
"repo": "niv",
|
||||||
"rev": "c8f74f44b5f5df2c8f20a1834460d012e74d78f9",
|
"rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070",
|
||||||
"sha256": "0zmhxgl37f1p2aiqjmiccflpgga6phj6vmqs3jd33z0frj6hsy5c",
|
"sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nmattia/niv/archive/c8f74f44b5f5df2c8f20a1834460d012e74d78f9.tar.gz",
|
"url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
|
@ -41,10 +41,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "684ae160a6e76590eafa3fca8061b6ad57bcc9ad",
|
"rev": "8296b88560d8ac07a885452e094cd454de90ea9b",
|
||||||
"sha256": "1m6kkdh0k1x7h5v5q7d4pq74csbnf0vlxl8x8flk4gspldkwn2hg",
|
"sha256": "07s1p1qj5knh71lq3nzkxs3mhh5n9dbf6qi87dhkkngp85fjv9il",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nixos/nixos-hardware/archive/684ae160a6e76590eafa3fca8061b6ad57bcc9ad.tar.gz",
|
"url": "https://github.com/nixos/nixos-hardware/archive/8296b88560d8ac07a885452e094cd454de90ea9b.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixos-mailserver": {
|
"nixos-mailserver": {
|
||||||
|
@ -56,15 +56,15 @@
|
||||||
"version": "5675b122a947b40e551438df6a623efad19fd2e7"
|
"version": "5675b122a947b40e551438df6a623efad19fd2e7"
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"branch": "master",
|
"branch": "nixos-unstable",
|
||||||
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
|
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
|
||||||
"homepage": "https://github.com/NixOS/nixpkgs",
|
"homepage": "https://github.com/NixOS/nixpkgs",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae",
|
"rev": "439b1605227b8adb1357b55ce8529d541abbe9eb",
|
||||||
"sha256": "0mwnlc5v16wm9hqq8k09vry7qzhiy6kp52nn51s33iq4hrx9d364",
|
"sha256": "1jmlia9670lq89ic241zvif5q68qsqhqzm68pbdacxjmdrr0ahqf",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nixos/nixpkgs/archive/1ca6b0a0cc38dbba0441202535c92841dd39d1ae.tar.gz",
|
"url": "https://github.com/nixos/nixpkgs/archive/439b1605227b8adb1357b55ce8529d541abbe9eb.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixpkgs-mozilla": {
|
"nixpkgs-mozilla": {
|
||||||
|
@ -73,10 +73,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "mozilla",
|
"owner": "mozilla",
|
||||||
"repo": "nixpkgs-mozilla",
|
"repo": "nixpkgs-mozilla",
|
||||||
"rev": "3f3fba4e2066f28a1ad7ac60e86a688a92eb5b5f",
|
"rev": "b1001ed670666ca4ce1c1b064481f88694315c1d",
|
||||||
"sha256": "1mrj89gzrzhci4lssvzmmk31l715cddp7l39favnfs1qaijly814",
|
"sha256": "1hpig8z4pzdwc2vazr6hg7qyxllbgznsaivaigjnmrdszlxz55zz",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/mozilla/nixpkgs-mozilla/archive/3f3fba4e2066f28a1ad7ac60e86a688a92eb5b5f.tar.gz",
|
"url": "https://github.com/mozilla/nixpkgs-mozilla/archive/b1001ed670666ca4ce1c1b064481f88694315c1d.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixpkgs-wayland": {
|
"nixpkgs-wayland": {
|
||||||
|
@ -85,10 +85,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "colemickens",
|
"owner": "colemickens",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "e6373acf6998b2b576385f95eeaf74d998dd1d10",
|
"rev": "4d0b4b2d0687221ffcb0c1954688607591d4fd27",
|
||||||
"sha256": "020pkgk8cj48hfbxgi23blla8lg7pnxdqrp5ihl51xkvxcvm6489",
|
"sha256": "1p5qjnv2gsnvlj7hf6fxhz7rfp565zwqyyglwk7xng87x1vqh2fm",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/colemickens/nixpkgs-wayland/archive/e6373acf6998b2b576385f95eeaf74d998dd1d10.tar.gz",
|
"url": "https://github.com/colemickens/nixpkgs-wayland/archive/4d0b4b2d0687221ffcb0c1954688607591d4fd27.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ in {
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.supportedFilesystems = [ "zfs" ];
|
boot.supportedFilesystems = [ "zfs" ];
|
||||||
boot.kernelModules = [ "nct6775" ];
|
boot.kernelModules = [ "nct6775" ];
|
||||||
boot.kernelPackages = pkgs.linuxPackages_5_11; # zfs
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
networking.hostId = "c7736638";
|
networking.hostId = "c7736638";
|
||||||
services.zfs.autoScrub.enable = true;
|
services.zfs.autoScrub.enable = true;
|
||||||
services.zfs.trim.enable = true;
|
services.zfs.trim.enable = true;
|
||||||
|
|
Loading…
Reference in New Issue