Update inputs

2025-05-29 02:21:12 +02:00 · 2025-05-29 02:21:12 +02:00 · dad3f3db8e
commit dad3f3db8e
parent 85f8018e36
6 changed files with 138 additions and 303 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1,37 +1,16 @@
 {
  "nodes": {
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
    "emacs-overlay": {
      "inputs": {
        "nixpkgs": "nixpkgs",
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1743092657,
-        "narHash": "sha256-ow7/uhFsONGV8y7YwokqRU1SFrkN1op73MvzuE8dynU=",
+        "lastModified": 1748449332,
+        "narHash": "sha256-3Qr0pThpHgbIhscOia2ETxo2ge7el458Z9pv5+ONTKc=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "9d534b5749cd539145580f0ad588a912990841dc",
+        "rev": "44f10e03d04b678d13ee9c36a9bd632dbce84103",
        "type": "github"
      },
      "original": {
@ -40,20 +19,6 @@
        "type": "github"
      }
    },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "revCount": 69,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@ -62,11 +27,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741352980,
-        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
        "type": "github"
      },
      "original": {
@ -93,70 +58,6 @@
        "type": "github"
      }
    },
-    "flameshot-git": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1742229831,
-        "narHash": "sha256-GRmMwb/astzDNhnWDbQpiUbr993By0WUNDtS9owhAz8=",
-        "owner": "flameshot-org",
-        "repo": "flameshot",
-        "rev": "042d6900609f8569a1cc9ad4e7ba8743f29865fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "flameshot-org",
-        "repo": "flameshot",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "nixvim",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -164,11 +65,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1743097780,
-        "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=",
+        "lastModified": 1748391243,
+        "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52",
+        "rev": "f5b12be834874f7661db4ced969a621ab2d57971",
        "type": "github"
      },
      "original": {
@ -178,28 +79,6 @@
        "type": "github"
      }
    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742655702,
-        "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
    "ixx": {
      "inputs": {
        "flake-utils": [
@ -214,49 +93,27 @@
        ]
      },
      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "lastModified": 1737371634,
+        "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=",
        "owner": "NuschtOS",
        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648",
        "type": "github"
      },
      "original": {
        "owner": "NuschtOS",
-        "ref": "v0.0.6",
+        "ref": "v0.0.7",
        "repo": "ixx",
        "type": "github"
      }
    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741126078,
