Format nix files

This commit is contained in:
Zeph Levy 2026-01-23 12:04:59 +01:00
parent 45b85d0452
commit f2fd2be328
30 changed files with 329 additions and 231 deletions

View file

@ -14,7 +14,13 @@
}; };
outputs = outputs =
{ nixpkgs, nixpkgs-stable, home-manager, nixos-hardware, ... }: {
nixpkgs,
nixpkgs-stable,
home-manager,
nixos-hardware,
...
}:
let let
system = "x86_64-linux"; system = "x86_64-linux";
in in

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
imports = [ imports = [
./modules/bundle.nix ./modules/bundle.nix
]; ];

View file

@ -1,4 +1,5 @@
{ config, pkgs, ...}: { { config, pkgs, ... }:
{
# This is to launch fish interactively, to avoid problems # This is to launch fish interactively, to avoid problems
# with fish's non-POSIX compliance # with fish's non-POSIX compliance
programs.bash = { programs.bash = {
@ -10,5 +11,5 @@
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi fi
''; '';
}; };
} }

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
# This file contains all the desktop entries that I don't want in my app finder, # This file contains all the desktop entries that I don't want in my app finder,
# either because I open them with shortcuts or because I never use them (but they come with an app) # either because I open them with shortcuts or because I never use them (but they come with an app)
xdg.desktopEntries = { xdg.desktopEntries = {
@ -38,7 +39,6 @@
terminal = false; terminal = false;
}; };
# Fixes missing icons # Fixes missing icons
# TODO: Doesn't work # TODO: Doesn't work
# "protonvpn-app" = { # "protonvpn-app" = {
@ -49,5 +49,5 @@
# name = "Sioyek"; # name = "Sioyek";
# icon = "${pkgs.sioyek}/share/pixmaps/sioyek-linux-logo.png"; # icon = "${pkgs.sioyek}/share/pixmaps/sioyek-linux-logo.png";
# }; # };
}; };
} }

View file

