diff --git a/configuration.nix b/configuration.nix index 870545e..2a50ecb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -16,7 +16,20 @@ "nix-command" "flakes" ]; - boot.loader.systemd-boot.enable = true; + + boot = { + loader = { + systemd-boot = { + enable = true; + }; + grub = { + enable = false; + device = "/dev/sda"; + useOSProber = true; + }; + }; + supportedFilesystems = [ "ntfs" ]; + }; networking = { hostName = "poggers"; @@ -122,6 +135,9 @@ slurp feh gnumake + flameshot + tree + gdb # cli neofetch @@ -142,11 +158,16 @@ gccgo14 go nixd + arduino-cli + arduino-ide + arduino-language-server + dotnet-sdk # misc cava discord - + pacman + ]; security = { @@ -179,6 +200,12 @@ ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); }; + + environment.etc = { + "makepkg.conf".source = "${pkgs.pacman}/etc/makepkg.conf"; + "pacman.conf".source = ./modules/raw/pacman.conf; + }; + system.stateVersion = "unstable"; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 375acef..5e36db6 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,39 +1,52 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/270c565f-b130-4f83-831e-c56b36b2ec83"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/270c565f-b130-4f83-831e-c56b36b2ec83"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C7A8-3E74"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/C7A8-3E74"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; + + fileSystems."/media/STUFF" = { + device = "/dev/disk/by-label/STUFF"; + fsType = "ntfs"; + }; 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/home.nix b/modules/home.nix index 0345722..c57b38b 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -7,7 +7,6 @@ { imports = [ ./nix/user.nix - ./nix/qutebrowser.nix ./nix/nvim/default.nix ./nix/hypr/default.nix ./nix/bspwm/default.nix diff --git a/modules/nix/nvim/lsp.nix b/modules/nix/nvim/lsp.nix index 4470554..57337ba 100644 --- a/modules/nix/nvim/lsp.nix +++ b/modules/nix/nvim/lsp.nix @@ -15,11 +15,21 @@ enable = true; inlayHints = true; servers = { + csharp_ls = { + enable = true; + autostart = true; + }; + bashls = { + enable = true; + autostart = true; + }; html = { enable = true; + autostart = true; }; lua_ls = { enable = true; + autostart = true; }; nixd = { enable = true; @@ -34,12 +44,15 @@ }; asm_lsp = { enable = true; + autostart = true; }; pyright = { enable = true; + autostart = true; }; gopls = { enable = true; + autostart = true; }; rust_analyzer = { enable = true; @@ -51,6 +64,14 @@ enable = true; autostart = true; }; + omnisharp = { + enable = true; + autostart = true; + }; + arduino_language_server = { + enable = true; + autostart = true; + }; }; }; }; diff --git a/modules/nix/user.nix b/modules/nix/user.nix index 2cf4226..cc0b3f8 100644 --- a/modules/nix/user.nix +++ b/modules/nix/user.nix @@ -35,8 +35,8 @@ }; git = { enable = true; - userName = "meml0rz"; - userEmail = "meml0rz"; + userName = "fqbn207"; + userEmail = "fqbn207"; }; tmux = { enable = true; diff --git a/modules/raw/pacman.conf b/modules/raw/pacman.conf new file mode 100644 index 0000000..affca54 --- /dev/null +++ b/modules/raw/pacman.conf @@ -0,0 +1,17 @@ +[options] +HoldPkg = pacman glibc +Architecture = auto +UseSyslog +Color +ILoveCandy +CheckSpace +VerbosePkgLists +ParallelDownloads = 5 +SigLevel = Never +LocalFileSigLevel = Optional + +[dkp-libs] +Server = https://pkg.devkitpro.org/packages + +[dkp-linux] +Server = https://pkg.devkitpro.org/packages/linux/$arch/