Run nixfmt
This commit is contained in:
parent
4d82957b22
commit
5eb076d8d4
@ -17,9 +17,7 @@
|
|||||||
nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.prismo = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = { inherit inputs self user; };
|
specialArgs = { inherit inputs self user; };
|
||||||
modules = [
|
modules = [ ./hosts/prismo ];
|
||||||
./hosts/prismo
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{ inputs, self, user, ...}: {
|
{ inputs, self, user, ... }: {
|
||||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
useGlobalPkgs= true;
|
useGlobalPkgs = true;
|
||||||
extraSpecialArgs = { inherit inputs user; };
|
extraSpecialArgs = { inherit inputs user; };
|
||||||
users.${user} = {
|
users.${user} = {
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ...}: {
|
{ pkgs, ... }: {
|
||||||
programs = {
|
programs = {
|
||||||
neovim = {
|
neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,6 +1 @@
|
|||||||
{
|
{ imports = [ ./hyprland.nix ./waybar.nix ]; }
|
||||||
imports = [
|
|
||||||
./hyprland.nix
|
|
||||||
./waybar.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
@ -1,11 +1,7 @@
|
|||||||
{ inputs, pkgs, lib, ...}: {
|
{ inputs, pkgs, lib, ... }: {
|
||||||
options.hyprland.enable = lib.mkEnableOption "Hyprland";
|
options.hyprland.enable = lib.mkEnableOption "Hyprland";
|
||||||
config = {
|
config = {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [ swww wl-clipboard cliphist ];
|
||||||
swww
|
|
||||||
wl-clipboard
|
|
||||||
cliphist
|
|
||||||
];
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -80,16 +76,14 @@
|
|||||||
"$mainMod,l,movewindow,r"
|
"$mainMod,l,movewindow,r"
|
||||||
"$mainMod,k,movewindow,u"
|
"$mainMod,k,movewindow,u"
|
||||||
"$mainMod,j,movewindow,d"
|
"$mainMod,j,movewindow,d"
|
||||||
] ++ (builtins.concatLists (builtins.genList(x:
|
] ++ (builtins.concatLists (builtins.genList (x:
|
||||||
let
|
let
|
||||||
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
||||||
in [
|
in [
|
||||||
"$mainMod, ${ws}, workspace, ${toString( x + 1)}"
|
"$mainMod, ${ws}, workspace, ${toString (x + 1)}"
|
||||||
"ALT, ${ws}, workspace, ${toString( x + 1)}"
|
"ALT, ${ws}, workspace, ${toString (x + 1)}"
|
||||||
]) 10));
|
]) 10));
|
||||||
exec-once = [
|
exec-once = [ "waybar &" ];
|
||||||
"waybar &"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -130,8 +130,7 @@
|
|||||||
settings = [{
|
settings = [{
|
||||||
"layer" = "top";
|
"layer" = "top";
|
||||||
"position" = "top";
|
"position" = "top";
|
||||||
modules-left =
|
modules-left = [ "custom/launcher" "hyprland/workspaces" ];
|
||||||
[ "custom/launcher" "hyprland/workspaces" ];
|
|
||||||
modules-center = [ "clock" ];
|
modules-center = [ "clock" ];
|
||||||
modules-right =
|
modules-right =
|
||||||
[ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" ];
|
[ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ...}: {
|
{ pkgs, ... }: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# Generic tools
|
# Generic tools
|
||||||
age
|
age
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
{ pkgs, config, lib, inputs, user, ...}: {
|
{ pkgs, config, lib, inputs, user, ... }: {
|
||||||
options.firefox.enable = lib.mkEnableOption "Firefox";
|
options.firefox.enable = lib.mkEnableOption "Firefox";
|
||||||
|
|
||||||
config = lib.mkIf config.firefox.enable {
|
config =
|
||||||
programs.firefox = {
|
lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, config, ...}:
|
{ pkgs, lib, config, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let cfg = config.tmux.enable;
|
let cfg = config.tmux.enable;
|
||||||
in {
|
in {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ user, pkgs, ...}: {
|
{ user, pkgs, ... }: {
|
||||||
home.packages = with pkgs; [ fd ];
|
home.packages = with pkgs; [ fd ];
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,20 +1,11 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [ ./hardware-configuration.nix ];
|
||||||
[
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
# Bootloader stuff
|
# Bootloader stuff
|
||||||
boot.loader.systemd-boot = {
|
boot.loader.systemd-boot = { enable = true; };
|
||||||
enable = true;
|
boot.loader.efi = { canTouchEfiVariables = true; };
|
||||||
};
|
|
||||||
boot.loader.efi = {
|
|
||||||
canTouchEfiVariables = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
# Networking stuff
|
# Networking stuff
|
||||||
networking.hostName = "prismo"; # Define your hostname.
|
networking.hostName = "prismo"; # Define your hostname.
|
||||||
@ -37,9 +28,7 @@
|
|||||||
XDG_DATA_HOME = "$HOME/.local/share";
|
XDG_DATA_HOME = "$HOME/.local/share";
|
||||||
XDG_STATE_HOME = "$HOME/.local/state";
|
XDG_STATE_HOME = "$HOME/.local/state";
|
||||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
XDG_BIN_HOME = "$HOME/.local/bin";
|
||||||
PATH = [
|
PATH = [ "${XDG_BIN_HOME}" ];
|
||||||
"${XDG_BIN_HOME}"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable sudo
|
# Enable sudo
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ inputs, self, pks, ...}: {
|
{ inputs, self, pks, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
@ -4,30 +4,29 @@
|
|||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
boot.initrd.availableKernelModules =
|
||||||
|
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb";
|
device = "/dev/disk/by-uuid/91a0dbc4-426f-4b7b-a49e-063d1d0e59fb";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
|
boot.initrd.luks.devices."cryptroot".device =
|
||||||
|
"/dev/disk/by-uuid/f71b0ace-f38f-435f-a07a-007f9cfe4919";
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/AF2D-FAD0";
|
device = "/dev/disk/by-uuid/AF2D-FAD0";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; }
|
[{ device = "/dev/disk/by-uuid/67da36a8-69df-4541-88cd-cba7cbc40b4c"; }];
|
||||||
];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# 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
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
@ -38,5 +37,6 @@
|
|||||||
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode =
|
||||||
|
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1 @@
|
|||||||
{
|
{ imports = [ ./podman.nix ./fonts.nix ./users.nix ./services.nix ]; }
|
||||||
imports = [
|
|
||||||
./podman.nix
|
|
||||||
./fonts.nix
|
|
||||||
./users.nix
|
|
||||||
./services.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs; [ twemoji-color-font ];
|
environment.systemPackages = with pkgs; [ twemoji-color-font ];
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
fira-code
|
fira-code
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ...}:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ...}:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user