diff --git a/flake.lock b/flake.lock index 8d262e4..1caeaff 100644 --- a/flake.lock +++ b/flake.lock @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1740123181, - "narHash": "sha256-KuY4zpyzdJMIZbn7qtJQgXGpfHceD0hZN6e+taTOPdE=", + "lastModified": 1740863579, + "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=", "owner": "jas-singhfsu", "repo": "hyprpanel", - "rev": "efdcb7d53bd53b18b707e13363a48646e4be6d61", + "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd", "type": "github" }, "original": { @@ -282,11 +282,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739923778, - "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740019556, - "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", + "lastModified": 1741310760, + "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dad564433178067be1fbdfcce23b546254b6d641", + "rev": "de0fe301211c267807afd11b12613f5511ff7433", "type": "github" }, "original": { @@ -327,11 +327,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740227941, - "narHash": "sha256-3UKJJoY2hkqHuEbrlbQQRU4TIF0hV7Fw2b0PUZpnuBI=", + "lastModified": 1740919463, + "narHash": "sha256-8jEXQsZUiG86T/H8dCxYOJ+kAT+ppVylaPYiFwrNL6g=", "owner": "nix-community", "repo": "nixvim", - "rev": "de4035ea1a84aa0ebe12d24fc660130a754e0a5c", + "rev": "7e27ae55d17db65bd3ff02bcbec0615d50584910", "type": "github" }, "original": { diff --git a/home/fabric/default.nix b/home/fabric/default.nix index 04909de..d9921d3 100644 --- a/home/fabric/default.nix +++ b/home/fabric/default.nix @@ -72,6 +72,7 @@ libresprite gh btop + leetgo ]; # Enable home-manager diff --git a/home/fabric/desktop/hyprland.nix b/home/fabric/desktop/hyprland.nix index c6fe5fe..92f90f7 100644 --- a/home/fabric/desktop/hyprland.nix +++ b/home/fabric/desktop/hyprland.nix @@ -9,6 +9,7 @@ settings = { "$mainMod" = "SUPER"; "$terminal" = "kitty"; + "$browser" = "firefox"; "$fileManager " = "dolphin"; "$menu" = "wofi --show drun"; @@ -35,6 +36,7 @@ # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = [ "$mainMod, T, exec, $terminal" + "$mainMod, B, exec, $browser" "$mainMod, Q, killactive" "$mainMod, M, exit" "$mainMod, E, exec, $fileManager" diff --git a/home/fabric/programs/nixvim.nix b/home/fabric/programs/nixvim.nix index dd63b3d..144499e 100644 --- a/home/fabric/programs/nixvim.nix +++ b/home/fabric/programs/nixvim.nix @@ -1,16 +1,25 @@ # home/fabric/programs/nixvim.nix -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.nixvim = { enable = true; plugins = { + nui.enable = true; + auto-session = { + enable = true; + }; cmp-dictionary.enable = true; cmp-spell.enable = true; toggleterm = { enable = true; + settings = { + open_mapping = "[[]]"; + direction = "float"; + insert_mappings = true; + terminal_mappings = true; + start_in_insert = true; + persist_size = true; + close_on_exit = true; + }; }; web-devicons.enable = true; nix.enable = true; @@ -28,7 +37,7 @@ enable = true; keymaps = { " " = { - action = "git_files"; + action = "find_files"; }; }; settings = { @@ -253,14 +262,51 @@ servers = { ts_ls.enable = true; eslint.enable = true; - nil_ls.enable = true; + nil_ls = { + enable = true; + }; + lua_ls = { + enable = true; + settings = { + Lua = { + hint = { + enable = true; + arrayIndex = "Enable"; + setType = true; + paramName = "All"; + paramType = true; + }; + }; + }; + }; tailwindcss.enable = true; - gopls.enable = true; + gopls = { + enable = true; + settings = { + hints = { + assignVariableTypes = true; + compositeLiteralFields = true; + compositeLiteralTypes = true; + constantValues = true; + functionTypeParameters = true; + parameterNames = true; + rangeVariableTypes = true; + }; + }; + }; rust_analyzer = { enable = true; installCargo = true; installRustc = true; installRustfmt = true; + settings = { + inlayHints = { + chainingHints.enable = true; + closureReturnTypeHints.enable = "always"; + parameterHints.enable = true; + typeHints.enable = true; + }; + }; }; }; }; @@ -292,6 +338,17 @@ tmux-navigator.enable = true; vim-suda.enable = true; }; + extraPlugins = [ + (pkgs.vimUtils.buildVimPlugin { + name = "plenary.nvim"; + src = pkgs.fetchFromGitHub { + owner = "nvim-lua"; + repo = "plenary.nvim"; + rev = "v0.1.4"; + hash = "sha256-zR44d9MowLG1lIbvrRaFTpO/HXKKrO6lbtZfvvTdx+o="; + }; + }) + ]; globals.mapleader = " "; opts = { relativenumber = true; @@ -425,11 +482,11 @@ } # Toggleterm - { - mode = "n"; - key = "t"; - action = ":ToggleTerm direction=float"; - } + # { + # mode = "n"; + # key = "t"; + # action = ":ToggleTerm direction=float"; + # } ]; colorschemes.rose-pine.enable = true; }; diff --git a/home/fabric/programs/zsh.nix b/home/fabric/programs/zsh.nix index cdd14fa..c1562d6 100644 --- a/home/fabric/programs/zsh.nix +++ b/home/fabric/programs/zsh.nix @@ -26,6 +26,7 @@ tmux = { autoStartLocal = true; autoStartRemote = true; + defaultSessionName = "default"; }; }; }; diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index faaba9c..0b63d12 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -25,6 +25,7 @@ kitty zsh ollama + usbutils ]; # Enable the OpenSSH daemon diff --git a/hosts/common/optional/wifi.nix b/hosts/common/optional/wifi.nix new file mode 100644 index 0000000..a6d4afe --- /dev/null +++ b/hosts/common/optional/wifi.nix @@ -0,0 +1,3 @@ +# hosts/common/optional/wifi.nix +{...}: { +} diff --git a/hosts/zion/default.nix b/hosts/zion/default.nix index 7745e8f..5db1ef1 100644 --- a/hosts/zion/default.nix +++ b/hosts/zion/default.nix @@ -14,6 +14,7 @@ ../common/optional/nvidia.nix ../common/optional/docker.nix ../common/optional/steam.nix + ../common/optional/wifi.nix ]; # Bootloader diff --git a/hosts/zion/hardware-configuration.nix b/hosts/zion/hardware-configuration.nix index a2cd2bc..30210de 100644 --- a/hosts/zion/hardware-configuration.nix +++ b/hosts/zion/hardware-configuration.nix @@ -1,30 +1,36 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = with config.boot.kernelPackages; [ + rtl88xxau-aircrack + ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/303cbd05-4811-4560-a136-23ef8fd3a4fa"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/303cbd05-4811-4560-a136-23ef8fd3a4fa"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3083-F950"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/3083-F950"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's