-        "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "c172f50b55b087f8e7801631de977461603bb976",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "nix-darwin-24.11",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1742889210,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "lastModified": 1748370509,
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
        "type": "github"
      },
      "original": {
@ -268,11 +125,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1742937945,
-        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
+        "lastModified": 1748037224,
+        "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
+        "rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
        "type": "github"
      },
      "original": {
@ -284,11 +141,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1742889210,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "lastModified": 1748370509,
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
        "type": "github"
      },
      "original": {
@ -300,29 +157,24 @@
    },
    "nixvim": {
      "inputs": {
-        "devshell": "devshell",
-        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
-        "nix-darwin": "nix-darwin",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix"
+        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1743045122,
-        "narHash": "sha256-ySz2mfQTFJmdwHCVbMgQRzrcIHgamKwdiwcV+PzDXZI=",
+        "lastModified": 1748197635,
+        "narHash": "sha256-1bGQAkqnGyov/tfiJw1HTK3vTHrgEo977J6RfjqrH0s=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "3363fe9cc6574282a8e22e447c319e761c8019e7",
+        "rev": "cfea16cdbe4f13b5d39dfe3df747092448252c9d",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
        "repo": "nixvim",
        "type": "github"
      }
@ -337,11 +189,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742659553,
-        "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
+        "lastModified": 1745046075,
+        "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "508752835128a3977985a4d5225ff241f7756181",
+        "rev": "066afe8643274470f4a294442aadd988356a478f",
        "type": "github"
      },
      "original": {
@ -353,7 +205,6 @@
    "root": {
      "inputs": {
        "emacs-overlay": "emacs-overlay",
-        "flameshot-git": "flameshot-git",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs_2",
        "nixvim": "nixvim",
@ -375,35 +226,29 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
+    "systems_2": {
      "locked": {
-        "lastModified": 1742982148,
-        "narHash": "sha256-aRA6LSxjlbMI6MmMzi/M5WH/ynd8pK+vACD9za3MKLQ=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "61c88349bf6dff49fa52d7dfc39b21026c2a8881",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "nix-systems",
+        "repo": "default",
        "type": "github"
      }
    },
    "vim-org-roam": {
      "flake": false,
      "locked": {
-        "lastModified": 1741743369,
-        "narHash": "sha256-KEmbFGXjOlSPY8wpr5WUzD5+eCUP1hXN2Ty37smLU9M=",
+        "lastModified": 1744944537,
+        "narHash": "sha256-TOhVdfiwXuRqCqlz3ZMVQuHGIoJYBtHQwp7GnwlmOzA=",
        "owner": "chipsenkbeil",
        "repo": "org-roam.nvim",
-        "rev": "f92b54eff931982031d5e164482d5e781bb2cd31",
+        "rev": "5ff1c9b0d89ac4a142abe3723e535fb127a516e4",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -7,17 +7,13 @@
    };
    emacs-overlay.url = "github:nix-community/emacs-overlay";
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.11";
+      url = "github:nix-community/nixvim/nixos-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    vim-org-roam = {
      url = "github:chipsenkbeil/org-roam.nvim";
      flake = false;
    };
-    flameshot-git = {
-      url = "github:flameshot-org/flameshot";
-      flake = false;
-    };
  };

  outputs =
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@ -58,7 +58,7 @@ in
        gpg-agent = {
          enable = true;
          enableSshSupport = false;
-          pinentryPackage = pkgs.pinentry-gtk2;
+          pinentry.package = pkgs.pinentry-gtk2;
        };
        unclutter.enable = true;
      };
--- a/modules/desktop/flameshot.nix
+++ b/modules/desktop/flameshot.nix
@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  inputs,
  ...
 }:

@ -20,7 +19,6 @@ in
        services.flameshot = {
          enable = true;
          package = pkgs.flameshot.overrideAttrs (old: {
-            src = inputs.flameshot-git;
            cmakeFlags = [ "-DUSE_WAYLAND_GRIM=1" ];
          });
          settings = {
@ -38,7 +36,6 @@ in
          };
        };
        home.packages = [ pkgs.grim ];
-
      };
  };
 }
--- a/modules/desktop/zsh.nix
+++ b/modules/desktop/zsh.nix
@ -33,7 +33,7 @@ in
          enableCompletion = true;
          autosuggestion.enable = true;
          syntaxHighlighting.enable = true;
-          initExtra = # bash
+          initContent = # bash
            ''
              autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
              zle -N up-line-or-beginning-search
--- a/modules/editor/vim/vim.nix
+++ b/modules/editor/vim/vim.nix
@ -24,117 +24,114 @@ in
        vimAlias = true;
        vimdiffAlias = true;
        withNodeJs = true;
