chore(format): apply nixfmt formatting
This commit is contained in:
Ryan Hamamura
@@ -8,5 +8,9 @@
|
|||||||
wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
|
wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules);
|
outputs =
|
||||||
|
inputs:
|
||||||
|
inputs.flake-parts.lib.mkFlake {
|
||||||
|
inherit inputs;
|
||||||
|
} (inputs.import-tree ./modules);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,32 @@
|
|||||||
{ self, inputs, ... }: {
|
{ self, inputs, ... }:
|
||||||
|
{
|
||||||
|
|
||||||
flake.nixosModules.niri = { pkgs, lib, ... }: {
|
flake.nixosModules.niri =
|
||||||
programs.niri = {
|
{ pkgs, lib, ... }:
|
||||||
enable = true;
|
{
|
||||||
package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
|
programs.niri = {
|
||||||
}
|
enable = true;
|
||||||
};
|
package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri;
|
||||||
|
};
|
||||||
perSystem = { pkgs, lib, ... }: {
|
};
|
||||||
packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
|
|
||||||
inherit pkgs;
|
perSystem =
|
||||||
settings = {
|
{ pkgs, lib, ... }:
|
||||||
input.keyboard = {
|
{
|
||||||
xkb.layout = "us,ua";
|
packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap {
|
||||||
};
|
inherit pkgs;
|
||||||
|
settings = {
|
||||||
layout.gaps = 5;
|
input.keyboard = {
|
||||||
|
xkb.layout = "us,ua";
|
||||||
binds = {
|
};
|
||||||
"Mod+Return".spawn-sh = lib.getExe pkgs.alacritty;
|
|
||||||
"Mod+Q".close-window = null;
|
layout.gaps = 5;
|
||||||
};
|
|
||||||
|
binds = {
|
||||||
|
"Mod+Return".spawn-sh = lib.getExe pkgs.alacritty;
|
||||||
|
"Mod+Q".close-window = null;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,161 +1,170 @@
|
|||||||
{ self, inputs, ... }: {
|
{ self, inputs, ... }:
|
||||||
|
{
|
||||||
flake.nixosModules.fioConfiguration = { pkgs, lib, ... }: {
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
self.nixosModules.fioHardware
|
|
||||||
self.nixosModules.niri
|
|
||||||
];
|
|
||||||
|
|
||||||
# Bootloader.
|
flake.nixosModules.fioConfiguration =
|
||||||
boot.loader.systemd-boot.enable = true;
|
{ pkgs, lib, ... }:
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
{
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
imports = [
|
||||||
|
self.nixosModules.fioHardware
|
||||||
|
self.nixosModules.niri
|
||||||
|
];
|
||||||
|
|
||||||
networking.hostName = "fio";
|
# Bootloader.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
# Enable networking
|
nix.settings.experimental-features = [
|
||||||
networking.networkmanager.enable = true;
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
# Set your time zone.
|
networking.hostName = "fio";
|
||||||
time.timeZone = "Pacific/Honolulu";
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Enable networking
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
i18n.extraLocaleSettings = {
|
# Set your time zone.
|
||||||
LC_ADDRESS = "en_US.UTF-8";
|
time.timeZone = "Pacific/Honolulu";
|
||||||
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";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Select internationalisation properties.
|
||||||
# You can disable this if you're only using the Wayland session.
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
services.xserver.enable = true;
|
|
||||||
|
|
||||||
# Enable the KDE Plasma Desktop Environment.
|
i18n.extraLocaleSettings = {
|
||||||
services.displayManager.sddm.enable = true;
|
LC_ADDRESS = "en_US.UTF-8";
|
||||||
services.desktopManager.plasma6.enable = true;
|
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
|
# Enable the X11 windowing system.
|
||||||
services.xserver.xkb = {
|
# You can disable this if you're only using the Wayland session.
|
||||||
layout = "us";
|
services.xserver.enable = true;
|
||||||
variant = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable the KDE Plasma Desktop Environment.
|
||||||
services.printing.enable = true;
|
services.displayManager.sddm.enable = true;
|
||||||
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Configure keymap in X11
|
||||||
services.pulseaudio.enable = false;
|
services.xserver.xkb = {
|
||||||
security.rtkit.enable = true;
|
layout = "us";
|
||||||
services.pipewire = {
|
variant = "";
|
||||||
enable = true;
|
};
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
# If you want to use JACK applications, uncomment this
|
|
||||||
#jack.enable = true;
|
|
||||||
|
|
||||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
# Enable CUPS to print documents.
|
||||||
# no need to redefine it in your config for now)
|
services.printing.enable = true;
|
||||||
#media-session.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable sound with pipewire.
|
||||||
# services.xserver.libinput.enable = true;
|
services.pulseaudio.enable = false;
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
# If you want to use JACK applications, uncomment this
|
||||||
|
#jack.enable = true;
|
||||||
|
|
||||||
programs.zsh = {
|
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||||
enable = true;
|
# no need to redefine it in your config for now)
|
||||||
enableCompletion = true;
|
#media-session.enable = true;
|
||||||
autosuggestions.enable = true;
|
};
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
};
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
|
programs.zsh = {
|
||||||
|
enable = true;
|
||||||
|
enableCompletion = true;
|
||||||
|
autosuggestions.enable = true;
|
||||||
|
syntaxHighlighting.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.git = {
|
||||||
|
enable = true;
|
||||||
|
config = {
|
||||||
|
user.name = "Ryan Hamamura";
|
||||||
|
user.email = "58859899+ryanhamamura@users.noreply.github.com";
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
users.users.ryan = {
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "Ryan Hamamura";
|
||||||
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
];
|
||||||
|
shell = pkgs.zsh;
|
||||||
|
packages = with pkgs; [
|
||||||
|
kdePackages.kate
|
||||||
|
# thunderbird
|
||||||
|
];
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3IDvg7Qfm3BJGK2XAIQEYwyUCPyXdyB3o6BUitu/DS ryan@porco"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Install firefox.
|
||||||
|
programs.firefox.enable = true;
|
||||||
|
|
||||||
|
# Allow unfree packages
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
# List packages installed in system profile. To search, run:
|
||||||
|
# $ nix search wget
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
vim
|
||||||
|
wget
|
||||||
|
git
|
||||||
|
neovim
|
||||||
|
alacritty
|
||||||
|
tea
|
||||||
|
];
|
||||||
|
|
||||||
|
# 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;
|
||||||
|
settings = {
|
||||||
|
PasswordAuthentication = false;
|
||||||
|
KbdInteractiveAuthentication = false;
|
||||||
|
PermitRootLogin = "no";
|
||||||
|
AllowUsers = [ "ryan" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# 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 = "25.11"; # Did you read the comment?
|
||||||
|
|
||||||
programs.git = {
|
|
||||||
enable = true;
|
|
||||||
config = {
|
|
||||||
user.name = "Ryan Hamamura";
|
|
||||||
user.email = "58859899+ryanhamamura@users.noreply.github.com";
|
|
||||||
init.defaultBranch = "main";
|
|
||||||
push.autoSetupRemote = true;
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.users.ryan = {
|
|
||||||
isNormalUser = true;
|
|
||||||
description = "Ryan Hamamura";
|
|
||||||
extraGroups = [ "networkmanager" "wheel" ];
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
packages = with pkgs; [
|
|
||||||
kdePackages.kate
|
|
||||||
# thunderbird
|
|
||||||
];
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3IDvg7Qfm3BJGK2XAIQEYwyUCPyXdyB3o6BUitu/DS ryan@porco"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Install firefox.
|
|
||||||
programs.firefox.enable = true;
|
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
vim
|
|
||||||
wget
|
|
||||||
git
|
|
||||||
neovim
|
|
||||||
alacritty
|
|
||||||
tea
|
|
||||||
];
|
|
||||||
|
|
||||||
# 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;
|
|
||||||
settings = {
|
|
||||||
PasswordAuthentication = false;
|
|
||||||
KbdInteractiveAuthentication = false;
|
|
||||||
PermitRootLogin = "no";
|
|
||||||
AllowUsers = [ "ryan" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# 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 = "25.11"; # Did you read the comment?
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{ self, inputs, ... }: {
|
{ self, inputs, ... }:
|
||||||
|
{
|
||||||
flake.nixosConfigurations.fio = inputs.nixpkgs.lib.nixosSystem {
|
flake.nixosConfigurations.fio = inputs.nixpkgs.lib.nixosSystem {
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.fioConfiguration
|
self.nixosModules.fioConfiguration
|
||||||
|
|||||||
@@ -1,32 +1,52 @@
|
|||||||
{ self, inputs, ... }: {
|
{ self, inputs, ... }:
|
||||||
|
{
|
||||||
|
|
||||||
flake.nixosModules.fioHardware = { config, lib, pkgs, modulesPath, ... }: {
|
flake.nixosModules.fioHardware =
|
||||||
imports = [
|
{
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
config,
|
||||||
];
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules = [
|
||||||
boot.initrd.kernelModules = [ ];
|
"xhci_pci"
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
"nvme"
|
||||||
boot.extraModulePackages = [ ];
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
"rtsx_pci_sdmmc"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-uuid/ebb1e88b-3373-4e3c-8297-2d80bd5351a6";
|
device = "/dev/disk/by-uuid/ebb1e88b-3373-4e3c-8297-2d80bd5351a6";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/3779-802B";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/dev/disk/by-uuid/812e6cdb-6cfb-402f-9e47-88b2d337c39e";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/3779-802B";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ {
|
|
||||||
device = "/dev/disk/by-uuid/812e6cdb-6cfb-402f-9e47-88b2d337c39e";
|
|
||||||
} ];
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user