diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix index 7bbd294..693aea1 100644 --- a/nixos/msi/configuration.nix +++ b/nixos/msi/configuration.nix @@ -4,185 +4,187 @@ { config, lib, pkgs, ... }: let - unstable = import {}; - packages = (with pkgs; [ - vim - git - curl - wget - gnumake - gcc - nodejs_22 - # Language servers - lua-language-server # Lua - nixd # Nix - # Neovim - wl-clipboard - tree-sitter - ripgrep - fd - unzip - ]) ++ (with unstable; [ - neovim - ]); + unstable = import {}; + packages = (with pkgs; [ + vim + git + curl + wget + gnumake + gcc + nodejs_22 + + # Language servers + lua-language-server + nixd + + # Neovim + wl-clipboard + tree-sitter + ripgrep + fd + unzip + ]) ++ (with unstable; [ + neovim + ]); in { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./nvidia.nix - ./home.nix - ]; + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./nvidia.nix + ./home.nix + ]; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; - # Nix package installer settings - nix = { - settings = { - # Collapse duplicates into a single hard-link during build - auto-optimise-store = true; - }; - gc = { - # Automatically delete old objects and generations - automatic = true; - dates = "daily"; - options = "--delete-older-than +5"; - }; - }; + # Nix package installer settings + nix = { + settings = { + # Collapse duplicates into a single hard-link during build + auto-optimise-store = true; + }; + gc = { + # Automatically delete old objects and generations + automatic = true; + dates = "daily"; + options = "--delete-older-than 7d"; + }; + }; - # Networking options - networking = { - hostName = "msi"; - networkmanager.enable = true; - }; + # Networking options + networking = { + hostName = "msi"; + networkmanager.enable = true; + }; - # Set your time zone. - time.timeZone = "Europe/Warsaw"; + # Set your time zone. + time.timeZone = "Europe/Warsaw"; - # Select internationalisation properties. - i18n = { - defaultLocale = "en_US.UTF-8"; - inputMethod = { - enabled = "fcitx5"; - fcitx5 = { - waylandFrontend = true; - plasma6Support = true; - addons = with pkgs; [ fcitx5-mozc ]; - }; - }; - }; + # Select internationalisation properties. + i18n = { + defaultLocale = "en_US.UTF-8"; + inputMethod = { + enabled = "fcitx5"; + fcitx5 = { + waylandFrontend = true; + plasma6Support = true; + addons = with pkgs; [ fcitx5-mozc ]; + }; + }; + }; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) - ]; + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + ]; - console = { - font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - }; + console = { + font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + }; - services = { - xserver.enable = true; - desktopManager.plasma6.enable = true; - displayManager.sddm.enable = true; - }; + services = { + xserver.enable = true; + desktopManager.plasma6.enable = true; + displayManager.sddm.enable = true; + }; - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; - # Enable CUPS to print documents. - # services.printing.enable = true; + # Enable CUPS to print documents. + # services.printing.enable = true; - # Enable sound. - sound.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - audio.enable = true; - jack.enable = true; - pulse.enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - }; + # Enable sound. + sound.enable = true; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + audio.enable = true; + jack.enable = true; + pulse.enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + }; - # Enable touchpad support (enabled default in most desktopManager). - services.libinput.enable = true; + # Enable touchpad support (enabled default in most desktopManager). + services.libinput.enable = true; - # Enable unfree packages - nixpkgs.config.allowUnfree = true; + # Enable unfree packages + nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = packages; + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = packages; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs = { - gnupg = { - agent = { - enable = true; - enableSSHSupport = true; - }; - }; - steam.enable = true; - fish.enable = true; - git = { - enable = true; - config = { - user.name = "Maciej Jur"; - user.email = "maciej@kamoshi.org"; - user.signingkey = "191CBFF5F72ECAFD!"; - commit.gpgsign = true; - init.defaultBranch = "main"; - core.editor = "vim"; - }; - }; - }; + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + programs = { + gnupg = { + agent = { + enable = true; + enableSSHSupport = true; + }; + }; + steam.enable = true; + fish.enable = true; + git = { + enable = true; + config = { + user.name = "Maciej Jur"; + user.email = "maciej@kamoshi.org"; + user.signingkey = "191CBFF5F72ECAFD!"; + commit.gpgsign = true; + init.defaultBranch = "main"; + core.editor = "vim"; + }; + }; + }; - # List services that you want to enable: + # List services that you want to enable: - # Enable the OpenSSH daemon. - services.openssh.enable = true; + # Enable the OpenSSH daemon. + services.openssh.enable = true; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - networking.firewall.enable = true; + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + networking.firewall.enable = true; - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - system.copySystemConfiguration = true; + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + system.copySystemConfiguration = true; - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 81367f8..9df9365 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -18,12 +18,12 @@ "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "9636d5a3f4f531256fba147a30b882c44f28fae1" }, + "nvim-treesitter": { "branch": "master", "commit": "cdc613c630598779dc9f975bae12a4dc7c001950" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "precognition.nvim": { "branch": "main", "commit": "9e6087fcd27dd5d2fc71b9d9471a101666c39f73" }, - "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, + "rustaceanvim": { "branch": "master", "commit": "2fa45427c01ded4d3ecca72e357f8a60fd8e46d4" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "e0b35a273df58b03612255783cf475a782ede7e0" }, diff --git a/nvim/lua/config/plugins/rustaceanvim.lua b/nvim/lua/config/plugins/rustaceanvim.lua index b94ba37..8ee2ab5 100644 --- a/nvim/lua/config/plugins/rustaceanvim.lua +++ b/nvim/lua/config/plugins/rustaceanvim.lua @@ -3,17 +3,10 @@ local n = map 'n' local function get_opts() - local tools = require 'rustaceanvim' + -- local tools = require 'rustaceanvim' ---@type RustaceanOpts - return { - server = { - on_attach = function(_, bufnr) - n '' (tools.hover_actions.hover_actions) { buffer = bufnr } - n 'a' (tools.code_action_group.code_action_group) { buffer = bufnr } - end, - }, - } + return {} end return function()