-        plugins = (
-          with pkgs.vimPlugins;
-          [
-            # base distro
-            LazyVim
-            conform-nvim
-            nvim-lint
-            markdown-preview-nvim
-            render-markdown-nvim
+        plugins = with pkgs.vimPlugins; [
+          # base distro
+          LazyVim
+          conform-nvim
+          nvim-lint
+          markdown-preview-nvim
+          render-markdown-nvim

-            # theme
-            gruvbox-nvim
+          # theme
+          gruvbox-nvim

-            # UI
-            bufferline-nvim
-            gitsigns-nvim
-            neogit
-            diffview-nvim
-            edgy-nvim
-            dashboard-nvim
-            toggleterm-nvim
-            trouble-nvim
-            lualine-nvim
-            which-key-nvim
-            nvim-web-devicons
-            mini-nvim
-            mini-ai
-            mini-comment
-            mini-icons
-            mini-pairs
-            noice-nvim
-            nui-nvim
-            nvim-notify
-            nvim-lsp-notify
-            neo-tree-nvim
-            nvim-navic
-            dressing-nvim
-            aerial-nvim
-            snacks-nvim
+          # UI
+          bufferline-nvim
+          gitsigns-nvim
+          neogit
+          diffview-nvim
+          edgy-nvim
+          dashboard-nvim
+          toggleterm-nvim
+          trouble-nvim
+          lualine-nvim
+          which-key-nvim
+          nvim-web-devicons
+          mini-nvim
+          mini-ai
+          mini-comment
+          mini-icons
+          mini-pairs
+          noice-nvim
+          nui-nvim
+          nvim-notify
+          nvim-lsp-notify
+          neo-tree-nvim
+          nvim-navic
+          dressing-nvim
+          aerial-nvim
+          snacks-nvim

-            # project management
-            project-nvim
-            neoconf-nvim
-            persistence-nvim
+          # project management
+          project-nvim
+          neoconf-nvim
+          persistence-nvim

-            # smart typing
-            guess-indent-nvim
-            vim-illuminate
+          # smart typing
+          guess-indent-nvim
+          vim-illuminate

-            # LSP
-            nvim-lspconfig
-            nvim-lightbulb # lightbulb for quick actions
-            # nvim-code-action-menu # code action menu
-            neodev-nvim
-            SchemaStore-nvim # load known formats for json and yaml
-            nvim-metals
+          # LSP
+          nvim-lspconfig
+          nvim-lightbulb # lightbulb for quick actions
+          # nvim-code-action-menu # code action menu
+          neodev-nvim
+          SchemaStore-nvim # load known formats for json and yaml
+          nvim-metals

-            # cmp plugins
-            nvim-cmp
-            blink-cmp # completion plugin
-            cmp_luasnip # snipper completions
+          # cmp plugins
+          nvim-cmp
+          blink-cmp # completion plugin
+          cmp_luasnip # snipper completions

-            # snippets
-            luasnip # snippet engine
-            friendly-snippets # a bunch of snippets to use
+          # snippets
+          luasnip # snippet engine
+          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
+          # search functionality
+          plenary-nvim
+          telescope-nvim
+          telescope-fzf-native-nvim
+          fzf-lua
+          grug-far-nvim
+          flash-nvim

-            # treesitter
-            nvim-treesitter-context
-            nvim-ts-autotag
-            nvim-treesitter-textobjects
-            nvim-treesitter.withAllGrammars
+          # treesitter
+          nvim-treesitter-context
+          nvim-ts-autotag
+          nvim-treesitter-textobjects
+          nvim-treesitter.withAllGrammars

-            # comments
-            ts-comments-nvim
-            nvim-ts-context-commentstring
-            todo-comments-nvim
+          # comments
+          ts-comments-nvim
+          nvim-ts-context-commentstring
+          todo-comments-nvim

-            # leap
-            vim-repeat
-            leap-nvim
-            flit-nvim
+          # leap
+          vim-repeat
+          leap-nvim
+          flit-nvim

-            # DAP
-            nvim-dap
-            nvim-dap-ui
-            nvim-dap-virtual-text
-            one-small-step-for-vimkind
+          # DAP
+          nvim-dap
+          nvim-dap-ui
+          nvim-dap-virtual-text
+          one-small-step-for-vimkind

-            # neotest
-            neotest
-            neotest-rust
+          # neotest
+          neotest
+          neotest-rust

-            # SQL
-            vim-dadbod
-            vim-dadbod-ui
-            vim-dadbod-completion
+          # SQL
+          vim-dadbod
+          vim-dadbod-ui
+          vim-dadbod-completion

-            lazy-nvim
-            lazydev-nvim
-            vim-startuptime
-            yazi-nvim
-          ]
-        );
+          lazy-nvim
+          lazydev-nvim
+          vim-startuptime
+          yazi-nvim
+        ];

        extraPackages = with pkgs; [
          gcc # needed for nvim-treesitter
@ -247,7 +244,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", "ibhagwan", "saghen"},
+                patterns = {""},
              },
              install = {
                missing = false,