From d32da7ad5e115f8432ddeecce243301d95917762 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sun, 28 Jul 2024 03:00:57 -0700 Subject: [PATCH] Formatting --- flake.nix | 27 +++++++++ hosts/cap-nr200p/configuration.nix | 63 ++++++++++++--------- hosts/cap-nr200p/hardware-configuration.nix | 52 +++++++++++++++++ modules/nixos/hyprland.nix | 10 ++-- 4 files changed, 120 insertions(+), 32 deletions(-) create mode 100644 flake.nix create mode 100644 hosts/cap-nr200p/hardware-configuration.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..00268c3 --- /dev/null +++ b/flake.nix @@ -0,0 +1,27 @@ +{ + description = "Nixos config flake"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = + { self, nixpkgs, ... }@inputs: + { + nixosConfigurations.default = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs; + }; + modules = [ + ./hosts/cap-nr200p/configuration.nix + ./modules/nixos/hyprland.nix + inputs.home-manager.nixosModules.default + ]; + }; + }; +} diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix index ac48dc0..5a0f998 100644 --- a/hosts/cap-nr200p/configuration.nix +++ b/hosts/cap-nr200p/configuration.nix @@ -5,10 +5,10 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -25,7 +25,10 @@ networking.networkmanager.enable = true; # Enable flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; #-# + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; # -# # Set your time zone. time.timeZone = "America/Los_Angeles"; @@ -84,14 +87,18 @@ users.users.caperren = { isNormalUser = true; description = "Corwin Perren"; - extraGroups = [ "networkmanager" "wheel" "input" ]; + extraGroups = [ + "networkmanager" + "wheel" + "input" + ]; packages = with pkgs; [ - # thunderbird + # thunderbird ]; }; # Install firefox. - programs.firefox.enable = true; #-# + programs.firefox.enable = true; # -# # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -99,11 +106,11 @@ # 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. - # wget + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget lf git - wofi + wofi nvtopPackages.full htop iftop @@ -120,7 +127,7 @@ pasystray glava spotify-player - hyprpicker + hyprpicker unetbootin lf dnsutils @@ -156,7 +163,7 @@ ]; programs.thunar.enable = true; - programs.thunar.plugins = with pkgs.xfce; [ + programs.thunar.plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]; @@ -169,19 +176,21 @@ security.sudo = { enable = true; - extraRules = [{ - commands = [ - { - command = "${pkgs.systemd}/bin/reboot"; - options = [ "NOPASSWD" ]; - } - { - command = "${pkgs.systemd}/bin/poweroff"; - options = [ "NOPASSWD" ]; - } - ]; - groups = [ "wheel" ]; - }]; + extraRules = [ + { + commands = [ + { + command = "${pkgs.systemd}/bin/reboot"; + options = [ "NOPASSWD" ]; + } + { + command = "${pkgs.systemd}/bin/poweroff"; + options = [ "NOPASSWD" ]; + } + ]; + groups = [ "wheel" ]; + } + ]; }; programs.steam = { @@ -202,7 +211,7 @@ # List services that you want to enable: # Enable the OpenSSH daemon. - services.openssh.enable = true; #-# + services.openssh.enable = true; # -# # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; diff --git a/hosts/cap-nr200p/hardware-configuration.nix b/hosts/cap-nr200p/hardware-configuration.nix new file mode 100644 index 0000000..76bae84 --- /dev/null +++ b/hosts/cap-nr200p/hardware-configuration.nix @@ -0,0 +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, + ... +}: + +{ + 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 = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/0ffc75db-278d-4d96-99ee-4d17e6b1a9c2"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5BDD-941D"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; + + 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; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index c00aeeb..d908a23 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -1,4 +1,5 @@ -{ pkgs, config, ... }: { +{ pkgs, config, ... }: +{ programs.hyprland = { enable = true; xwayland.enable = true; @@ -34,7 +35,7 @@ enable = true; user = "caperren"; }; - + hardware.graphics = { enable = true; enable32Bit = true; @@ -63,10 +64,9 @@ pkgs.slurp pkgs.nwg-displays - (pkgs.waybar.overrideAttrs (oldAttrs: { + (pkgs.waybar.overrideAttrs (oldAttrs: { mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - }) - ) + })) ]; xdg.portal.enable = true;