@ -1,11 +1,16 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = '' interactiveShellInit = ''
set fish_greeting set fish_greeting
starship init fish | source starship init fish | source
''; '';
shellAliases = let flakeDir = "~/nix"; in { shellAliases =
let
flakeDir = "~/nix";
in
{
rb = "sudo nixos-rebuild switch --flake ${flakeDir}"; rb = "sudo nixos-rebuild switch --flake ${flakeDir}";
upg = "sudo nix flake update --flake ${flakeDir} && sudo nixos-rebuild switch --flake ${flakeDir}"; upg = "sudo nix flake update --flake ${flakeDir} && sudo nixos-rebuild switch --flake ${flakeDir}";
hms = "home-manager switch --flake ${flakeDir}"; hms = "home-manager switch --flake ${flakeDir}";

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.foot.enable = true; programs.foot.enable = true;
programs.foot.settings = { programs.foot.settings = {
main = { main = {
@ -10,24 +11,24 @@
alpha = 0.85; alpha = 0.85;
# Gruvbox; copied from https://codeberg.org/dnkl/foot/src/branch/master/themes/gruvbox-dark # Gruvbox; copied from https://codeberg.org/dnkl/foot/src/branch/master/themes/gruvbox-dark
background="282828"; background = "282828";
foreground="ebdbb2"; foreground = "ebdbb2";
regular0="282828"; regular0 = "282828";
regular1="cc241d"; regular1 = "cc241d";
regular2="98971a"; regular2 = "98971a";
regular3="d79921"; regular3 = "d79921";
regular4="458588"; regular4 = "458588";
regular5="b16286"; regular5 = "b16286";
regular6="689d6a"; regular6 = "689d6a";
regular7="a89984"; regular7 = "a89984";
bright0="928374"; bright0 = "928374";
bright1="fb4934"; bright1 = "fb4934";
bright2="b8bb26"; bright2 = "b8bb26";
bright3="fabd2f"; bright3 = "fabd2f";
bright4="83a598"; bright4 = "83a598";
bright5="d3869b"; bright5 = "d3869b";
bright6="8ec07c"; bright6 = "8ec07c";
bright7="ebdbb2"; bright7 = "ebdbb2";
}; };
}; };
} }

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.fuzzel.enable = true; programs.fuzzel.enable = true;
programs.fuzzel.settings = { programs.fuzzel.settings = {
main = { main = {

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.git = { programs.git = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,5 @@
{ config, pkgs, ...}: { { config, pkgs, ... }:
{
programs.helix.enable = true; programs.helix.enable = true;
programs.helix.settings = { programs.helix.settings = {
# theme = "everforest_dark"; # theme = "everforest_dark";
@ -40,8 +41,17 @@
}; };
statusline = { statusline = {
left = [ "mode" "spinner" "diagnostics" ]; left = [
center = [ "file-name" "separator" "version-control" "separator"]; "mode"
"spinner"
"diagnostics"
];
center = [
"file-name"
"separator"
"version-control"
"separator"
];
separator = ""; separator = "";
mode.normal = "NORMAL"; mode.normal = "NORMAL";
mode.insert = "INSERT"; mode.insert = "INSERT";
@ -62,7 +72,10 @@
keys = { keys = {
normal = { normal = {
l = "insert_mode"; l = "insert_mode";
esc = ["collapse_selection" "keep_primary_selection"]; esc = [
"collapse_selection"
"keep_primary_selection"
];
n = "move_char_left"; n = "move_char_left";
o = "move_char_right"; o = "move_char_right";
e = "move_line_down"; e = "move_line_down";

View file

@ -1,3 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
home.file.".icons/default".source = "${pkgs.capitaine-cursors}/share/icons/\"Capitaine Cursors (Gruvbox)\""; {
home.file.".icons/default".source =
"${pkgs.capitaine-cursors}/share/icons/\"Capitaine Cursors (Gruvbox)\"";
} }

View file

@ -1,9 +1,11 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
exec-once = [ exec-once = [
"hyprpaper" "systemctl --user start hyprpolkitagent" "hyprpaper"
"systemctl --user start hyprpolkitagent"
"hyprctl setcursor \"Capitaine Cursors (Gruvbox)\" 24" "hyprctl setcursor \"Capitaine Cursors (Gruvbox)\" 24"
"swayosd-server" "swayosd-server"
"hyprsunset" "hyprsunset"
@ -87,7 +89,6 @@
preserve_split = true; preserve_split = true;
}; };
misc = { misc = {
force_default_wallpaper = 0; force_default_wallpaper = 0;
disable_hyprland_logo = false; disable_hyprland_logo = false;
@ -139,7 +140,6 @@
"$mainMod SHIFT, M, layoutmsg, swapnext" "$mainMod SHIFT, M, layoutmsg, swapnext"
"$mainMod SHIFT, K, layoutmsg, swapprev" "$mainMod SHIFT, K, layoutmsg, swapprev"
"$mainMod, 1, workspace, 1" "$mainMod, 1, workspace, 1"
"$mainMod, 2, workspace, 2" "$mainMod, 2, workspace, 2"
"$mainMod, 3, workspace, 3" "$mainMod, 3, workspace, 3"
@ -158,7 +158,6 @@
"$mainMod SHIFT, 3, movetoworkspace, 3" "$mainMod SHIFT, 3, movetoworkspace, 3"
"$mainMod SHIFT, 4, movetoworkspace, 4" "$mainMod SHIFT, 4, movetoworkspace, 4"
]; ];
bindel = [ bindel = [
@ -177,7 +176,6 @@
", XF86AudioPrev, exec, playerctl previous" ", XF86AudioPrev, exec, playerctl previous"
]; ];
# windowrule = [ # windowrule = [
# "suppressevent maximize, class:.*" # "suppressevent maximize, class:.*"
# "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" # "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
services.hyprpaper.enable = true; services.hyprpaper.enable = true;
services.hyprpaper.settings = { services.hyprpaper.settings = {
wallpaper = [ wallpaper = [

View file

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.waybar = { programs.waybar = {
enable = true; enable = true;
settings = { settings = {
@ -9,7 +10,12 @@
modules-left = [ "hyprland/workspaces" ]; modules-left = [ "hyprland/workspaces" ];
modules-center = [ "clock" ]; modules-center = [ "clock" ];
modules-right = [ "cpu" "memory" "temperature" "battery" ]; modules-right = [
"cpu"
"memory"
"temperature"
"battery"
];
"hyprland/workspaces" = { "hyprland/workspaces" = {
disable-scroll = true; disable-scroll = true;
@ -32,13 +38,30 @@
interval = 1; interval = 1;
}; };
"cpu" = { format = " {usage: >3}%"; }; "cpu" = {
"memory" = { format = " {used:0.1f}G"; tooltip = false; }; format = " {usage: >3}%";
"temperature" = { format = " {temperatureC}°C"; tooltip = false; }; };
"memory" = {
format = " {used:0.1f}G";
tooltip = false;
};
"temperature" = {
format = " {temperatureC}°C";
tooltip = false;
};
"battery" = { "battery" = {
states = { warning = 30; critical = 15; }; states = {
warning = 30;
critical = 15;
};
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-icons = [ "" "" "" "" "" ]; format-icons = [
""
""
""
""
""
];
}; };
}; };
}; };
@ -112,4 +135,3 @@
''; '';
}; };
} }

View file

@ -40,4 +40,3 @@
''; '';
}; };
} }

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
programs.starship = { programs.starship = {
enable = true; enable = true;
@ -109,7 +115,9 @@
format = "[[ $time ](fg:color_fg0 bg:color_bg1)]($style)"; format = "[[ $time ](fg:color_fg0 bg:color_bg1)]($style)";
}; };
line_break = { disabled = false; }; line_break = {
disabled = false;
};
character = { character = {
disabled = false; disabled = false;
@ -123,5 +131,4 @@
}; };
}; };
} }

View file

@ -2,11 +2,16 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./pkgs.nix ./pkgs.nix
./fonts.nix ./fonts.nix
@ -26,14 +31,12 @@
time.timeZone = "Europe/Paris"; time.timeZone = "Europe/Paris";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
keyMap = "mod-dh-iso-us"; keyMap = "mod-dh-iso-us";
}; };
# I need to figure out how this works # I need to figure out how this works
# services.printing.enable = true; # services.printing.enable = true;
@ -57,8 +60,10 @@
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
system.stateVersion = "25.05"; system.stateVersion = "25.05";
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerd-fonts.iosevka-term nerd-fonts.iosevka-term
nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono

View file

@ -1,29 +1,47 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ 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 = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; "nvme"
"xhci_pci"
"thunderbolt"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [
"dm-snapshot"
"cryptd"
];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-label/NixOS-Root"; device = "/dev/disk/by-label/NixOS-Root";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NixOS-Encrypted"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NixOS-Encrypted";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-label/NixOS-Boot"; device = "/dev/disk/by-label/NixOS-Boot";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
swapDevices = [ swapDevices = [

View file

@ -1,5 +1,5 @@
{ {
services.udev.extraRules = '' services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="amdgpu_bl1", GROUP="video", MODE="0660" ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="amdgpu_bl1", GROUP="video", MODE="0660"
''; '';
} }

View file

@ -13,4 +13,3 @@
./lidswitch.nix ./lidswitch.nix
]; ];
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.foot = { programs.foot = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
# For libsecret # For libsecret
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.login.enableGnomeKeyring = true; security.pam.services.login.enableGnomeKeyring = true;

View file

@ -1,5 +1,5 @@
{ pkgs, ...}: { { pkgs, ... }:
{
programs.hyprland.enable = true; programs.hyprland.enable = true;
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.keyd.enable = true; services.keyd.enable = true;
services.keyd.keyboards = { services.keyd.keyboards = {

View file

@ -1,3 +1,4 @@
{ lib, pkgs, ... }: { { lib, pkgs, ... }:
{
programs.steam.enable = true; programs.steam.enable = true;
} }

View file

@ -1,4 +1,5 @@
{ pkgs, ...} : { { pkgs, ... }:
{
programs.fish.enable = true; programs.fish.enable = true;
documentation.man.generateCaches = false; documentation.man.generateCaches = false;
@ -9,7 +10,9 @@
enable = true; enable = true;
dockerCompat = true; dockerCompat = true;
defaultNetwork.settings = { dns_enabled = true; }; defaultNetwork.settings = {
dns_enabled = true;
};
}; };
}; };
services.flatpak.enable = true; services.flatpak.enable = true;
@ -21,7 +24,6 @@
''; '';
}; };
users = { users = {
defaultUserShell = pkgs.bash; defaultUserShell = pkgs.bash;
users.zeph = { users.zeph = {
@ -33,7 +35,7 @@
"kvm" "kvm"
"docker" "docker"
]; ];
packages = with pkgs; []; packages = with pkgs; [ ];
}; };
}; };
services.fwupd.enable = true; services.fwupd.enable = true;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.xserver = { services.xserver = {
enable = true; enable = true;
desktopManager.xfce.enable = true; desktopManager.xfce.enable = true;

View file

@ -1,5 +1,13 @@
{ pkgs, pkgs-stable, lib, config, ... }: { {
environment.systemPackages = (with pkgs; [ pkgs,
pkgs-stable,
lib,
config,
...
}:
{
environment.systemPackages =
(with pkgs; [
# Editors # Editors
helix helix
vim vim
@ -27,7 +35,6 @@
jdk17 jdk17
android-studio android-studio
# Rust toolchain # Rust toolchain
cargo cargo
cargo-cache cargo-cache
@ -90,5 +97,3 @@
android_sdk.accept_license = true; android_sdk.accept_license = true;
}; };
} }