From f39b5f76b174ab5b88b33dc2f0599214bf2c3f67 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Mon, 16 Dec 2024 21:00:23 +0100 Subject: [PATCH] Update inputs --- common.nix | 2 +- flake.lock | 183 ++++++++++-------- flake.nix | 7 +- .../nixos-desktop/hardware-configuration.nix | 3 +- modules/desktop/default.nix | 17 +- modules/editor/vim/lua/config/keymaps.lua | 3 - modules/editor/vim/lua/plugins/core.lua | 6 + modules/editor/vim/vim.nix | 22 ++- modules/media/emulators.nix | 2 +- 9 files changed, 136 insertions(+), 109 deletions(-) diff --git a/common.nix b/common.nix index 89ce4f0..fd24780 100644 --- a/common.nix +++ b/common.nix @@ -11,7 +11,7 @@ ] ++ (lib.my.mapModulesRec' (toString ./modules) import); nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = "experimental-features = nix-command flakes"; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; settings = { diff --git a/flake.lock b/flake.lock index f29b09e..a73b73f 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,15 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728839477, - "narHash": "sha256-HXWknm3vRHknK0yKdlO1qKFxO6f8lJHaufFekxjL4RY=", + "lastModified": 1734340547, + "narHash": "sha256-L4l+UVH52rhM7XrNncn9Dj6QyW7Pn7gJo6YtMMq4nMw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1ac99536bb5eb9b2b4fc161bd0651bcbbb36c6d9", + "rev": "3eb85a97f21d14e125364b022acf7f0d197859a9", "type": "github" }, "original": { @@ -55,22 +54,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -79,11 +62,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -97,11 +80,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -113,11 +96,11 @@ "flameshot-git": { "flake": false, "locked": { - "lastModified": 1725222363, - "narHash": "sha256-xM99adstwfOOaeecKyWQU3yY0p65pQyFgoz7WJNra98=", + "lastModified": 1733211590, + "narHash": "sha256-lt7RIe1KFOPnBpVZf7oZMOQOyOAf65ByxaHCNDqbTpk=", "owner": "flameshot-org", "repo": "flameshot", - "rev": "14a136777cd82ab70f42c13b4bc9418c756d91d2", + "rev": "3fafcf4aa9ae3d620ff691cba3a1a2195d592914", "type": "github" }, "original": { @@ -128,7 +111,10 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": [ + "nixvim", + "flake-compat" + ], "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -140,11 +126,11 @@ ] }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", "type": "github" }, "original": { @@ -182,11 +168,11 @@ ] }, "locked": { - "lastModified": 1728791962, - "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c6325b28ebd708653dd41d88f306023f296184", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -204,20 +190,48 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -226,11 +240,11 @@ ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -241,11 +255,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -257,27 +271,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -298,23 +312,47 @@ "nixpkgs": [ "nixpkgs" ], + "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728336862, - "narHash": "sha256-0rG55ZD1zvLLJ+WgiYdJBZGm1fkgRUlwpfx7aNUT5m4=", + "lastModified": 1734179700, + "narHash": "sha256-SwkMjTXI4PaRHSCKmbd7PvNF43QbIGoEQxrmbFt+WKs=", "owner": "nix-community", "repo": "nixvim", - "rev": "b041963c607d766c4b102b8b56244ad38731f549", + "rev": "958f653dd56161640760c73ada779315070b1293", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixvim", "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "owner": "NuschtOS", + "repo": "search", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "emacs-overlay": "emacs-overlay", @@ -322,8 +360,7 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", - "vim-org-roam": "vim-org-roam", - "vim-yazi": "vim-yazi" + "vim-org-roam": "vim-org-roam" } }, "systems": { @@ -349,11 +386,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -365,11 +402,11 @@ "vim-org-roam": { "flake": false, "locked": { - "lastModified": 1727183922, - "narHash": "sha256-gONxa/CUXPgV+ucC+WkEyeH/lFAiTaQx8bEBq7g6HyY=", + "lastModified": 1731867362, + "narHash": "sha256-R+5vbvOMVlLfPx5xmmx2cG0p+FhO3gFBpVZFvVwJDfM=", "owner": "chipsenkbeil", "repo": "org-roam.nvim", - "rev": "17f85abf207ece51bd37c8f3490d8f7d2fa106d0", + "rev": "59da7daa2b218063936d2fc6363c1eb0667e64f2", "type": "github" }, "original": { @@ -377,22 +414,6 @@ "repo": "org-roam.nvim", "type": "github" } - }, - "vim-yazi": { - "flake": false, - "locked": { - "lastModified": 1728834368, - "narHash": "sha256-hvrtjNkieHFs/VzeEPlI+nkFoTsRX/c32bBOjXPBwpM=", - "owner": "mikavilpas", - "repo": "yazi.nvim", - "rev": "bff42c2ead02675d66e31799d2f3edaba29a4c79", - "type": "github" - }, - "original": { - "owner": "mikavilpas", - "repo": "yazi.nvim", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a37f37b..e3cc579 100644 --- a/flake.nix +++ b/flake.nix @@ -7,13 +7,9 @@ }; emacs-overlay.url = "github:nix-community/emacs-overlay"; nixvim = { - url = "github:nix-community/nixvim/nixos-24.05"; + url = "github:nix-community/nixvim/nixos-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - vim-yazi = { - url = "github:mikavilpas/yazi.nvim"; - flake = false; - }; vim-org-roam = { url = "github:chipsenkbeil/org-roam.nvim"; flake = false; @@ -46,6 +42,7 @@ "steam" "steam-original" "steam-run" + "steam-unwrapped" ]; overlays = extraOverlays ++ (pkgs.lib.attrValues self.overlays); }; diff --git a/hosts/nixos-desktop/hardware-configuration.nix b/hosts/nixos-desktop/hardware-configuration.nix index b152594..e0c7d0b 100644 --- a/hosts/nixos-desktop/hardware-configuration.nix +++ b/hosts/nixos-desktop/hardware-configuration.nix @@ -67,8 +67,7 @@ enable = true; enable32Bit = true; extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime + rocmPackages.clr amdvlk ]; }; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 2d2df5c..1ed5b4e 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -27,18 +27,23 @@ in corefonts # Microsoft free fonts noto-fonts-emoji meslo-lg - (nerdfonts.override { - fonts = [ - "Meslo" - "NerdFontsSymbolsOnly" - ]; - }) + pkgs.nerd-fonts.meslo-lg + pkgs.nerd-fonts.symbols-only ]; fontconfig.defaultFonts = { monospace = [ "MesloLGS Nerd Font Mono" ]; }; }; + security.pam.loginLimits = [ + { + domain = "*"; + item = "nofile"; + type = "-"; + value = "65536"; + } + ]; + programs.adb.enable = true; programs.ssh.startAgent = true; diff --git a/modules/editor/vim/lua/config/keymaps.lua b/modules/editor/vim/lua/config/keymaps.lua index 51b6fca..0ab05b7 100644 --- a/modules/editor/vim/lua/config/keymaps.lua +++ b/modules/editor/vim/lua/config/keymaps.lua @@ -16,6 +16,3 @@ map("n", "wh", "h", { desc = "Go to Left Window", remap = true }) -- File map("n", "fs", "w", { desc = "Save File" }) - --- Buffer -map("n", "bk", LazyVim.ui.bufremove, { desc = "Delete Buffer" }) diff --git a/modules/editor/vim/lua/plugins/core.lua b/modules/editor/vim/lua/plugins/core.lua index 89e2313..8ff94d7 100644 --- a/modules/editor/vim/lua/plugins/core.lua +++ b/modules/editor/vim/lua/plugins/core.lua @@ -11,4 +11,10 @@ return { defaults = { path_display = { "truncate" } }, }, }, + { + 'folke/snacks.nvim', + keys = { + { "bk", function() Snacks.bufdelete() end, desc = "Delete Buffer" }, + }, + }, } diff --git a/modules/editor/vim/vim.nix b/modules/editor/vim/vim.nix index 6e7b004..6cc4168 100644 --- a/modules/editor/vim/vim.nix +++ b/modules/editor/vim/vim.nix @@ -24,8 +24,9 @@ in vimAlias = true; vimdiffAlias = true; withNodeJs = true; - plugins = - (with pkgs.vimPlugins; [ + plugins = ( + with pkgs.vimPlugins; + [ # base distro LazyVim conform-nvim @@ -49,6 +50,10 @@ in which-key-nvim nvim-web-devicons mini-nvim + mini-ai + mini-comment + mini-icons + mini-pairs noice-nvim nui-nvim nvim-notify @@ -57,6 +62,7 @@ in nvim-navic dressing-nvim aerial-nvim + snacks-nvim # project management project-nvim @@ -115,6 +121,7 @@ in nvim-dap nvim-dap-ui nvim-dap-virtual-text + one-small-step-for-vimkind # neotest neotest @@ -128,14 +135,9 @@ in lazy-nvim lazydev-nvim vim-startuptime - ]) - ++ [ - # File manager - (pkgs.vimUtils.buildVimPlugin { - name = "yazi.nvim"; - src = inputs.vim-yazi; - }) - ]; + yazi-nvim + ] + ); extraPackages = with pkgs; [ gcc # needed for nvim-treesitter diff --git a/modules/media/emulators.nix b/modules/media/emulators.nix index ff026e1..ba0d539 100644 --- a/modules/media/emulators.nix +++ b/modules/media/emulators.nix @@ -22,7 +22,7 @@ in user.packages = [ (lib.mkIf cfg.psx.enable pkgs.duckstation) (lib.mkIf cfg.ds.enable pkgs.desmume) - (lib.mkIf cfg.gc.enable pkgs.dolphinEmu) + (lib.mkIf cfg.gc.enable pkgs.dolphin-emu) (lib.mkIf (cfg.gba.enable || cfg.gb.enable || cfg.snes.enable) pkgs.higan) ]; };