From eea9e471975f6169ff2cb97f878b1ea15a06be18 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Fri, 9 Feb 2024 15:15:20 +0100 Subject: [PATCH] Update NixOS to 23.11 --- flake.lock | 78 +++++++++++++++++----------------- flake.nix | 4 +- modules/desktop/default.nix | 2 +- modules/desktop/zsh.nix | 2 +- modules/editor/emacs/emacs.nix | 21 +++++---- modules/media/emulators.nix | 2 +- modules/media/games.nix | 1 + modules/services/flatpak.nix | 1 + 8 files changed, 59 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 4534148..17687c3 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1695921859, - "narHash": "sha256-9QUM3d1TxCwCMhunV7VvtV4+BOe9vynlwks8TByhFfA=", + "lastModified": 1707469552, + "narHash": "sha256-CPHB05n2FKAcPtjLows1+cEOA3ivDeFHs5bkvTGSgR4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ef992bca01ef97e8bbd1136693d24665390f39ce", + "rev": "eda89e24ee4ceb6e4bfcd00dabb894d6301c36db", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "gruvbox-kvantum-theme": { "flake": false, "locked": { - "lastModified": 1674507936, - "narHash": "sha256-orAPLYxl9/KMzGlX7YCpq5FTKa/4FG8/qEv2xdC9QOM=", + "lastModified": 1696096968, + "narHash": "sha256-u2J4Zf9HuMjNCt3qVpgEffkytl/t277FzOvWL8Nm8os=", "owner": "sachnr", "repo": "gruvbox-kvantum-themes", - "rev": "439fe6df66644579abcd11169200c8a20a134d5f", + "rev": "f47670be407c1f07c64890ad53884ee9977a7db1", "type": "github" }, "original": { @@ -274,16 +274,16 @@ ] }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -317,11 +317,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1695346081, - "narHash": "sha256-ELuMibAhsgOEIzoPb9ZodYLcde0qSEP6ZuVIvFDIb6A=", + "lastModified": 1701264882, + "narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "5bbefaee92c4277ff1961b333f9937f5180d15f3", + "rev": "f7413022370f24bb53cb450bfb2803233510113e", "type": "github" }, "original": { @@ -348,11 +348,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -364,27 +364,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1695825837, - "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "lastModified": 1707347730, + "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695132891, - "narHash": "sha256-cJR9AFHmt816cW/C9necLJyOg/gsnkvEeFAfxgeM1hc=", + "lastModified": 1695806987, + "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5ab8341e33322e5b66fb46ce23d724050f6606", + "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", "type": "github" }, "original": { @@ -411,16 +411,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1695825837, - "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "lastModified": 1707347730, + "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -460,11 +460,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1695208951, - "narHash": "sha256-GdkBhWg/bIwnQk4/a/Ief+cFtDcUJEMNqiFYO3A5sus=", + "lastModified": 1695726851, + "narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "266aac1186256aaf3fb1bb1181ee83d548092d12", + "rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9", "type": "github" }, "original": { @@ -524,11 +524,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1695108593, - "narHash": "sha256-1Rb3w4Mpzv81pw7FaZHdQULK6+9oZIzeQ6uCD4PvjJM=", + "lastModified": 1695738029, + "narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=", "owner": "hakimel", "repo": "reveal.js", - "rev": "db2523db277bea632c218a7d836f27079a1be7f9", + "rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 05376a1..5b734c4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; emacs-overlay.url = "github:nix-community/emacs-overlay"; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index fb5ad1d..9beda52 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -7,7 +7,7 @@ in { config = mkIf config.services.xserver.enable { fonts = { - fonts = with pkgs.unstable; [ + packages = with pkgs.unstable; [ corefonts # Microsoft free fonts (nerdfonts.override { fonts = [ "Meslo" "NerdFontsSymbolsOnly" ]; }) ]; diff --git a/modules/desktop/zsh.nix b/modules/desktop/zsh.nix index 92f4535..9a89726 100644 --- a/modules/desktop/zsh.nix +++ b/modules/desktop/zsh.nix @@ -22,7 +22,7 @@ in { }; enableCompletion = true; enableAutosuggestions = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; initExtra = '' autoload -Uz up-line-or-beginning-search down-line-or-beginning-search zle -N up-line-or-beginning-search diff --git a/modules/editor/emacs/emacs.nix b/modules/editor/emacs/emacs.nix index b225da8..97aa94f 100644 --- a/modules/editor/emacs/emacs.nix +++ b/modules/editor/emacs/emacs.nix @@ -2,7 +2,16 @@ with lib; with lib.my; -let cfg = config.modules.editor.emacs; +let + cfg = config.modules.editor.emacs; + myEmacs = pkgs.unstable.emacs29.override { + withNativeCompilation = true; + withSQLite3 = true; + withTreeSitter = true; + withWebP = true; + }; + myEmacsWithPackages = myEmacs.pkgs.withPackages + (epkgs: with epkgs; [ vterm pdf-tools treesit-grammars.with-all-grammars ]); in { options.modules.editor.emacs = { enable = mkBoolOpt false; }; @@ -23,7 +32,7 @@ in { cmake nodejs - terraform + opentofu pandoc # Formatters and linters @@ -68,17 +77,13 @@ in { services.emacs = { enable = true; client.enable = true; - package = with pkgs; - ((emacsPackagesFor emacsNativeComp).emacsWithPackages - (epkgs: [ epkgs.vterm ])); + package = myEmacsWithPackages; }; # Use either this or nix-doom-emacs programs.emacs = { enable = true; - package = with pkgs; - ((emacsPackagesFor emacsNativeComp).emacsWithPackages - (epkgs: [ epkgs.vterm ])); + package = myEmacs; }; xdg.configFile = { "doom" = { source = ./doom.d; }; }; home.sessionPath = [ diff --git a/modules/media/emulators.nix b/modules/media/emulators.nix index 7ef80dd..8a8ec9a 100644 --- a/modules/media/emulators.nix +++ b/modules/media/emulators.nix @@ -15,7 +15,7 @@ in { config = { user.packages = with pkgs; [ - (mkIf cfg.psx.enable epsxe) + (mkIf cfg.psx.enable duckstation) (mkIf cfg.ds.enable desmume) (mkIf cfg.gc.enable dolphinEmu) (mkIf (cfg.gba.enable || cfg.gb.enable || cfg.snes.enable) higan) diff --git a/modules/media/games.nix b/modules/media/games.nix index 1ab67e2..5353938 100644 --- a/modules/media/games.nix +++ b/modules/media/games.nix @@ -13,6 +13,7 @@ in { user.packages = with pkgs; [ (mkIf cfg.steam.enable steam) (mkIf cfg.lutris.enable lutris) + (mkIf cfg.lutris.enable wine) (mkIf (cfg.steam.enable || cfg.lutris.enable) protontricks) ]; }; diff --git a/modules/services/flatpak.nix b/modules/services/flatpak.nix index ae7e240..c582ae5 100644 --- a/modules/services/flatpak.nix +++ b/modules/services/flatpak.nix @@ -13,6 +13,7 @@ in { xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + config.common.default = "*"; }; };