Format with alejandra

This commit is contained in:
blahai 2024-12-20 15:11:42 +02:00
parent 4771948682
commit e08f66d286
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
31 changed files with 398 additions and 278 deletions

View file

@ -434,11 +434,11 @@
"nixvim": "nixvim"
},
"locked": {
"lastModified": 1734646427,
"narHash": "sha256-+OxSwGt6O6qzGvUTAlZgLivHnYPlrZF2JybyTfdsOP0=",
"lastModified": 1734699281,
"narHash": "sha256-pjlbWc1bgrlk5amtIOFoj5g1pHAMOWKWoYlIok8NAIs=",
"ref": "refs/heads/main",
"rev": "6809b030bcdad17e2007a03b8ca5ccf772c072ed",
"revCount": 467,
"rev": "81db83c82f89b5db7095b2288e5d8fc21fd254d5",
"revCount": 469,
"type": "git",
"url": "ssh://git@github.com/blahai/haivim"
},

View file

@ -72,11 +72,17 @@
hyprland.url = "github:hyprwm/Hyprland";
zen-browser.url = "github:ch4og/zen-browser-flake";
};
outputs = { nixpkgs, nixpkgs-smol, chaotic, home-manager, disko, ... }@inputs:
let system = "x86_64-linux";
outputs = {
nixpkgs,
nixpkgs-smol,
chaotic,
home-manager,
disko,
...
} @ inputs: let
system = "x86_64-linux";
in {
nixosConfigurations = {
nyx = nixpkgs.lib.nixosSystem {
@ -103,8 +109,7 @@
# };
theia = nixpkgs.lib.nixosSystem {
modules =
[ ./hosts/theia/configuration.nix disko.nixosModules.disko ];
modules = [./hosts/theia/configuration.nix disko.nixosModules.disko];
};
epimetheus = nixpkgs.lib.nixosSystem {
@ -112,8 +117,7 @@
inherit inputs;
pkgs-smol = import nixpkgs-smol {inherit system;};
};
modules =
[ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ];
modules = [./hosts/epimetheus/configuration.nix disko.nixosModules.disko];
};
};
};

View file

@ -1,5 +1,11 @@
{ pkgs, pkgs-smol, lib, modulesPath, config, ... }: {
{
pkgs,
pkgs-smol,
lib,
modulesPath,
config,
...
}: {
imports = ["${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"];
boot = {
@ -30,7 +36,6 @@
dnf5 # Fedora
debootstrap # Debin and ubuntu
apt # Ubuntu
];
documentation = {
@ -92,10 +97,8 @@
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
];
};
};
hardware.enableRedistributableFirmware = true;
}

View file

@ -1,6 +1,4 @@
{ config, pkgs, pkgs-smol, inputs, system, lib, ... }:
{
{ config, pkgs, pkgs-smol, inputs, lib, ... }: {
imports = [
./hardware-configuration.nix
../../modules/nixos/default.nix
@ -84,7 +82,6 @@
};
gnome.gnome-keyring.enable = true;
};
hardware.pulseaudio.enable = false;
@ -131,7 +128,6 @@
TimeoutStopSec = 10;
};
};
};
programs = {
@ -248,7 +244,8 @@
lua-language-server
nil
nixd
nixfmt-classic
nix-output-monitor
alejandra
zip
nodejs
typescript
@ -274,7 +271,6 @@
imagemagick
wireguard-tools
mission-center
nix-output-monitor
speedcrunch
geogebra
];
@ -298,6 +294,11 @@
enableSSHSupport = true;
};
programs.localsend = {
enable = true;
openFirewall = true;
};
services.openssh = {
enable = true;
settings = {
@ -307,5 +308,4 @@
};
system.stateVersion = "24.05";
}

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "hid_generic" "uas" "sd_mod"];
@ -32,6 +36,18 @@
options = ["zfsutil"];
};
fileSystems."/var/lib/virt/images" = {
device = "zpool/virt/images";
fsType = "zfs";
options = ["zfsutil"];
};
fileSystems."/var/lib/virt/disks" = {
device = "zpool/virt/disks";
fsType = "zfs";
options = ["zfsutil"];
};
fileSystems."/mnt/zootfs/Storage" = {
device = "zootfs/Storage";
fsType = "zfs";
@ -73,6 +89,7 @@
# networking.useDHCP = lib.mkDefault true;
hardware.enableRedistributableFirmware = true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true;
}

