This commit is contained in:
FabricSoul 2025-03-12 22:11:24 -04:00
parent 45057cfb07
commit e959bbc456
9 changed files with 116 additions and 44 deletions

24
flake.lock generated
View file

@ -217,11 +217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740123181, "lastModified": 1740863579,
"narHash": "sha256-KuY4zpyzdJMIZbn7qtJQgXGpfHceD0hZN6e+taTOPdE=", "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=",
"owner": "jas-singhfsu", "owner": "jas-singhfsu",
"repo": "hyprpanel", "repo": "hyprpanel",
"rev": "efdcb7d53bd53b18b707e13363a48646e4be6d61", "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739923778, "lastModified": 1741332913,
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1740019556, "lastModified": 1741310760,
"narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dad564433178067be1fbdfcce23b546254b6d641", "rev": "de0fe301211c267807afd11b12613f5511ff7433",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +327,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1740227941, "lastModified": 1740919463,
"narHash": "sha256-3UKJJoY2hkqHuEbrlbQQRU4TIF0hV7Fw2b0PUZpnuBI=", "narHash": "sha256-8jEXQsZUiG86T/H8dCxYOJ+kAT+ppVylaPYiFwrNL6g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "de4035ea1a84aa0ebe12d24fc660130a754e0a5c", "rev": "7e27ae55d17db65bd3ff02bcbec0615d50584910",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -72,6 +72,7 @@
libresprite libresprite
gh gh
btop btop
leetgo
]; ];
# Enable home-manager # Enable home-manager

View file

@ -9,6 +9,7 @@
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
"$terminal" = "kitty"; "$terminal" = "kitty";
"$browser" = "firefox";
"$fileManager " = "dolphin"; "$fileManager " = "dolphin";
"$menu" = "wofi --show drun"; "$menu" = "wofi --show drun";
@ -35,6 +36,7 @@
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = [ bind = [
"$mainMod, T, exec, $terminal" "$mainMod, T, exec, $terminal"
"$mainMod, B, exec, $browser"
"$mainMod, Q, killactive" "$mainMod, Q, killactive"
"$mainMod, M, exit" "$mainMod, M, exit"
"$mainMod, E, exec, $fileManager" "$mainMod, E, exec, $fileManager"

View file

@ -1,16 +1,25 @@
# home/fabric/programs/nixvim.nix # home/fabric/programs/nixvim.nix
{ {pkgs, ...}: {
config,
pkgs,
...
}: {
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
plugins = { plugins = {
nui.enable = true;
auto-session = {
enable = true;
};
cmp-dictionary.enable = true; cmp-dictionary.enable = true;
cmp-spell.enable = true; cmp-spell.enable = true;
toggleterm = { toggleterm = {
enable = true; enable = true;
settings = {
open_mapping = "[[<C-t>]]";
direction = "float";
insert_mappings = true;
terminal_mappings = true;
start_in_insert = true;
persist_size = true;
close_on_exit = true;
};
}; };
web-devicons.enable = true; web-devicons.enable = true;
nix.enable = true; nix.enable = true;
@ -28,7 +37,7 @@
enable = true; enable = true;
keymaps = { keymaps = {
"<leader> " = { "<leader> " = {
action = "git_files"; action = "find_files";
}; };
}; };
settings = { settings = {
@ -253,14 +262,51 @@
servers = { servers = {
ts_ls.enable = true; ts_ls.enable = true;
eslint.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; 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 = { rust_analyzer = {
enable = true; enable = true;
installCargo = true; installCargo = true;
installRustc = true; installRustc = true;
installRustfmt = 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; tmux-navigator.enable = true;
vim-suda.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 = " "; globals.mapleader = " ";
opts = { opts = {
relativenumber = true; relativenumber = true;
@ -425,11 +482,11 @@
} }
# Toggleterm # Toggleterm
{ # {
mode = "n"; # mode = "n";
key = "<leader>t"; # key = "<leader>t";
action = ":ToggleTerm direction=float<CR>"; # action = ":ToggleTerm direction=float<CR>";
} # }
]; ];
colorschemes.rose-pine.enable = true; colorschemes.rose-pine.enable = true;
}; };

View file

@ -26,6 +26,7 @@
tmux = { tmux = {
autoStartLocal = true; autoStartLocal = true;
autoStartRemote = true; autoStartRemote = true;
defaultSessionName = "default";
}; };
}; };
}; };

View file

@ -25,6 +25,7 @@
kitty kitty
zsh zsh
ollama ollama
usbutils
]; ];
# Enable the OpenSSH daemon # Enable the OpenSSH daemon

View file

@ -0,0 +1,3 @@
# hosts/common/optional/wifi.nix
{...}: {
}

View file

@ -14,6 +14,7 @@
../common/optional/nvidia.nix ../common/optional/nvidia.nix
../common/optional/docker.nix ../common/optional/docker.nix
../common/optional/steam.nix ../common/optional/steam.nix
../common/optional/wifi.nix
]; ];
# Bootloader # Bootloader

View file

@ -1,30 +1,36 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = with config.boot.kernelPackages; [
rtl88xxau-aircrack
];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/303cbd05-4811-4560-a136-23ef8fd3a4fa"; device = "/dev/disk/by-uuid/303cbd05-4811-4560-a136-23ef8fd3a4fa";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/3083-F950"; device = "/dev/disk/by-uuid/3083-F950";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = ["fmask=0077" "dmask=0077"];
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's