Improve the formatting

This commit is contained in:
SebastianStork 2024-04-20 19:00:09 +02:00
parent 62f4103c7a
commit 692ef91ba9
14 changed files with 107 additions and 40 deletions

View file

@ -4,10 +4,16 @@
system.stateVersion = "23.11"; system.stateVersion = "23.11";
nix.settings = { nix.settings = {
experimental-features = ["nix-command" "flakes"]; experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true; auto-optimise-store = true;
warn-dirty = false; warn-dirty = false;
trusted-users = ["root" "@wheel"]; trusted-users = [
"root"
"@wheel"
];
substituters = ["https://hyprland.cachix.org"]; substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];

View file

@ -11,8 +11,18 @@
]; ];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; boot.initrd.availableKernelModules = [
boot.kernelModules = ["kvm-amd" "adm1021" "nct6775"]; "xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.kernelModules = [
"kvm-amd"
"adm1021"
"nct6775"
];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
@ -40,7 +50,10 @@
settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk="; settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk=";
persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME="; persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME=";
patches = [rcu_patch linux_6_8_patch]; patches = [
rcu_patch
linux_6_8_patch
];
}; };
}; };

View file

@ -9,12 +9,16 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ swapDevices = [{device = "/dev/disk/by-uuid/1eba93d1-4853-4534-8cfd-5c14e29c6ff6";}];
{device = "/dev/disk/by-uuid/1eba93d1-4853-4534-8cfd-5c14e29c6ff6";}
];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;

View file

@ -2,7 +2,6 @@
imports = [ imports = [
./qtile.nix ./qtile.nix
./hyprland ./hyprland
./theming.nix ./theming.nix
./rofi ./rofi
./tray.nix ./tray.nix

View file

@ -22,15 +22,14 @@ in {
Unit = { Unit = {
Description = "Syncthingtray"; Description = "Syncthingtray";
Requires = ["tray.target"]; Requires = ["tray.target"];
After = ["graphical-session-pre.target" "tray.target"]; After = [
"graphical-session-pre.target"
"tray.target"
];
PartOf = ["graphical-session.target"]; PartOf = ["graphical-session.target"];
}; };
Service = { Service.ExecStart = "${lib.getExe' pkgs.syncthingtray-minimal "syncthingtray"} --wait";
ExecStart = "${lib.getExe' pkgs.syncthingtray-minimal "syncthingtray"} --wait"; Install.WantedBy = ["graphical-session.target"];
};
Install = {
WantedBy = ["graphical-session.target"];
};
}; };
}; };
}) })
@ -43,15 +42,14 @@ in {
Unit = { Unit = {
Description = "Networkmanager-applet"; Description = "Networkmanager-applet";
Requires = ["tray.target"]; Requires = ["tray.target"];
After = ["graphical-session-pre.target" "tray.target"]; After = [
"graphical-session-pre.target"
"tray.target"
];
PartOf = ["graphical-session.target"]; PartOf = ["graphical-session.target"];
}; };
Service = { Service.ExecStart = "${lib.getExe pkgs.networkmanagerapplet}";
ExecStart = "${lib.getExe pkgs.networkmanagerapplet}"; Install.WantedBy = ["graphical-session.target"];
};
Install = {
WantedBy = ["graphical-session.target"];
};
}; };
}; };
}) })

View file

@ -19,7 +19,13 @@
modules-left = ["clock"]; modules-left = ["clock"];
modules-center = ["hyprland/workspaces"]; modules-center = ["hyprland/workspaces"];
modules-right = ["tray" "network" "wireplumber" "backlight" "battery"]; modules-right = [
"tray"
"network"
"wireplumber"
"backlight"
"battery"
];
"hyprland/workspaces" = { "hyprland/workspaces" = {
active-only = false; active-only = false;
@ -36,7 +42,12 @@
format = ""; format = "";
format-wifi = "{icon}"; format-wifi = "{icon}";
format-icons = ["󰤟" "󰤢" "󰤥" "󰤨"]; format-icons = [
"󰤟"
"󰤢"
"󰤥"
"󰤨"
];
tooltip-format-wifi = "{essid} 󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}"; tooltip-format-wifi = "{essid} 󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}";
format-ethernet = "󰌗"; format-ethernet = "󰌗";
@ -49,7 +60,11 @@
wireplumber = { wireplumber = {
format = "{icon} {volume}%"; format = "{icon} {volume}%";
format-muted = "󰝟"; format-muted = "󰝟";
format-icons = ["󰕿" "󰖀" "󰕾"]; format-icons = [
"󰕿"
"󰖀"
"󰕾"
];
scroll-step = "5"; scroll-step = "5";
}; };
@ -61,7 +76,11 @@
backlight = { backlight = {
device = "amdgpu_bl1"; device = "amdgpu_bl1";
format = "{icon} {percent}%"; format = "{icon} {percent}%";
format-icons = ["󰃞" "󰃟" "󰃠"]; format-icons = [
"󰃞"
"󰃟"
"󰃠"
];
}; };
battery = { battery = {
@ -70,7 +89,19 @@
critical = 5; critical = 5;
}; };
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; format-icons = [
"󰂎"
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
}; };
}; };
}; };

