From dd97680acce87f6f16cf7fc9dae011e18e8f2a0b Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Tue, 18 Mar 2025 05:07:51 +0100 Subject: [PATCH] Update inputs --- flake.lock | 105 ++++++++++++++++----------------- modules/desktop/default.nix | 5 +- modules/desktop/themes/gtk.nix | 4 +- modules/editor/emacs/emacs.nix | 2 +- modules/editor/vim/vim.nix | 11 ++-- 5 files changed, 61 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index a73b73f..0a7df15 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1734340547, - "narHash": "sha256-L4l+UVH52rhM7XrNncn9Dj6QyW7Pn7gJo6YtMMq4nMw=", + "lastModified": 1742260805, + "narHash": "sha256-+TMKGYuS4q681k1vgAJEEwabOecMY2SqWDdnSKB8wQ0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3eb85a97f21d14e125364b022acf7f0d197859a9", + "rev": "406d2a3d0cfdc4dc5c0476b19773927e477229ab", "type": "github" }, "original": { @@ -42,12 +42,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "flameshot-git": { "flake": false, "locked": { - "lastModified": 1733211590, - "narHash": "sha256-lt7RIe1KFOPnBpVZf7oZMOQOyOAf65ByxaHCNDqbTpk=", + "lastModified": 1742229831, + "narHash": "sha256-GRmMwb/astzDNhnWDbQpiUbr993By0WUNDtS9owhAz8=", "owner": "flameshot-org", "repo": "flameshot", - "rev": "3fafcf4aa9ae3d620ff691cba3a1a2195d592914", + "rev": "042d6900609f8569a1cc9ad4e7ba8743f29865fd", "type": "github" }, "original": { @@ -119,18 +119,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1733665616, - "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -168,11 +164,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1742246081, + "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", "type": "github" }, "original": { @@ -190,11 +186,11 @@ ] }, "locked": { - "lastModified": 1733951536, - "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -240,26 +236,27 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1741126078, + "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "c172f50b55b087f8e7801631de977461603bb976", "type": "github" }, "original": { "owner": "lnl7", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -271,11 +268,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", "type": "github" }, "original": { @@ -287,11 +284,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -316,11 +313,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734179700, - "narHash": "sha256-SwkMjTXI4PaRHSCKmbd7PvNF43QbIGoEQxrmbFt+WKs=", + "lastModified": 1742045620, + "narHash": "sha256-zXkJRY/87TPX1vxlrF4941/GRHD3L+CFfe0/95dWT9o=", "owner": "nix-community", "repo": "nixvim", - "rev": "958f653dd56161640760c73ada779315070b1293", + "rev": "b73beb7bb8c5ec5e559bb5222af9994e7ee4bdbd", "type": "github" }, "original": { @@ -340,11 +337,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { @@ -386,11 +383,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -402,11 +399,11 @@ "vim-org-roam": { "flake": false, "locked": { - "lastModified": 1731867362, - "narHash": "sha256-R+5vbvOMVlLfPx5xmmx2cG0p+FhO3gFBpVZFvVwJDfM=", + "lastModified": 1741743369, + "narHash": "sha256-KEmbFGXjOlSPY8wpr5WUzD5+eCUP1hXN2Ty37smLU9M=", "owner": "chipsenkbeil", "repo": "org-roam.nvim", - "rev": "59da7daa2b218063936d2fc6363c1eb0667e64f2", + "rev": "f92b54eff931982031d5e164482d5e781bb2cd31", "type": "github" }, "original": { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 1ed5b4e..483bb1d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -139,7 +139,8 @@ in "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop"; "application/msword" = "onlyoffice-desktopeditors.desktop"; - "application/vnd.openxmlformats-officedocument.presentationml.presentation" = "onlyoffice-desktopeditors.desktop"; + "application/vnd.openxmlformats-officedocument.presentationml.presentation" = + "onlyoffice-desktopeditors.desktop"; "application/vnd.openxmlformats-officedocument*" = "onlyoffice-desktopeditors.desktop"; "text/*" = "nvim.desktop"; @@ -181,7 +182,7 @@ in zsh-syntax-highlighting R tldr - ark + kdePackages.ark linuxPackages.perf ]) ++ [ pkgs.jellyfin-mpv-shim ]; diff --git a/modules/desktop/themes/gtk.nix b/modules/desktop/themes/gtk.nix index c7e1ccc..ec23aee 100644 --- a/modules/desktop/themes/gtk.nix +++ b/modules/desktop/themes/gtk.nix @@ -10,10 +10,10 @@ let gruvboxPlus = pkgs.stdenv.mkDerivation rec { name = "gruvbox-plus"; - version = "5.1"; + version = "6.2.0"; src = pkgs.fetchurl { url = "https://github.com/SylEleuth/gruvbox-plus-icon-pack/releases/download/v${version}/gruvbox-plus-icon-pack-${version}.zip"; - sha256 = "1n3hqwk1mqaj8vbmy0pqbiq6v5jqrhmhin506xbpnccl28f907j0"; + sha256 = "sha256-D+SPhucHU4Riz0mzU1LnaEkkaQt+blJMAsA5r6fTAQ0="; }; dontUnpack = true; installPhase = '' diff --git a/modules/editor/emacs/emacs.nix b/modules/editor/emacs/emacs.nix index df1702f..577c141 100644 --- a/modules/editor/emacs/emacs.nix +++ b/modules/editor/emacs/emacs.nix @@ -96,7 +96,7 @@ in programs.emacs = { enable = true; - package = pkgs.emacs29.override { + package = pkgs.emacs30.override { withNativeCompilation = true; withPgtk = true; withSQLite3 = true; diff --git a/modules/editor/vim/vim.nix b/modules/editor/vim/vim.nix index 6cc4168..a8c79ad 100644 --- a/modules/editor/vim/vim.nix +++ b/modules/editor/vim/vim.nix @@ -70,7 +70,6 @@ in persistence-nvim # smart typing - indent-blankline-nvim guess-indent-nvim vim-illuminate @@ -83,21 +82,19 @@ in nvim-metals # cmp plugins - nvim-cmp # completion plugin - cmp-buffer # buffer completions - cmp-path # path completions + nvim-cmp + blink-cmp # completion plugin cmp_luasnip # snipper completions - cmp-nvim-lsp # LSP completions # snippets luasnip # snippet engine - nvim-snippets friendly-snippets # a bunch of snippets to use # search functionality plenary-nvim telescope-nvim telescope-fzf-native-nvim + fzf-lua grug-far-nvim flash-nvim @@ -250,7 +247,7 @@ in pkgs.vimUtils.packDir config.home-manager.users.${config.user.name}.programs.neovim.finalPackage.passthru.packpathDirs }/pack/myNeovimPackages/start", - patterns = {"folke", "nvim-telescope", "hrsh7th", "akinsho", "stevearc", "LazyVim", "catppuccin", "saadparwaiz1", "nvimdev", "rafamadriz", "lewis6991", "lukas-reineke", "nvim-lualine", "L3MON4D3", "williamboman", "echasnovski", "nvim-neo-tree", "MunifTanjim", "mfussenegger", "rcarriga", "neovim", "nvim-pack", "nvim-treesitter", "windwp", "JoosepAlviste", "nvim-tree", "nvim-lua", "RRethy", "dstein64", "Saecki", "ggandor", "iamcco", "nvim-neotest", "rouge8", "theHamsta", "SmiteshP", "jbyuki", "simrat39", "b0o", "tpope", "kosayoda", "ellisonleao", "NeogitOrg", "sindrets", "scalameta", "garymjr", "mikavilpas","kristijanhusak","MagicDuck","MeanderingProgrammer"}, + patterns = {"folke", "nvim-telescope", "hrsh7th", "akinsho", "stevearc", "LazyVim", "catppuccin", "saadparwaiz1", "nvimdev", "rafamadriz", "lewis6991", "lukas-reineke", "nvim-lualine", "L3MON4D3", "williamboman", "echasnovski", "nvim-neo-tree", "MunifTanjim", "mfussenegger", "rcarriga", "neovim", "nvim-pack", "nvim-treesitter", "windwp", "JoosepAlviste", "nvim-tree", "nvim-lua", "RRethy", "dstein64", "Saecki", "ggandor", "iamcco", "nvim-neotest", "rouge8", "theHamsta", "SmiteshP", "jbyuki", "simrat39", "b0o", "tpope", "kosayoda", "ellisonleao", "NeogitOrg", "sindrets", "scalameta", "garymjr", "mikavilpas","kristijanhusak","MagicDuck","MeanderingProgrammer", "ibhagwan", "saghen"}, }, install = { missing = false,