From da5c1d42500bd9c8b0f7a0a70d25a95699ca495a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Sat, 6 Jan 2024 12:26:00 +0100 Subject: [PATCH] feat: update system --- flake.lock | 95 +++++++++++------------------- home/desktops/hyprland/default.nix | 2 +- home/packages/default.nix | 5 +- home/programs/nixvim.nix | 41 +++++++++++++ 4 files changed, 81 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index b05e22a..d592fcd 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1703934913, - "narHash": "sha256-ICPSBWQBPVthW1uXxFizOfuNU3SEf+rf/tfJD89mWRk=", + "lastModified": 1704371796, + "narHash": "sha256-/gOMapfraWDmo+FUalFrOVOXomIy5zn3w/nn8tOESk8=", "owner": "Aylur", "repo": "ags", - "rev": "6a892994287b52ee3014dedfb41cec9fb675875b", + "rev": "7be7b4439275e6fa0d674c2c29491d7b53760f0d", "type": "github" }, "original": { @@ -76,27 +76,30 @@ "type": "github" } }, - "flake-utils": { + "flake-parts_2": { "inputs": { - "systems": "systems" + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1685518550, @@ -141,11 +144,11 @@ ] }, "locked": { - "lastModified": 1703838268, - "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { @@ -170,29 +173,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -204,18 +191,18 @@ }, "nixvim": { "inputs": { - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1703944758, - "narHash": "sha256-VOe76pyV9zY+1pX09nX4ZDv2dINZylI7U5sWmWm20gA=", + "lastModified": 1704535566, + "narHash": "sha256-C39L/tRZ+AIzLCzdaC//vk1l8mjE+M+nm9S2JPAPZEU=", "owner": "nix-community", "repo": "nixvim", - "rev": "9738dae3eac5c9b1c1e3ab787db0cedfc59e49b9", + "rev": "eecd2ab3cefe5a0b615a57dd435ee9ba95ed9c8e", "type": "github" }, "original": { @@ -227,20 +214,23 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1703426812, - "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", + "lastModified": 1703939133, + "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", + "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", "type": "github" }, "original": { @@ -272,21 +262,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index 8d10dce..080fafc 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -180,7 +180,7 @@ gnome.gnome-clocks gnome.gnome-calculator gnome.simple-scan - gnome.gedit + gedit gnome.eog gnome.geary gnome.ghex diff --git a/home/packages/default.nix b/home/packages/default.nix index 46c1096..46af606 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -14,6 +14,9 @@ # media jellyfin-media-player + youtube-dl + tartube + yt-dlp # youtube-music.override {electron = pkgs.electron_28;}) vlc makemkv @@ -54,9 +57,9 @@ # development (import ./intellij.nix {inherit pkgs;}) - jetbrains.rust-rover insomnia avalonia-ilspy + ghidra # gaming steam diff --git a/home/programs/nixvim.nix b/home/programs/nixvim.nix index b18e2c3..1f49c1f 100644 --- a/home/programs/nixvim.nix +++ b/home/programs/nixvim.nix @@ -143,6 +143,42 @@ in { lua = true; action = "require('actions-preview').code_actions"; } + { + key = "xx"; + mode = "n"; + lua = true; + action = "require('trouble').toggle"; + } + { + key = "xw"; + mode = "n"; + lua = true; + action = "function() require('trouble').toggle('workspace_diagnostics') end"; + } + { + key = "xd"; + mode = "n"; + lua = true; + action = "function() require('trouble').toggle('document_diagnostics') end"; + } + { + key = "xq"; + mode = "n"; + lua = true; + action = "function() require('trouble').toggle('quickfix') end"; + } + { + key = "xl"; + mode = "n"; + lua = true; + action = "function() require('trouble').toggle('loclist') end"; + } + { + key = "gR"; + mode = "n"; + lua = true; + action = "function() require('trouble').toggle('lsp_references') end"; + } ]; globals = { @@ -414,6 +450,11 @@ in { }; }; + trouble = { + enable = true; + useDiagnosticSigns = true; + }; + treesitter = { enable = true; indent = true;