View file

@ -1,4 +1,9 @@
{ inputs, config, pkgs, ... }: {
{
inputs,
config,
pkgs,
...
}: {
imports = [
../../modules/home-manager/default.nix
inputs.catppuccin.homeManagerModules.catppuccin
@ -45,7 +50,10 @@
gtk = {
enable = true;
};
catppuccin = {
gtk = {
enable = true;
flavor = "mocha";
accent = "pink";
@ -64,7 +72,10 @@
home.stateVersion = "24.11";
home.packages = with pkgs; [ obsidian ];
home.packages = with pkgs; [
obsidian
inputs.haivim.packages.${pkgs.system}.default
];
home.sessionVariables = {EDITOR = "nvim";};

View file

@ -1,4 +1,10 @@
{ config, modulesPath, lib, pkgs, ... }: {
{
config,
modulesPath,
lib,
pkgs,
...
}: {
system.stateVersion = "24.11";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
@ -61,10 +67,12 @@
options = ["fmask=0022" "dmask=0022"];
};
swapDevices = [{
swapDevices = [
{
device = "/var/lib/swapfile";
size = 16 * 1024;
}];
}
];
networking = {
enableIPv6 = false; # Had to disable for now due to problems with resolving
@ -93,15 +101,19 @@
interfaces = {
ens3 = {
ipv4 = {
addresses = [{
addresses = [
{
address = "178.63.118.252";
prefixLength = 32;
}];
}
];
routes = [{
routes = [
{
address = "178.63.247.183";
prefixLength = 32;
}];
}
];
};
};
};
@ -148,7 +160,6 @@
"--avoid '(^|/)(${avoid})'" # things that we want to avoid killing
"--prefer '(^|/)(${prefer})'" # things we want to remove fast
];
};
caddy = {
@ -227,8 +238,7 @@
use_default_settings = true;
server = {
port = 8888;
secret_key =
"7360d3df7c08ce681cf6d5122e3e182de2c5205e962766abd3e6dfc8dec1b683";
secret_key = "7360d3df7c08ce681cf6d5122e3e182de2c5205e962766abd3e6dfc8dec1b683";
};
ui = {infinite_scroll = true;};
@ -268,8 +278,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPbmiNqoyeKXk/VopFm2cFfEnV4cKCFBhbhyYB69Fuu"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILLqPq70t6RbnI8UejEshYcfBP66I4OrLFjvGLLfIEXD"
];
initialHashedPassword =
"$y$j9T$TzqbL4iMGLjli6EEXfRCZ0$AhFJ4iCFxRlstth5owic3M5nq74Sp1qhtctjSBcgAl8";
initialHashedPassword = "$y$j9T$TzqbL4iMGLjli6EEXfRCZ0$AhFJ4iCFxRlstth5owic3M5nq74Sp1qhtctjSBcgAl8";
};
users.users.pingu = {
@ -279,8 +288,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPbmiNqoyeKXk/VopFm2cFfEnV4cKCFBhbhyYB69Fuu"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILLqPq70t6RbnI8UejEshYcfBP66I4OrLFjvGLLfIEXD"
];
initialHashedPassword =
"$y$j9T$cxwKGmzYyC1eLeIysr8r/.$dsxxxV4NvXY.Wpd9LO.RiuMQuy2lYyy2HGrk52BJX08";
initialHashedPassword = "$y$j9T$cxwKGmzYyC1eLeIysr8r/.$dsxxxV4NvXY.Wpd9LO.RiuMQuy2lYyy2HGrk52BJX08";
};
users.users.minecraft = {
@ -295,10 +303,8 @@
openjdk21
openjdk17
screen
];
initialHashedPassword =
"$y$j9T$KpQYYLB6eWfHAUo9.o/uy1$gnj/UlWLrx5XBZDm2GNdjHs2G5D3XxxqqtrCIf5MX43";
initialHashedPassword = "$y$j9T$KpQYYLB6eWfHAUo9.o/uy1$gnj/UlWLrx5XBZDm2GNdjHs2G5D3XxxqqtrCIf5MX43";
};
environment.systemPackages = with pkgs; [

View file

@ -1,5 +1,4 @@
{ lib, ... }:
{
{lib, ...}: {
disko.devices = {
disk.disk1 = {
device = lib.mkDefault "/dev/vda";

View file

@ -1,4 +1,9 @@
{ inputs, pkgs, lib, ... }: {
{
inputs,
pkgs,
lib,
...
}: {
# add the home manager module
imports = [inputs.ags.homeManagerModules.default];

View file

@ -1,5 +1,9 @@
{ pkgs, lib, config, ... } :
{
pkgs,
lib,
config,
...
}: {
programs.alacritty = {
enable = true;

View file

@ -1,4 +1,9 @@
{ pkgs, lib, config, ... }: {
{
pkgs,
lib,
config,
...
}: {
home.file."Pictures/gay.png".source = ./gay.png;
programs.fastfetch = {
enable = true;

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
{
config,
lib,
pkgs,
...
}: {
home.packages = with pkgs; [
neofetch
];
@ -80,7 +85,6 @@
mkcd = ''
mkdir -p -- $argv[1] && cd $argv; or return $status
'';
};
};

View file

@ -1,4 +1,9 @@
{ pkgs, lib, config, ... }: {
{
pkgs,
lib,
config,
...
}: {
programs.foot = {
enable = true;
settings = {

View file

@ -1,5 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}: {
programs.starship = {
enable = true;
enableFishIntegration = true;

View file

@ -1,5 +1,10 @@
{ inputs, pkgs, lib, config, ... }:
{
inputs,
pkgs,
lib,
config,
...
}: {
home.packages = with pkgs; [
inputs.wezterm.packages.${pkgs.system}.default
];

View file

@ -1,5 +1,10 @@
{ pkgs, config, inputs, lib, ... }: {
{
pkgs,
config,
inputs,
lib,
...
}: {
imports = [
./hyprland/rules.nix
./hyprland/keybinds.nix
@ -35,7 +40,6 @@
package = inputs.hyprland.packages."${pkgs.system}".hyprland;
settings = {
monitor = [
",prefered,auto,1"
];
@ -159,9 +163,6 @@
initial_workspace_tracking = false;
};
};
};
}

View file

@ -1,4 +1,9 @@
{ pkgs, config, inputs, ... }: {
{
pkgs,
config,
inputs,
...
}: {
wayland.windowManager.hyprland.settings = {
exec-once = [
"${pkgs.swww}/bin/swww-daemon --format xrgb"

View file

@ -1,6 +1,10 @@
{ pkgs, config, inputs, ... }: {
{
pkgs,
config,
inputs,
...
}: {
wayland.windowManager.hyprland.settings = {
bindle = [
",XF86AudioMute, exec, playerctl --player=spotify,%any play-pause"
",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
@ -11,12 +15,14 @@
bindn = [" , up, pass, JKPS"];
binde = [ # Window split ratio
binde = [
# Window split ratio
"Super, Semicolon, splitratio, -0.1"
"Super, Apostrophe, splitratio, 0.1"
];
bind = [
bind =
[
"Super, mouse_up, workspace, +1"
"Super, mouse_down, workspace, -1"
"Super, Page_up, workspace, -1"
@ -59,14 +65,20 @@
# Fullscreen
"Super+Shift, F, fullscreen, 0"
] ++ map (n:
"Alt, ${toString n}, movetoworkspacesilent, ${
toString (if n == 0 then 10 else n)
}") [ 1 2 3 4 5 6 7 8 9 0 ] ++ map (n:
"Super, ${toString n}, workspace, ${
toString (if n == 0 then 10 else n)
]
++ map (n: "Alt, ${toString n}, movetoworkspacesilent, ${
toString (
if n == 0
then 10
else n
)
}") [1 2 3 4 5 6 7 8 9 0]
++ map (n: "Super, ${toString n}, workspace, ${
toString (
if n == 0
then 10
else n
)
}") [1 2 3 4 5 6 7 8 9 0];
};
}

View file

@ -1,7 +1,11 @@
{ pkgs, config, inputs, lib, ... }:
{
pkgs,
config,
inputs,
lib,
...
}: {
wayland.windowManager.hyprland.settings = {
workspace = [
"special:special, on-created-empty:exec spotify"
];
@ -22,7 +26,6 @@
];
windowrulev2 = [
];
layerrule = [
@ -73,6 +76,5 @@
"blur, osk"
"ignorealpha 0.20, osk"
];
};
}

View file

@ -1,5 +1,4 @@
{config, ...}: {
programs.hyprlock = {
enable = true;
settings = {
@ -12,7 +11,8 @@
backgruond = {color = "rgba(000000FF)";};
input-field = [{
input-field = [
{
monitor = "";
size = "250, 50";
outline_thickness = 2;
@ -25,10 +25,12 @@
position = "0, 20";
halign = "center";
valign = "center";
}];
}
];
label = [
{ # Clock
{
# Clock
monitor = "";
text = "$TIME";
shadow_passes = 1;
@ -40,7 +42,8 @@
position = "0, 300";
}
{ # Greeting
{
# Greeting
monitor = "";
text = "Hi $USER !!!";
shadow_passes = 1;
@ -54,7 +57,8 @@
valign = "center";
}
{ # lock icon
{
# lock icon
monitor = "";
text = "lock";
shadow_passes = 1;
@ -68,7 +72,8 @@
valign = "center";
}
{ # "locked" text
{
# "locked" text
monitor = "";
text = "locked";
shadow_passes = 1;
@ -91,7 +96,6 @@
# font_family = "Rubik Light";
#}
];
};
};
}

View file

@ -1,21 +1,24 @@
{ pkgs, lib, config, inputs, ... }: {
{
pkgs,
lib,
config,
inputs,
...
}: {
imports = [
inputs.spicetify-nix.homeManagerModules.default
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"spotify"
];
programs.spicetify =
let
programs.spicetify = let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in
{
in {
enable = true;
enabledExtensions = with spicePkgs.extensions; [
hidePodcasts
];
theme = spicePkgs.themes.comfy;

View file

@ -1,5 +1,4 @@
{ inputs, ... }:
{
{inputs, ...}: {
imports = [inputs.catppuccin.nixosModules.catppuccin];
config.catppuccin = {

View file

@ -1,5 +1,9 @@
{ config, pkgs, inputs, ... }: {
{
config,
pkgs,
inputs,
...
}: {
nixpkgs = {
overlays = [inputs.nur.overlays.default];
config = {allowUnfree = true;};

View file

@ -1,4 +1,8 @@
{ pkgs, config, ... }: {
{
pkgs,
config,
...
}: {
hardware.bluetooth = {
enable = true;
settings = {General = {Experimental = true;};};

View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./pipewire.nix
./tailscale.nix

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
{
config,
lib,
pkgs,
...
}: {
services = {
pipewire = {
enable = true;
@ -17,10 +22,12 @@
};
};
pipewire-pulse."92-low-latency" = {
"context.properties" = [{
"context.properties" = [
{
name = "libpipewire-module-protocol-pulse";
args = {};
}];
}
];
"pulse.properties" = {
"pulse.min.req" = "32/48000";
"pulse.default.req" = "32/48000";

View file

@ -1,5 +1,10 @@
{ pkgs, lib, config, ... }:
let enableIOMMU = true;
{
pkgs,
lib,
config,
...
}: let
enableIOMMU = true;
in {
boot = lib.mkIf enableIOMMU {
initrd.kernelModules = lib.mkBefore [
@ -40,8 +45,7 @@ in {
programs = {virt-manager = {enable = true;};};
users.users.pingu.extraGroups =
[ "qemu-libvirtd" "libvirtd" "disk" "kvm" "docker" ];
users.users.pingu.extraGroups = ["qemu-libvirtd" "libvirtd" "disk" "kvm" "docker"];
environment.systemPackages = with pkgs; [
python3 # scripts, cba to use nix shell all the time

View file

@ -1,4 +1,8 @@
{ inputs, config, ... }: {
{
inputs,
config,
...
}: {
imports = [inputs.sops-nix.nixosModules.sops];
sops = {