From ccf6f35690a8b1705c12a9b687af79da361a62cf Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 3 Apr 2022 12:25:51 -0400 Subject: [PATCH] Switch to pkgs.linuxPackages for stable kernel --- common/linux.nix | 4 +-- common/packages.nix | 42 +++++++++++----------- flake.lock | 48 +++++++++++++------------- flake.nix | 5 ++- home/.aws/config | Bin 970 -> 1137 bytes machines/hephaestus/configuration.nix | 3 -- 6 files changed, 52 insertions(+), 50 deletions(-) diff --git a/common/linux.nix b/common/linux.nix index bf5102c..b97f391 100644 --- a/common/linux.nix +++ b/common/linux.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages; boot.supportedFilesystems = [ "ntfs" ]; system.stateVersion = "unstable"; @@ -13,7 +13,7 @@ nixpkgs.config = { allowUnfree = true; permittedInsecurePackages = [ - /* "electron-9.4.4" */ # authy is currently stuck on electron_9 + "electron-9.4.4" # authy is currently stuck on electron_9 ]; }; diff --git a/common/packages.nix b/common/packages.nix index 887cbe6..bfd3313 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -157,42 +157,44 @@ in ] ++ lib.optionals stdenv.isLinux ([ _1password-gui albert - /* authy */ - calibre - cryptsetup - glibcLocales - gnome3.gnome-tweaks - gnomeExtensions.appindicator - guake - kazam - linuxPackages.perf - pavucontrol - pinentry-curses - qemu - rtorrent - rustup - spotify - strace - usbutils - virtmanager - vlc - # Unsupported / broken on darwin: + authy aws-sam-cli bitwarden brave + calibre + cryptsetup deluge discord firefox gimp + glibcLocales + gnome3.gnome-tweaks + gnomeExtensions.appindicator google-chrome + guake + kazam + linuxPackages.perf minecraft + mojave-gtk-theme netdata + pavucontrol + pinentry-curses postman + qemu rfd + rtorrent + rustup signal-desktop slack + spotify steam + strace tailscale + usbutils + virtmanager + vlc + wireshark-qt + yaru-theme zoom-us ]); in diff --git a/flake.lock b/flake.lock index 11c71d0..7fb1c84 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1647173930, - "narHash": "sha256-8oca3Pc68VrCp8HeOtHmzs5g0rdQnPO9beDEEZJ02W0=", + "lastModified": 1648278671, + "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "17fbc68a6110edbff67e55f7450230a697ecb17e", + "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1647979468, - "narHash": "sha256-mavkG6rOyM5NPcb/hEmZQwRZaJeaa7XFfWTWf0TNCo0=", + "lastModified": 1648917498, + "narHash": "sha256-fdyVHsP6XeyCk9FRyjV6Wv+7qiOzWxykGXdNixadvyg=", "owner": "nix-community", "repo": "home-manager", - "rev": "48a1584d8ba427dd9d74e2b2b842c70a6dd9c4fa", + "rev": "cfab869fcebc56710be6ec3aca76036b25c04a0d", "type": "github" }, "original": { @@ -81,11 +81,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1647990454, - "narHash": "sha256-d5vlmZX2xjb6T1Tx8tPlSm5e7Tv0UyKv/fTJoMHzKMQ=", + "lastModified": 1648949219, + "narHash": "sha256-gJrYhdeC7wuNMWJtILUqm+FjzaBock+RHhgMCHL6IwQ=", "owner": "neovim", "repo": "neovim", - "rev": "7735163652cd9082ef89cb31707ca77df12f7b70", + "rev": "6786b6afade97771027fda3c1438969def320cc5", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1648023642, - "narHash": "sha256-yKJYbSNR2gvBoaBOs2J7uc92/6qkpbM/7ciysKtnCFI=", + "lastModified": 1648973670, + "narHash": "sha256-MJNofHXSKFMGwHe4P4zE+u/4wijTOEABg2dQ82Uj4xI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3018bd21b70bc3008f1ffbd3e68efdd31d58a1b8", + "rev": "89d60799d43d847d7a88a8485e96731d1fe2d685", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1648022149, - "narHash": "sha256-xhDjF807UZwC2I6EGYrH1o8Mzr6w8bBruGOmHAcWO/Q=", + "lastModified": 1648141026, + "narHash": "sha256-h8e3+5EZFbYHTMb0DN2ACuQTJBNHpqigvmEV1w2WIuE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a352d867273cf4a245d890f8a2cfcfabd29c5c63", + "rev": "feceb4d24f582817d8f6e737cd40af9e162dee05", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1647800324, - "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", + "lastModified": 1648632716, + "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", + "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1647800324, - "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", + "lastModified": 1648632716, + "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", + "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c0fa1ca..01e09e6 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,10 @@ registry = { nixpkgs.flake = nixpkgs; }; }; - nixpkgs.overlays = [ (import ./modules/overlays) inputs.neovim-nightly-overlay.overlay ]; + nixpkgs.overlays = [ + (import ./modules/overlays) + inputs.neovim-nightly-overlay.overlay + ]; home-manager = { useGlobalPkgs = true; diff --git a/home/.aws/config b/home/.aws/config index 9884e393ed298da62bc1ccb2e7089ae139a05bf2..86540ed7eeee5d808bc4752152e28bdc6f8252b6 100755 GIT binary patch literal 1137 zcmV-%1djUvM@dveQdv+`00(LIgUPeH^vuITw+C7ks%pjhizm`)yEd1HqfOZ+%3?WVQbr6{zxLkTUrIm5JIrAHuH zC{0eN48+?oz|CQe&8G1+cw|KW!;1zAE{C1&`uvc>*aoNlNpL5x`2CuCm^XKVPwOGJ z&AHOr%yV|c0mzZHiQni21?(}TkBS#R$x}JM2awfQnW~VhvDd3yKxg(!bD@Ml#_&B} z=imXNcB$*rgMbRq-&MeGLc#>|=m0h;7U~Skxa6U$0vdl`XXG@Dqh)v&4dTgm&Toh> zhJeH3(@&gd4Z0)N)?kAAMXqR1L*sZ&H7CU$V&~E^!Smw`0Kq3L-?p3;gQ{u91s-2z z`bO8JO9r8Xj<#|>Vet7*q$KZpT$ADqj{ooE_SHsV^Ct4GpvdE+0IY42eaJ4f|GjWT z(yP?Kqr{qb&qKSb{VeypPy1mYYyNV``n|fI z_9RJY7QICuL0I}k*za>;97W;+p|0s$D-rUvgi{wCNLVK^3|3!9xIT@5)b8X|gveR} z?6JJyr)J#;3hi~YGp;)y(cHlDC+g>%-LJY0B0wLu;8Z+OW>qIP)Fp)8r?MzWPNpOhsT$@A>{ka&K0tt5K8eq4d`C*^2gu{OA{Ss(w*4EoG?N^ zRy9H0G6hjnPa@LCtuhr}k~9x7Gg$sji{xzSEvk&Z6UjOU)19}~3R;3$d*b%Y@Rh0O6s2kL5P;VC(V(#Cx$691q#E9r>v&AkvDcS5TrPLACPh| D-{m+l literal 970 zcmV;*12y~rM@dveQdv+`0Q|o{zBz$+1p&B(NiM+nLvJ)r}lJ9Gt!)?U~E5zJ4R307c)_N5~wwb>SoCra(2$x@;`Zmel6 zR@(3L5emBv)>Nil@!=jQB%Z@M0_>Dm_6JDc8qPa%h;ztC^t#<&JJVLvM?hgJs5h5l zT|rFaX{K=3?-!v=G5TVcORcoqbD!m1tc_Phcp~X}e>$ca1~v7}Q+fPkt0h4u-|8o^ zM_;}Tc|##WjK-{;V||7@f;1RXX}I7^tgv^$p={HP(3RCUkHIhve?P6hjxnwA-YUJxMQ`d|IbL%S5xoPXE@{ z%d(zv(UMM?rN&SLCvuNQ&X=lfaiwSXiIFLM?w_JzB9U!VZ=7I-ZT@}hn`5#j%506& zm=Ng3Pc1lm3_;1j1=n_x4z8^{W3sthP7!0#{|AHkvd zj}}@p22r2{6{~=9WHMLo85FOxAEKh~YL3XE(;Wv|2yaMWtryg=uliRTlylIA49Vh7 zuJiTQ{U)MM9P5;vZzH=UMk);}_S(8z?OM}5&;HB}xD3G45%UcpO4`NWe6lbS(PtVH sp)wvONY