From 78a04e80b5b8c23b872fcebb5d78e677ea8da361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Wed, 28 Aug 2024 00:05:51 +0200 Subject: [PATCH] update system --- flake.lock | 144 +++++++++++++----- .../desktops/hyprland/default.nix | 8 +- .../programs/nixvim/presets/auto-format.nix | 2 +- .../nixvim/presets/base/formatting.nix | 2 +- .../programs/nixvim/presets/languages/c.nix | 2 +- .../nixvim/presets/languages/dart.nix | 2 +- .../programs/nixvim/presets/languages/lua.nix | 2 +- .../programs/nixvim/presets/languages/nix.nix | 2 +- .../nixvim/presets/languages/python.nix | 2 +- .../nixvim/presets/languages/rust.nix | 2 +- .../nixvim/presets/languages/shell.nix | 2 +- 11 files changed, 119 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 75d2301..f2971a9 100644 --- a/flake.lock +++ b/flake.lock @@ -95,6 +95,28 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -150,11 +172,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1724440431, + "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", "type": "github" }, "original": { @@ -192,11 +214,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -213,11 +235,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -254,11 +276,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "type": "github" }, "original": { @@ -267,9 +289,33 @@ "type": "github" } }, + "nix-update": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1724271552, + "narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=", + "owner": "Mic92", + "repo": "nix-update", + "rev": "737121eccb67542e8c004c64da833fede2e80c64", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-update", + "type": "github" + } + }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat", + "nix-update": "nix-update", "nixpkgs": [ "nixpkgs" ], @@ -277,11 +323,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1723944896, - "narHash": "sha256-iy4T4GnZ0mTXyY6yICyqQdtfW7A40poDks95ioqaNxE=", + "lastModified": 1724727194, + "narHash": "sha256-1qfV4NTz3SnuVAat9SfXzu2Jdu5156ZwODOeSZpF6xk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "399bab67e103d559f72e643e3867eb105b653c01", + "rev": "1b1bdf467e6f638889ea6a5f30e8d6182a7a16e3", "type": "github" }, "original": { @@ -308,11 +354,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { @@ -324,11 +370,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -342,7 +388,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -350,14 +396,14 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1723923888, - "narHash": "sha256-w+/PG6KqB8en0x1JH5aMuf0QC78Nfei208EaaaRuYG4=", + "lastModified": 1724780710, + "narHash": "sha256-fa85gMW4aUFFL26dbhiIgA2a2CLi0B4/X766kkbTPEc=", "owner": "nix-community", "repo": "nixvim", - "rev": "78fc4be6a830e8dc01f3e66ddbe3243b4bfe8560", + "rev": "1085bcd7ccf561577ff52dba76b1cb8d35f2c124", "type": "github" }, "original": { @@ -368,11 +414,11 @@ }, "nur": { "locked": { - "lastModified": 1723985933, - "narHash": "sha256-bybjUCI63982mhQqVYtlhOs+kwmDR4g+/QEvSK4pNvA=", + "lastModified": 1724790598, + "narHash": "sha256-H14riEUFLwhfFF7aV98H53ZCCNi0hOrtbC/Eb9dueWE=", "owner": "nix-community", "repo": "NUR", - "rev": "6cbb9fb9c5d55fa2af9a5b0d3185d56c90ad62aa", + "rev": "c170519c42e19027cc0d14a6ac8d36ba19574764", "type": "github" }, "original": { @@ -390,11 +436,11 @@ ] }, "locked": { - "lastModified": 1723367906, - "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "owner": "NuschtOS", "repo": "search", - "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "type": "github" }, "original": { @@ -422,11 +468,11 @@ ] }, "locked": { - "lastModified": 1723861146, - "narHash": "sha256-tfPBU+fK6YYMZvNsOYHv6JzBa8XKuhtfu8Cb9lnri1w=", + "lastModified": 1724638882, + "narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "07105b5f550665ff417487febcd6bf5dd071b931", + "rev": "19b70f147b9c67a759e35824b241f1ed92e46694", "type": "github" }, "original": { @@ -481,6 +527,28 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -488,11 +556,11 @@ ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1724338379, + "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951", "type": "github" }, "original": { diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index 7de7dd6..07d1a11 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -144,15 +144,15 @@ gnome-keyring nautilus gnome-calendar - gnome.gnome-characters - gnome.gnome-contacts - gnome.gnome-clocks + gnome-characters + gnome-contacts + gnome-clocks gnome-calculator simple-scan eog geary ghex - gnome.gnome-weather + gnome-weather gnome-keyring gnome-disk-utility # fixes diff --git a/modules/home-manager/programs/nixvim/presets/auto-format.nix b/modules/home-manager/programs/nixvim/presets/auto-format.nix index 24f9df7..e97167d 100644 --- a/modules/home-manager/programs/nixvim/presets/auto-format.nix +++ b/modules/home-manager/programs/nixvim/presets/auto-format.nix @@ -65,7 +65,7 @@ in } ]; - conform-nvim.formatAfterSave = # lua + conform-nvim.settings.format_after_save = # lua '' function(bufnr) if vim.g.${cfg.varName} or vim.b[bufnr].${cfg.varName} then diff --git a/modules/home-manager/programs/nixvim/presets/base/formatting.nix b/modules/home-manager/programs/nixvim/presets/base/formatting.nix index 395a864..7ffe2a7 100644 --- a/modules/home-manager/programs/nixvim/presets/base/formatting.nix +++ b/modules/home-manager/programs/nixvim/presets/base/formatting.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { plugins.conform-nvim = { enable = true; - formattersByFt = lib.mkIf cfg.prettier { + settings.formatters_by_ft = lib.mkIf cfg.prettier { javascript = [ "prettierd" ]; markdown = [ "prettierd" ]; typescript = [ "prettierd" ]; diff --git a/modules/home-manager/programs/nixvim/presets/languages/c.nix b/modules/home-manager/programs/nixvim/presets/languages/c.nix index dbbada7..1b65e13 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/c.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/c.nix @@ -9,7 +9,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt = { + conform-nvim.settings.formatters_by_ft = { c = [ "clang-format" ]; cpp = [ "clang-format" ]; }; diff --git a/modules/home-manager/programs/nixvim/presets/languages/dart.nix b/modules/home-manager/programs/nixvim/presets/languages/dart.nix index 6be57b4..79ce995 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/dart.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/dart.nix @@ -9,7 +9,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt.dart = [ "dart_format" ]; + conform-nvim.settings.formatters_by_ft.dart = [ "dart_format" ]; lsp.servers.dartls.enable = true; }; }; diff --git a/modules/home-manager/programs/nixvim/presets/languages/lua.nix b/modules/home-manager/programs/nixvim/presets/languages/lua.nix index fa1a90b..c6c3c62 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/lua.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/lua.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt.lua = [ "stylua" ]; + conform-nvim.settings.formatters_by_ft.lua = [ "stylua" ]; lsp.servers.lua-ls.enable = true; }; extraPackages = [ pkgs.stylua ]; diff --git a/modules/home-manager/programs/nixvim/presets/languages/nix.nix b/modules/home-manager/programs/nixvim/presets/languages/nix.nix index e66bd3c..8712d95 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/nix.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/nix.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt.nix = [ "nixfmt" ]; + conform-nvim.settings.formatters_by_ft.nix = [ "nixfmt" ]; lsp.servers.nil-ls.enable = true; nix.enable = true; }; diff --git a/modules/home-manager/programs/nixvim/presets/languages/python.nix b/modules/home-manager/programs/nixvim/presets/languages/python.nix index a085679..5c01584 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/python.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/python.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt.python = [ "black" ]; + conform-nvim.settings.formatters_by_ft.python = [ "black" ]; lsp.servers.pylsp.enable = true; }; extraPackages = [ pkgs.black ]; diff --git a/modules/home-manager/programs/nixvim/presets/languages/rust.nix b/modules/home-manager/programs/nixvim/presets/languages/rust.nix index 59a7fec..db97a8b 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/rust.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/rust.nix @@ -9,7 +9,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt.rust = [ "rustfmt" ]; + conform-nvim.settings.formattters_by_ft.rust = [ "rustfmt" ]; lsp.servers.rust-analyzer = { enable = true; installCargo = false; diff --git a/modules/home-manager/programs/nixvim/presets/languages/shell.nix b/modules/home-manager/programs/nixvim/presets/languages/shell.nix index 09276cf..d992667 100644 --- a/modules/home-manager/programs/nixvim/presets/languages/shell.nix +++ b/modules/home-manager/programs/nixvim/presets/languages/shell.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable { plugins = { - conform-nvim.formattersByFt.sh = [ "shfmt" ]; + conform-nvim.settings.formatters_by_ft.sh = [ "shfmt" ]; lsp.servers.bashls.enable = true; }; extraPackages = [ pkgs.shfmt ];