From 782ecdbf848b6db505e12ba3bcdd8b44953da544 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:46:36 +0200 Subject: [PATCH] update flake --- flake.lock | 163 ++++++++++++++++++------------ home-manager/nixvim/lsp.nix | 8 +- home-manager/nixvim/nvim-tree.nix | 19 ++-- modules/graphical/shared.nix | 2 +- modules/misc/docker.nix | 2 +- 5 files changed, 113 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 23dad82..67b148d 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1728326504, - "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1729010169, - "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=", + "lastModified": 1729712798, + "narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=", "owner": "nix-community", "repo": "disko", - "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76", + "rev": "09a776702b004fdf9c41a024e1299d575ee18a7d", "type": "github" }, "original": { @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1728727368, - "narHash": "sha256-7FMyNISP7K6XDSIt1NJxkXZnEdV3HZUXvFoBaJ/qdOg=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "eb74e0be24a11a1531b5b8659535580554d30b28", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -512,11 +512,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729848063, + "narHash": "sha256-1uGIPOSJq4IzoDvgfOF6A3sw5it1WX3ZdYl2+jCkjv8=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "c77c3bb23390a9ba91860e721edde54856fc5f7a", "type": "github" }, "original": { @@ -542,11 +542,11 @@ ] }, "locked": { - "lastModified": 1727821604, - "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -571,11 +571,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728930677, - "narHash": "sha256-s0Nyh9m1u+xfnaELM3XRtJPUUyjyHS8kwhNYXFucUXM=", + "lastModified": 1729852008, + "narHash": "sha256-Rw5fexgBeZ96EPs557mDW3pyTzFm3tVGHWPgPlPSQk8=", "ref": "refs/heads/main", - "rev": "01c2ff34ddcb5995409c33c2b549e93b98b56d6b", - "revCount": 5343, + "rev": "f0e023bff2f2a25ffe5ed3166f55f7274d17c6bc", + "revCount": 5373, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -652,11 +652,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -690,6 +690,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -717,11 +745,11 @@ ] }, "locked": { - "lastModified": 1728385805, - "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", + "lastModified": 1729757100, + "narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", + "rev": "04193f188e4144d7047f83ad1de81d6034d175cd", "type": "github" }, "original": { @@ -740,11 +768,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728956173, - "narHash": "sha256-0D5MsCsbFQJNGnYvbSvUInKfzYfGup5KAHtOMkiXQRQ=", + "lastModified": 1729857853, + "narHash": "sha256-IVaFOTG4i2K0YWKrJui09YCAEWyTSK+zaUTUvj/SbC4=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "a1e3c25b1d6fb0a88a5bbb61cc4bd502439a68ff", + "rev": "04408bf4afe2bf2b15227c43914130c8bdf4ed3c", "type": "github" }, "original": { @@ -755,11 +783,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -778,11 +806,11 @@ ] }, "locked": { - "lastModified": 1728905507, - "narHash": "sha256-wQ/K5S3GbgInO3Rtl1NPVHzwBCNmZA++NNQWSQCZqCU=", + "lastModified": 1729717678, + "narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "66bbd8fb32b6bb513ec093323081747945bb5f08", + "rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "type": "github" }, "original": { @@ -793,11 +821,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -840,11 +868,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -856,11 +884,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -872,11 +900,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -901,11 +929,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728985146, - "narHash": "sha256-Kopqg/ZYUxle3wNruPmISv7uU/iMJQ4/wEqx4rGG4xA=", + "lastModified": 1729791159, + "narHash": "sha256-i5TKYCs9tJ2qaYTsjQh3WwExmj4O0EU+L1jq6ZBVMfM=", "owner": "nix-community", "repo": "nixvim", - "rev": "25b8d2ab20fbc4a291e83a490382d503c999ab3a", + "rev": "4726334e4413ff55f1db3768c8d08722abbf09cf", "type": "github" }, "original": { @@ -916,11 +944,11 @@ }, "nur": { "locked": { - "lastModified": 1729012595, - "narHash": "sha256-zsWeT+EEt6AMgAg5gF0SFCzD8Qx7Q06PbqwMGdyBS/A=", + "lastModified": 1729855863, + "narHash": "sha256-TEefmNTtVeQpxziZ9PjWkxAkRQexLEsXk22Wj6Q7IQ8=", "owner": "nix-community", "repo": "NUR", - "rev": "b876f2af8086f0d1d062d735e15d660f3a9a9bf9", + "rev": "7d7cbe07852abdfd4a3bc09cb565e294f3251548", "type": "github" }, "original": { @@ -932,17 +960,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1728701796, - "narHash": "sha256-FTDCOUnq+gdnHC3p5eisv1X1mMtKJDNMegwpZjRzQKY=", + "lastModified": 1729763753, + "narHash": "sha256-M8WAUgKFBU5TvFt92g/dHBtGJmBP33LHird+solHt0g=", "owner": "NuschtOS", "repo": "search", - "rev": "9578d865b081c29ae98131caf7d2f69a42f0ca6e", + "rev": "bedc2f2ada220815a98a896e10f5e61bfc329bfc", "type": "github" }, "original": { @@ -962,11 +991,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1002,11 +1031,11 @@ ] }, "locked": { - "lastModified": 1728873041, - "narHash": "sha256-e4jz7yFADiZjMhv+iQwYtAN8AOUlOpbNQYnbwUFLjeM=", + "lastModified": 1729736953, + "narHash": "sha256-Rb6JUop7NRklg0uzcre+A+Ebrn/ZiQPkm4QdKg6/3pw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bdbe1611c2029de90bca372ce0b1e3b4fa65f55a", + "rev": "29b1275740d9283467b8117499ec8cbb35250584", "type": "github" }, "original": { @@ -1036,11 +1065,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728900372, - "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", + "lastModified": 1729380793, + "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", "owner": "danth", "repo": "stylix", - "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", + "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", "type": "github" }, "original": { @@ -1196,11 +1225,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { diff --git a/home-manager/nixvim/lsp.nix b/home-manager/nixvim/lsp.nix index 3652301..f19ae3c 100644 --- a/home-manager/nixvim/lsp.nix +++ b/home-manager/nixvim/lsp.nix @@ -14,9 +14,9 @@ nixd.enable = true; html.enable = true; dartls.enable = true; - tsserver.enable = true; + ts_ls.enable = true; pylsp.enable = true; - csharp-ls = { + csharp_ls = { enable = true; package = pkgs.stable.csharp-ls; }; @@ -71,8 +71,8 @@ }; lsp-lines = { enable = true; - currentLine = true; }; - rust-tools.enable = true; + rustaceanvim.enable = true; }; + diagnostics.virtual_lines.only_current_line = true; } diff --git a/home-manager/nixvim/nvim-tree.nix b/home-manager/nixvim/nvim-tree.nix index a6c5621..d995d19 100644 --- a/home-manager/nixvim/nvim-tree.nix +++ b/home-manager/nixvim/nvim-tree.nix @@ -1,12 +1,15 @@ { - plugins.nvim-tree = { - enable = true; - openOnSetup = true; - autoReloadOnWrite = true; - updateFocusedFile.enable = true; - tab.sync = { - close = true; - open = true; + plugins = { + web-devicons.enable = true; + nvim-tree = { + enable = true; + openOnSetup = true; + autoReloadOnWrite = true; + updateFocusedFile.enable = true; + tab.sync = { + close = true; + open = true; + }; }; }; } diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index 3398992..f846b58 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -20,7 +20,7 @@ in { nerdfonts # noto and hack #noto-fonts #noto-fonts-emoji - noto-fonts-cjk + noto-fonts-cjk-sans #font-awesome ]; services.libinput = { diff --git a/modules/misc/docker.nix b/modules/misc/docker.nix index 2f0ac8d..0119056 100644 --- a/modules/misc/docker.nix +++ b/modules/misc/docker.nix @@ -13,6 +13,6 @@ in environment.systemPackages = with pkgs; [ docker-compose ]; - virtualisation.docker.enableNvidia = lib.mkIf config.custom.hardware.nvidia.enable true; + hardware.nvidia-container-toolkit.enable = lib.mkIf config.custom.hardware.nvidia.enable true; }; }