| author | |
| committer | |
| log | 710e813bec1bae1b7354d4f5d6c8d1f6bd8880c0 |
| tree | 964237e880163af050f1023dbe94e828d69a17c2 |
| parent | 6d0308ef9b676cbe2890fc980ce6aba04c3096da |
| signature | Commit is signed but in an unrecognized format. |
11 files changed, 45 insertions(+), 29 deletions(-)
lib/mkNeovim.nix+1-1| ... | @@ -1,7 +1,7 @@ | ... | @@ -1,7 +1,7 @@ |
| 1 | { self, inputs }: | 1 | { self, inputs }: |
| 2 | user: pkgs: | 2 | user: pkgs: |
| 3 | let | 3 | let |
| 4 | darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.system; | 4 | darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system; |
| 5 | 5 | ||
| 6 | host = { | 6 | host = { |
| 7 | inherit darwin; | 7 | inherit darwin; |
modules/home/default.nix+4-2| ... | @@ -69,8 +69,10 @@ in | ... | @@ -69,8 +69,10 @@ in |
| 69 | 69 | ||
| 70 | git = { | 70 | git = { |
| 71 | enable = true; | 71 | enable = true; |
| 72 | userName = lib.mkDefault user.name; | 72 | settings.user = { |
| 73 | userEmail = lib.mkDefault user.email; | 73 | name = lib.mkDefault user.name; |
| 74 | email = lib.mkDefault user.email; | ||
| 75 | }; | ||
| 74 | ignores = [ | 76 | ignores = [ |
| 75 | (lib.mkIf host.darwin ".DS_Store") # When using Finder | 77 | (lib.mkIf host.darwin ".DS_Store") # When using Finder |
| 76 | (lib.mkIf host.darwin "._*") # When using non-APFS drives | 78 | (lib.mkIf host.darwin "._*") # When using non-APFS drives |
modules/neovim/default.nix+1-1| ... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
| 111 | html.enable = true; | 111 | html.enable = true; |
| 112 | nix.enable = true; | 112 | nix.enable = true; |
| 113 | python.enable = true; | 113 | python.enable = true; |
| 114 | rust.crates.enable = true; | 114 | rust.extensions.crates-nvim.enable = true; |
| 115 | rust.enable = true; | 115 | rust.enable = true; |
| 116 | ts.enable = true; | 116 | ts.enable = true; |
| 117 | zig.enable = true; | 117 | zig.enable = true; |
modules/nixos/nvidia.nix+2-2| ... | @@ -84,7 +84,7 @@ in | ... | @@ -84,7 +84,7 @@ in |
| 84 | enable32Bit = true; | 84 | enable32Bit = true; |
| 85 | extraPackages = with pkgs; [ | 85 | extraPackages = with pkgs; [ |
| 86 | nvidia-vaapi-driver | 86 | nvidia-vaapi-driver |
| 87 | vaapiVdpau | 87 | libva-vdpau-driver |
| 88 | libvdpau-va-gl | 88 | libvdpau-va-gl |
| 89 | mesa | 89 | mesa |
| 90 | egl-wayland | 90 | egl-wayland |
| ... | @@ -104,7 +104,7 @@ in | ... | @@ -104,7 +104,7 @@ in |
| 104 | 104 | ||
| 105 | environment.systemPackages = with pkgs; [ | 105 | environment.systemPackages = with pkgs; [ |
| 106 | vulkan-tools | 106 | vulkan-tools |
| 107 | glxinfo | 107 | mesa-demos |
| 108 | libva-utils # VA-API debugging tools | 108 | libva-utils # VA-API debugging tools |
| 109 | ]; | 109 | ]; |
| 110 | } | 110 | } |
users/fish/cattop/hardware-configuration.nix+31-17| ... | @@ -1,32 +1,46 @@ | ... | @@ -1,32 +1,46 @@ |
| 1 | # Do not modify this file! It was generated by ‘nixos-generate-config’ | 1 | # Do not modify this file! It was generated by ‘nixos-generate-config’ |
| 2 | # and may be overwritten by future invocations. Please make changes | 2 | # and may be overwritten by future invocations. Please make changes |
| 3 | # to /etc/nixos/configuration.nix instead. | 3 | # to /etc/nixos/configuration.nix instead. |
| 4 | { config, lib, pkgs, modulesPath, ... }: | 4 | { |
| 5 | config, | ||
| 6 | lib, | ||
| 7 | pkgs, | ||
| 8 | modulesPath, | ||
| 9 | ... | ||
| 10 | }: | ||
| 5 | 11 | ||
| 6 | { | 12 | { |
| 7 | imports = | 13 | imports = [ |
| 8 | [ (modulesPath + "/installer/scan/not-detected.nix") | 14 | (modulesPath + "/installer/scan/not-detected.nix") |
| 9 | ]; | 15 | ]; |
| 10 | 16 | ||
| 11 | boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; | 17 | boot.initrd.availableKernelModules = [ |
| 18 | "xhci_pci" | ||
| 19 | "thunderbolt" | ||
| 20 | "vmd" | ||
| 21 | "nvme" | ||
| 22 | ]; | ||
| 12 | boot.initrd.kernelModules = [ ]; | 23 | boot.initrd.kernelModules = [ ]; |
| 13 | boot.kernelModules = [ "kvm-intel" ]; | 24 | boot.kernelModules = [ "kvm-intel" ]; |
| 14 | boot.extraModulePackages = [ ]; | 25 | boot.extraModulePackages = [ ]; |
| 15 | 26 | ||
| 16 | fileSystems."/" = | 27 | fileSystems."/" = { |
| 17 | { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; | 28 | device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6"; |
| 18 | fsType = "ext4"; | 29 | fsType = "ext4"; |
| 19 | }; | 30 | }; |
| 20 | 31 | ||
| 21 | fileSystems."/boot/EFI" = | 32 | fileSystems."/boot/EFI" = { |
| 22 | { device = "/dev/disk/by-uuid/473A-B8FD"; | 33 | device = "/dev/disk/by-uuid/473A-B8FD"; |
| 23 | fsType = "vfat"; | 34 | fsType = "vfat"; |
| 24 | options = [ "fmask=0077" "dmask=0077" ]; | 35 | options = [ |
| 25 | }; | 36 | "fmask=0077" |
| 26 | 37 | "dmask=0077" | |
| 27 | swapDevices = | ||
| 28 | [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } | ||
| 29 | ]; | 38 | ]; |
| 39 | }; | ||
| 40 | |||
| 41 | swapDevices = [ | ||
| 42 | { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; } | ||
| 43 | ]; | ||
| 30 | 44 | ||
| 31 | # Enables DHCP on each ethernet and wireless interface. In case of scripted networking | 45 | # Enables DHCP on each ethernet and wireless interface. In case of scripted networking |
| 32 | # (the default) this is the recommended approach. When using systemd-networkd it's | 46 | # (the default) this is the recommended approach. When using systemd-networkd it's |
users/fish/vim/languages.nix+1-1| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | lua.lsp.enable = true; | 14 | lua.lsp.enable = true; |
| 15 | lua.lsp.lazydev.enable = true; | 15 | lua.lsp.lazydev.enable = true; |
| 16 | python = { | 16 | python = { |
| 17 | format.type = "ruff"; | 17 | format.type = [ "ruff" ]; |
| 18 | }; | 18 | }; |
| 19 | markdown = { | 19 | markdown = { |
| 20 | enable = true; | 20 | enable = true; |
users/natalie/configuration.nix+1-1| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | iosevka | 13 | iosevka |
| 14 | nerd-fonts.symbols-only | 14 | nerd-fonts.symbols-only |
| 15 | nerd-fonts.iosevka | 15 | nerd-fonts.iosevka |
| 16 | inputs.apple-fonts.packages.${pkgs.system}.sf-pro | 16 | inputs.apple-fonts.packages.${pkgs.stdenv.hostPlatform.system}.sf-pro |
| 17 | sketchybar-app-font | 17 | sketchybar-app-font |
| 18 | ]; | 18 | ]; |
| 19 | 19 |
users/natalie/desktop/home.nix+1-1| ... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
| 25 | dxvk_2 | 25 | dxvk_2 |
| 26 | steam-run | 26 | steam-run |
| 27 | vulkan-tools | 27 | vulkan-tools |
| 28 | path-of-building | 28 | rusty-path-of-building |
| 29 | wineWowPackages.stable | 29 | wineWowPackages.stable |
| 30 | winetricks | 30 | winetricks |
| 31 | (prismlauncher.override { gamemodeSupport = true; }) | 31 | (prismlauncher.override { gamemodeSupport = true; }) |
users/natalie/home/hyprland/plugins.nix+1-1| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | { | 2 | { |
| 3 | wayland.windowManager.hyprland = { | 3 | wayland.windowManager.hyprland = { |
| 4 | plugins = [ | 4 | plugins = [ |
| 5 | inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces | 5 | inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces |
| 6 | ]; | 6 | ]; |
| 7 | settings = { | 7 | settings = { |
| 8 | plugin = { | 8 | plugin = { |
users/natalie/home/vicinae.nix+1-1| ... | @@ -18,7 +18,7 @@ | ... | @@ -18,7 +18,7 @@ |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | # extensions = [ | 20 | # extensions = [ |
| 21 | # (inputs.vicinae.mkVicinaeExtension.${pkgs.system} { | 21 | # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} { |
| 22 | # inherit pkgs; | 22 | # inherit pkgs; |
| 23 | # name = "nixpkgs search"; | 23 | # name = "nixpkgs search"; |
| 24 | # src = pkgs.fetchFromGithub { | 24 | # src = pkgs.fetchFromGithub { |
users/natalie/vim/languages.nix+1-1| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | lua.lsp.enable = true; | 14 | lua.lsp.enable = true; |
| 15 | lua.lsp.lazydev.enable = true; | 15 | lua.lsp.lazydev.enable = true; |
| 16 | python = { | 16 | python = { |
| 17 | format.type = "ruff"; | 17 | format.type = [ "ruff" ]; |
| 18 | }; | 18 | }; |
| 19 | markdown = { | 19 | markdown = { |
| 20 | enable = true; | 20 | enable = true; |