View file

@ -12,9 +12,7 @@
userName = "SebastianStork"; userName = "SebastianStork";
userEmail = "sebastian.stork@pm.me"; userEmail = "sebastian.stork@pm.me";
extraConfig = { extraConfig.init.defaultBranch = "main";
init.defaultBranch = "main";
};
}; };
programs.lazygit.enable = true; programs.lazygit.enable = true;

View file

@ -19,7 +19,6 @@ in {
config = { config = {
programs.bash.enable = cfg.bash.enable; programs.bash.enable = cfg.bash.enable;
programs.zsh.enable = cfg.zsh.enable; programs.zsh.enable = cfg.zsh.enable;
}; };
} }

View file

@ -16,6 +16,7 @@
identityFile = ["~/.ssh/kluebero/id_ed25519"]; identityFile = ["~/.ssh/kluebero/id_ed25519"];
}; };
}; };
services.ssh-agent.enable = true; services.ssh-agent.enable = true;
}; };
} }

View file

@ -25,7 +25,12 @@
(lib.mkIf config.myConfig.boot-loader.silent { (lib.mkIf config.myConfig.boot-loader.silent {
boot = { boot = {
kernelParams = ["quiet" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3"]; kernelParams = [
"quiet"
"rd.systemd.show_status=false"
"rd.udev.log_level=3"
"udev.log_priority=3"
];
consoleLogLevel = 3; consoleLogLevel = 3;
initrd.verbose = false; initrd.verbose = false;
initrd.systemd.enable = true; initrd.systemd.enable = true;

View file

@ -23,7 +23,10 @@
}; };
folders = let folders = let
allDevices = ["seb-desktop" "seb-laptop"]; allDevices = [
"seb-desktop"
"seb-laptop"
];
staggeredVersioning = { staggeredVersioning = {
type = "staggered"; type = "staggered";
params = { params = {

View file

@ -31,7 +31,7 @@
key-mgmt = "wpa-psk"; key-mgmt = "wpa-psk";
psk = "$HOME_PSK"; psk = "$HOME_PSK";
}; };
ipv4 = {method = "auto";}; ipv4.method = "auto";
ipv6 = { ipv6 = {
addr-gen-mode = "default"; addr-gen-mode = "default";
method = "auto"; method = "auto";
@ -54,7 +54,7 @@
key-mgmt = "wpa-psk"; key-mgmt = "wpa-psk";
psk = "$MOBILE_PSK"; psk = "$MOBILE_PSK";
}; };
ipv4 = {method = "auto";}; ipv4.method = "auto";
ipv6 = { ipv6 = {
addr-gen-mode = "default"; addr-gen-mode = "default";
method = "auto"; method = "auto";
@ -83,7 +83,7 @@
password = "$SCHOOL_PSK"; password = "$SCHOOL_PSK";
phase2-auth = "pap"; phase2-auth = "pap";
}; };
ipv4 = {method = "auto";}; ipv4.method = "auto";
ipv6 = { ipv6 = {
addr-gen-mode = "default"; addr-gen-mode = "default";
method = "auto"; method = "auto";

View file

@ -7,7 +7,12 @@
isNormalUser = true; isNormalUser = true;
description = "Sebastian Stork"; description = "Sebastian Stork";
hashedPasswordFile = config.sops.secrets.seb-password.path; hashedPasswordFile = config.sops.secrets.seb-password.path;
extraGroups = ["wheel" "networkmanager" "libvirtd" "video"]; extraGroups = [
"wheel"
"networkmanager"
"libvirtd"
"video"
];
}; };
home-manager.users.seb = ./home.nix; home-manager.users.seb = ./home.nix;

View file

@ -53,7 +53,12 @@
pkgs.vlc pkgs.vlc
pkgs.onlyoffice-bin_latest pkgs.onlyoffice-bin_latest
(pkgs.nerdfonts.override {fonts = ["JetBrainsMono" "NerdFontsSymbolsOnly"];}) (pkgs.nerdfonts.override {
fonts = [
"JetBrainsMono"
"NerdFontsSymbolsOnly"
];
})
pkgs.corefonts pkgs.corefonts
pkgs.roboto pkgs.roboto
pkgs.open-sans pkgs.open-sans