diff --git a/flake.lock b/flake.lock index 18fa902..e9c16a8 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1715359851, - "narHash": "sha256-yGdBqEO6kYOYRoDj+l6DGyCYkrX7u2Zi2KulRjq4wws=", + "lastModified": 1716264197, + "narHash": "sha256-ryPizz6evZsfAjFjUWgxCVzBZ9m1BDVKlMomOHze8VE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "929f7e7c87912a9b1579eac1bfd96aea37c14b18", + "rev": "cccd903ebbe5837579d6746ac430beec60d96c19", "type": "gitlab" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1714783443, - "narHash": "sha256-xN87HgB8hdP4HiTykRjrta9FrzB7iGDQL0Ehrjmo5Ek=", + "lastModified": 1716250255, + "narHash": "sha256-zFU/dFuenqcvLyCwclzY/0TRce1U8ZRRXyW1GMdd8vA=", "owner": "getchoo", "repo": "nix-exprs", - "rev": "9bc0ee639e54fecb19277ba0a883d77972bfccbc", + "rev": "630d290a61006807f198b1aa53efec2cef34bd05", "type": "github" }, "original": { @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1713472482, - "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", + "lastModified": 1715699575, + "narHash": "sha256-MLTUVPcRbH9i+AchIK+3SaeF3K27NGLApQCRoQEsc3s=", "owner": "hyprwm", "repo": "hypridle", - "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", + "rev": "afa6e21b8881a4a7d01b960ee4a2421c495777aa", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1714843107, - "narHash": "sha256-89WxndRGO3CGuWE5XCaHKnsV3IKBRdOWqScp6o8enT4=", + "lastModified": 1716242428, + "narHash": "sha256-9itkgx3Sl8xPToweCHQoLfvyiTX/b5PZb7clYcKYyIs=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "c87af3aa1f6e6bd06cffaabcc400bd45e26d565a", + "rev": "18d2d2ba6af6ac76e4714fae2737a55d223716f8", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1716218643, + "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 357178a..3b45026 100644 --- a/flake.nix +++ b/flake.nix @@ -36,8 +36,12 @@ outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, ... }: let + system = "x86_64-linux"; overlay-unstable = final: prev: { - unstable = nixpkgs-unstable.legacyPackages.${prev.system}; + unstable = import nixpkgs-unstable { + config.allowUnfree = true; + localSystem = { inherit system; }; + }; }; in { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index adb51fb..096111e 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -47,7 +47,7 @@ users.users.xeovalyte = { isNormalUser = true; description = "Timo Boomers"; - extraGroups = [ "networkmanager" "wheel" "dialout" ]; + extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ]; }; services.printing.enable = true; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index fde346e..83ad5bb 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -9,7 +9,7 @@ ../../modules/home/programs/git.nix ../../modules/home/programs/joplin.nix ../../modules/home/programs/kitty.nix -# ../../modules/home/programs/modrinth.nix + ../../modules/home/programs/modrinth.nix ../../modules/home/programs/neovim ../../modules/home/programs/ssh.nix ../../modules/home/theme diff --git a/modules/home/programs/common.nix b/modules/home/programs/common.nix index 1bcabcd..f11a584 100644 --- a/modules/home/programs/common.nix +++ b/modules/home/programs/common.nix @@ -14,6 +14,8 @@ unstable.organicmaps unstable.cubiomes-viewer bottles + sshfs + unstable.yt-dlp # Image editing gimp diff --git a/modules/home/programs/modrinth.nix b/modules/home/programs/modrinth.nix index 37ac051..2b6bfe8 100644 --- a/modules/home/programs/modrinth.nix +++ b/modules/home/programs/modrinth.nix @@ -1,12 +1,8 @@ -{ inputs, pkgs, ... }: +{ input, pkgs, lib, ... }: { - nix.settings = { - trusted-substituters = ["https://getchoo.cachix.org"]; - trusted-public-keys = ["getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="]; - }; - home.packages = with inputs.getchoo.packages.${pkgs.system}; [ - modrinth-app + home.packages = with pkgs; [ + unstable.modrinth-app ]; } diff --git a/modules/home/programs/neovim/plugins/lsp.lua b/modules/home/programs/neovim/plugins/lsp.lua index b1f6ec7..54ede15 100644 --- a/modules/home/programs/neovim/plugins/lsp.lua +++ b/modules/home/programs/neovim/plugins/lsp.lua @@ -21,7 +21,7 @@ vim.g.rustaceanvim = { default_settings = { ['rust-analyzer'] = { cargo = { - features = { "ssr" } + features = "all" }, }, }, @@ -45,7 +45,12 @@ lspconfig.arduino_language_server.setup{ } } -lspconfig.tailwindcss.setup{} +lspconfig.tailwindcss.setup{ + filetypes = { + "rust", + "css", + } +} lspconfig.volar.setup{}