diff options
| -rw-r--r-- | flake.lock | 50 | ||||
| -rw-r--r-- | machines/dragon.nix | 1 | ||||
| -rw-r--r-- | machines/x1-pincer.nix | 4 | ||||
| -rw-r--r-- | modules/common.nix | 3 | ||||
| -rw-r--r-- | modules/desktop.nix | 4 |
5 files changed, 31 insertions, 31 deletions
@@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1684153753, - "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", + "lastModified": 1689334118, + "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", "owner": "ryantm", "repo": "agenix", - "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", + "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1685816270, - "narHash": "sha256-YhUkIMnSfpfhYh37+53qguyZGB7+ZJDNT9rcBcISvCQ=", + "lastModified": 1690049638, + "narHash": "sha256-A42LIS6x/tU3vbbOgJmLU3AEEDCSDD2iPyOJvzuoDQ8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "074dc30cec64604d650fffcb90631f63900d76d9", + "rev": "6c47e62b612814daf38f830cd32187768b813fac", "type": "github" }, "original": { @@ -69,11 +69,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1684899633, - "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", + "lastModified": 1689320556, + "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", + "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", "type": "github" }, "original": { @@ -121,11 +121,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1689940971, + "narHash": "sha256-397xShPnFqPC59Bmpo3lS+/Aw0yoDRMACGo1+h2VJMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "9ca785644d067445a4aa749902b29ccef61f7476", "type": "github" }, "original": { @@ -137,27 +137,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685650716, - "narHash": "sha256-sDd7QIcMbIb37nuqMrJElvuyE5eVgWuKGtIPP8IWwCc=", + "lastModified": 1689956312, + "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7c1500e2eefa58f3c80dd046cba256e10440201", + "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1690031011, + "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "12303c652b881435065a98729eb7278313041e49", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1685716800, - "narHash": "sha256-b6RpYRRsv6Wwl9XG2sjLvqKdkPMvqQqgtiGJHAIyGSw=", + "lastModified": 1689956312, + "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d743463920751eb092930d06e700981398332a", + "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967", "type": "github" }, "original": { diff --git a/machines/dragon.nix b/machines/dragon.nix index ca43995..a264060 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -77,7 +77,6 @@ in { terminal_output serial ''; loader.grub.enable = true; - loader.grub.version = 2; # loader.grub.devices = [ "/dev/sda" "/dev/sdb" ]; loader.grub.mirroredBoots = [ { devices = [ "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X" ]; path = "/mnt/boot1"; } diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index fca4bab..2a899bc 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -75,7 +75,6 @@ let ports = { boot = { loader.grub = { enable = true; - version = 2; device = "nodev"; efiSupport = true; ipxe = { @@ -90,7 +89,8 @@ let ports = { }; }; loader.efi.canTouchEfiVariables = true; - kernelPackages = pkgs.linuxPackages_latest; + # 6.4 is broken: https://github.com/NixOS/nixpkgs/issues/243830 + # kernelPackages = pkgs.linuxPackages_latest; kernelModules = ["xpad" "kvm-intel" ]; initrd.luks.devices = { diff --git a/modules/common.nix b/modules/common.nix index 2397b28..7797613 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -41,6 +41,7 @@ fd fzf git + git-annex gitFull gnupg haskellPackages.hledger @@ -109,7 +110,7 @@ ''; }; - services.emacs.package = pkgs.emacsPgtk; + services.emacs.package = pkgs.emacs-pgtk; services.emacs.enable = true; boot.tmp.cleanOnBoot = true; diff --git a/modules/desktop.nix b/modules/desktop.nix index 752d264..472ec22 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -94,9 +94,9 @@ in { wev lswt - (conky.override { pulseSupport = true; }) + # (conky.override { pulseSupport = true; }) + # anki wezterm - anki autorandr chromium discord |