From e0586a8d97644869c73f353c5a87dda088dcc4c0 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 8 Aug 2021 17:22:04 +0200 Subject: [PATCH] update to nixpkgs 439b1605 --- home-manager/home.nix | 47 +++++++++++++++++++++++++--------------- nix/sources.json | 44 ++++++++++++++++++------------------- nixos/physical/3950x.nix | 2 +- 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 0484bef..33b3def 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -46,8 +46,20 @@ in { ivy-hydra swiper magit - forge + #forge # todo: doesn't build 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; [ epkgs.undo-tree epkgs.notmuch @@ -84,22 +96,23 @@ in { vue-mode solarized-theme #wlrctl - (epkgs.melpaBuild { - pname = "nix-mode"; - version = "1.4.0"; - packageRequires = [ json-mode epkgs.mmm-mode company ]; - recipe = pkgs.writeText "recipe" '' - (nix-mode - :repo "nixos/nix-mode" :fetcher github - :files ("nix*.el")) - ''; - src = pkgs.fetchFromGitHub { - owner = "nixos"; - repo = "nix-mode"; - rev = "ddf091708b9069f1fe0979a7be4e719445eed918"; - sha256 = "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad"; - }; - }) + nix-mode + # (epkgs.melpaBuild { + # pname = "nix-mode"; + # version = "1.4.0"; + # packageRequires = [ json-mode epkgs.mmm-mode company ]; + # recipe = pkgs.writeText "recipe" '' + # (nix-mode + # :repo "nixos/nix-mode" :fetcher github + # :files ("nix*.el")) + # ''; + # src = pkgs.fetchFromGitHub { + # owner = "nixos"; + # repo = "nix-mode"; + # rev = "ddf091708b9069f1fe0979a7be4e719445eed918"; + # sha256 = "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad"; + # }; + # }) ]); }; git = { diff --git a/nix/sources.json b/nix/sources.json index 5fa3176..2086561 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5df3462dda05d8e44669cf374776274e1bc47d0a", - "sha256": "0ggmkg4shf9948wpwb0s40bjvwijvhv2wykrkayclvp419kbrfxq", + "rev": "50f1ef189623aad54410bc935e6f4b4a3aed98cf", + "sha256": "0wyn326n7q0g6xdqpw3ch5n8fv77w185nvxvyj7cblbim0ma3h1f", "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///archive/.tar.gz" }, "home-manager": { @@ -17,10 +17,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "0e6c61a44092e98ba1d75b41f4f947843dc7814d", - "sha256": "0i6qjkyvxbnnvk984781wgkycdrgwf6cpbln7w35gfab18h7mnzy", + "rev": "59be1f4983ee3689de3172716a6c7e95a6a37bb7", + "sha256": "1q9q5aagmhmnjdx0smf7x5jw7m8fp0vxb948xn9946vkxxya7d4c", "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///archive/.tar.gz" }, "niv": { @@ -29,10 +29,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "c8f74f44b5f5df2c8f20a1834460d012e74d78f9", - "sha256": "0zmhxgl37f1p2aiqjmiccflpgga6phj6vmqs3jd33z0frj6hsy5c", + "rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070", + "sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx", "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///archive/.tar.gz" }, "nixos-hardware": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "nixos", "repo": "nixos-hardware", - "rev": "684ae160a6e76590eafa3fca8061b6ad57bcc9ad", - "sha256": "1m6kkdh0k1x7h5v5q7d4pq74csbnf0vlxl8x8flk4gspldkwn2hg", + "rev": "8296b88560d8ac07a885452e094cd454de90ea9b", + "sha256": "07s1p1qj5knh71lq3nzkxs3mhh5n9dbf6qi87dhkkngp85fjv9il", "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///archive/.tar.gz" }, "nixos-mailserver": { @@ -56,15 +56,15 @@ "version": "5675b122a947b40e551438df6a623efad19fd2e7" }, "nixpkgs": { - "branch": "master", + "branch": "nixos-unstable", "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", "homepage": "https://github.com/NixOS/nixpkgs", "owner": "nixos", "repo": "nixpkgs", - "rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae", - "sha256": "0mwnlc5v16wm9hqq8k09vry7qzhiy6kp52nn51s33iq4hrx9d364", + "rev": "439b1605227b8adb1357b55ce8529d541abbe9eb", + "sha256": "1jmlia9670lq89ic241zvif5q68qsqhqzm68pbdacxjmdrr0ahqf", "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///archive/.tar.gz" }, "nixpkgs-mozilla": { @@ -73,10 +73,10 @@ "homepage": "", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "3f3fba4e2066f28a1ad7ac60e86a688a92eb5b5f", - "sha256": "1mrj89gzrzhci4lssvzmmk31l715cddp7l39favnfs1qaijly814", + "rev": "b1001ed670666ca4ce1c1b064481f88694315c1d", + "sha256": "1hpig8z4pzdwc2vazr6hg7qyxllbgznsaivaigjnmrdszlxz55zz", "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///archive/.tar.gz" }, "nixpkgs-wayland": { @@ -85,10 +85,10 @@ "homepage": "", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "e6373acf6998b2b576385f95eeaf74d998dd1d10", - "sha256": "020pkgk8cj48hfbxgi23blla8lg7pnxdqrp5ihl51xkvxcvm6489", + "rev": "4d0b4b2d0687221ffcb0c1954688607591d4fd27", + "sha256": "1p5qjnv2gsnvlj7hf6fxhz7rfp565zwqyyglwk7xng87x1vqh2fm", "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///archive/.tar.gz" } } diff --git a/nixos/physical/3950x.nix b/nixos/physical/3950x.nix index d001e7e..a2a9659 100644 --- a/nixos/physical/3950x.nix +++ b/nixos/physical/3950x.nix @@ -11,7 +11,7 @@ in { boot.loader.efi.canTouchEfiVariables = true; boot.supportedFilesystems = [ "zfs" ]; boot.kernelModules = [ "nct6775" ]; - boot.kernelPackages = pkgs.linuxPackages_5_11; # zfs + boot.kernelPackages = pkgs.linuxPackages_latest; networking.hostId = "c7736638"; services.zfs.autoScrub.enable = true; services.zfs.trim.enable = true;