From ecb7354ab497b1c361ec74a4eeb46246dea209a4 Mon Sep 17 00:00:00 2001 From: vitrial Date: Wed, 9 Oct 2024 18:17:17 -0400 Subject: [PATCH] initial commit --- flake.lock | 27 ++++ flake.nix | 16 ++ nixos/configuration.nix | 254 ++++++++++++++++++++++++++++++ nixos/modules/audio.nix | 14 ++ nixos/modules/bluetooth.nix | 12 ++ nixos/modules/layout.nix | 36 +++++ nixos/modules/nouveau.nix | 21 +++ nixos/modules/ntfs.nix | 9 ++ nixos/modules/nvidia.nix | 27 ++++ nixos/modules/virtual_machine.nix | 19 +++ 10 files changed, 435 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 nixos/configuration.nix create mode 100644 nixos/modules/audio.nix create mode 100644 nixos/modules/bluetooth.nix create mode 100644 nixos/modules/layout.nix create mode 100644 nixos/modules/nouveau.nix create mode 100644 nixos/modules/ntfs.nix create mode 100644 nixos/modules/nvidia.nix create mode 100644 nixos/modules/virtual_machine.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..a4593ca --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..02c9f82 --- /dev/null +++ b/flake.nix @@ -0,0 +1,16 @@ +{ + description = "Nixos config flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; + + outputs = { self, nixpkgs, ... }@inputs: { + nixosConfigurations.nixos= nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + ./nixos/configuration.nix + ]; + }; + }; +} diff --git a/nixos/configuration.nix b/nixos/configuration.nix new file mode 100644 index 0000000..18e1d63 --- /dev/null +++ b/nixos/configuration.nix @@ -0,0 +1,254 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + #./modules/layout.nix + ./modules/audio.nix + ./modules/bluetooth.nix + ./modules/ntfs.nix + # ./modules/virtual_machine.nix + #./modules/nouveau.nix + #./modules/nvidia.nix + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader = { + systemd-boot.enable = false; + + efi = { + canTouchEfiVariables = true; + }; + + grub = { + enable = true; + efiSupport = true; + device = "nodev"; + useOSProber = true; + }; + }; + + boot.extraModprobeConfig = '' + options amdgpu ppfeaturemask=0xFFF7FFFF + ''; + + boot.initrd.kernelModules = [ "amdgpu" ]; + networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + services.xserver.enable = true; + + services.xserver.displayManager = { + startx.enable = true; + lightdm.enable = false; + }; + + services.xserver.windowManager.dwm.enable = true; + + hardware.opengl = { + enable = true; + + driSupport = true; + }; + + hardware.cpu.amd.updateMicrocode = true; + hardware.enableRedistributableFirmware = true; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + + # Add any missing dynamic libraries for unpackaged programs + + # here, NOT in environment.systemPackages + + ]; + # Enable networking + networking.networkmanager.enable = true; + #networking.wireless.enable = true; + #networking.wireless.userControlled.enable = true; + + # Set your time zone. + time.timeZone = "America/New_York"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + #xkb.variant = "colemak_dh_iso"; + excludePackages = [ pkgs.xterm ]; + }; + + services.hardware.openrgb = { + enable = true; + package = pkgs.openrgb-with-all-plugins; + motherboard = "amd"; + server.port = 6742; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.vitrial = { + isNormalUser = true; + description = "vitrial"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; []; + }; + + security.sudo.wheelNeedsPassword = false; + + programs.nano.enable = false; + + programs.steam.enable = true; + + programs.gamemode = { + enable = true; + + settings = { + gpu = { + apply_gup_optimizations = "accept-responsibility"; + gpu_device = 0; + nvidia_performance_level = "high"; + }; + custom = { + start = "${pkgs.dunst}/bin/dunstify 'GameMode started'"; + end = "${pkgs.dunst}/bin/dunstify 'GameMode ended'"; + }; + }; + }; + + services.xserver.libinput = { + enable = true; + mouse = { + middleEmulation = false; + accelProfile = "flat"; + }; + + }; + + services.xserver.wacom.enable = true; + + #services.fprintd.enable = true; + #services.fprintd.tod.enable = true; + #services.fprintd.tod.driver = pkgs.libfprint-2-tod1-vfs0090; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + programs.bash.shellAliases = { + ror = "steam steam://rungameid/632360"; + cs2 = "steam steam://rungameid/730"; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + eza + wget + home-manager + xdotool + xorg.xkbcomp + xorg.libX11 + xorg.libXinerama + picom + ratpoison + arandr + pavucontrol + wacomtablet + xf86_input_wacom + libwacom + lact + #linuxKernel.packages.linux_6_6.nvidia_x11 + (python3.withPackages (ps: with ps; [ scapy ])) + (st.overrideAttrs (oldAttrs: rec { + buildInputs = oldAttrs.buildInputs ++ [ harfbuzz ]; + patches = [ + (fetchpatch { + url = "https://software.vitrial.xyz/nix-st.diff"; + sha256 = "1ph4nb8d9vkaq1rcdzlavhppxp1ikqygljqbnkpmx6j80khvjz3h"; + }) + ]; + })) + ]; + + systemd.packages = with pkgs; [ lact ]; + systemd.services.lactd.wantedBy = ["multi-user.target"]; + + fonts.packages = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + ]; + + console.colors = [ + "1E2127" + "E06C75" + "98C379" + "D19A66" + "5B9BB3" + "C678DD" + "56B6C2" + "ABB2BF" + "5C6370" + "E06C75" + "98C379" + "D19A66" + "5B9BB3" + "C678DD" + "56B6C2" + "FFFFFF" + ]; + + # 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; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + programs.ssh.enableAskPassword = false; + programs.ssh.askPassword = ""; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.11"; # Did you read the comment? + +} diff --git a/nixos/modules/audio.nix b/nixos/modules/audio.nix new file mode 100644 index 0000000..41f2389 --- /dev/null +++ b/nixos/modules/audio.nix @@ -0,0 +1,14 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + services.pipewire = { + enable = true; + alsa.enable = true; + pulse.enable = true; + jack.enable = true; + }; +} diff --git a/nixos/modules/bluetooth.nix b/nixos/modules/bluetooth.nix new file mode 100644 index 0000000..88433ee --- /dev/null +++ b/nixos/modules/bluetooth.nix @@ -0,0 +1,12 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + + services.blueman.enable = true; +} diff --git a/nixos/modules/layout.nix b/nixos/modules/layout.nix new file mode 100644 index 0000000..3933436 --- /dev/null +++ b/nixos/modules/layout.nix @@ -0,0 +1,36 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + services.keyd = { + enable = true; + keyboards.default.settings.main = { + e = "f"; + r = "p"; + t = "b"; + y = "j"; + u = "l"; + i = "u"; + o = "y"; + p = "semicolon"; + s = "r"; + d = "s"; + f = "t"; + h = "m"; + j = "n"; + k = "e"; + l = "i"; + semicolon = "o"; + v = "d"; + b = "v"; + n = "k"; + m = "h"; + capslock = "leftshift"; + leftshift = "escape"; + rightalt = "rightshift"; + }; + }; +} diff --git a/nixos/modules/nouveau.nix b/nixos/modules/nouveau.nix new file mode 100644 index 0000000..9b6c7d1 --- /dev/null +++ b/nixos/modules/nouveau.nix @@ -0,0 +1,21 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + boot.kernelModules = [ "nouveau" ]; + + boot.blacklistedKernelModules = [ "nvidia" "nvidia_uvm" "nvidia_drm" "nvidia_modeset" ]; + + services.xserver.videoDrivers = ["nouveau"]; + + hardware.opengl = { + enable = true; + extraPackages = with pkgs; [ + mesa + mesa.drivers + ]; + }; +} diff --git a/nixos/modules/ntfs.nix b/nixos/modules/ntfs.nix new file mode 100644 index 0000000..bd3d759 --- /dev/null +++ b/nixos/modules/ntfs.nix @@ -0,0 +1,9 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + boot.supportedFilesystems = [ "ntfs" ]; +} diff --git a/nixos/modules/nvidia.nix b/nixos/modules/nvidia.nix new file mode 100644 index 0000000..ecb0c66 --- /dev/null +++ b/nixos/modules/nvidia.nix @@ -0,0 +1,27 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + services.xserver.videoDrivers = ["nvidia"]; + + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + hardware.nvidia = { + modesetting.enable = true; + + powerManagement.finegrained = false; + + open = false; + + nvidiaSettings = true; + + package = config.boot.kernelPackages.nvidiaPackages.production; + }; +} diff --git a/nixos/modules/virtual_machine.nix b/nixos/modules/virtual_machine.nix new file mode 100644 index 0000000..7bba792 --- /dev/null +++ b/nixos/modules/virtual_machine.nix @@ -0,0 +1,19 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + virt-manager + ]; + + virtualisation.libvirtd = { + enable = true; + qemu.ovmf.enable = true; + qemu.runAsRoot = false; + onBoot = "ignore"; + onShutdown = "shutdown"; + }; +}