chore: format code with alejandra
This commit is contained in:
parent
5576fba883
commit
144c46a984
13 changed files with 164 additions and 131 deletions
18
common.nix
18
common.nix
|
|
@ -1,5 +1,8 @@
|
|||
{ pkgs, pkgs-unstable, ... }:
|
||||
{
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
...
|
||||
}: {
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
|
@ -129,14 +132,18 @@
|
|||
tailscale
|
||||
wluma
|
||||
# man pages
|
||||
man-pages man-pages-posix
|
||||
man-pages
|
||||
man-pages-posix
|
||||
# kde
|
||||
kdePackages.kate kdePackages.plasma-workspace kdePackages.dolphin
|
||||
kdePackages.kate
|
||||
kdePackages.plasma-workspace
|
||||
kdePackages.dolphin
|
||||
# fix kde apps having no icons
|
||||
kdePackages.qtsvg
|
||||
thunderbird-128
|
||||
# for screen sharing
|
||||
xdg-desktop-portal xdg-desktop-portal-kde
|
||||
xdg-desktop-portal
|
||||
xdg-desktop-portal-kde
|
||||
];
|
||||
|
||||
# set user environment variables
|
||||
|
|
@ -226,7 +233,8 @@
|
|||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
|
||||
};
|
||||
hardware.opengl = { # hardware.graphics in unstable
|
||||
hardware.opengl = {
|
||||
# hardware.graphics in unstable
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
|
|
|
|||
16
flake.nix
16
flake.nix
|
|
@ -36,17 +36,14 @@
|
|||
outputs = {
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
|
||||
home-manager,
|
||||
stylix,
|
||||
|
||||
nixvim,
|
||||
river-shifttags,
|
||||
breezex-cursor,
|
||||
|
||||
nixos-06cb-009a-fingerprint-sensor,
|
||||
... }:
|
||||
let
|
||||
...
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
home-manager-args = {
|
||||
nixvim = nixvim.packages.${system}.default;
|
||||
|
|
@ -54,14 +51,14 @@
|
|||
breezex-cursor = breezex-cursor.packages.${system}.default;
|
||||
kitty-unstable = nixpkgs-unstable.legacyPackages.${system}.kitty;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
nixosConfigurations.void = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./void.nix
|
||||
|
||||
home-manager.nixosModules.home-manager {
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
|
|
@ -82,7 +79,8 @@
|
|||
modules = [
|
||||
./t470.nix
|
||||
|
||||
home-manager.nixosModules.home-manager {
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"];
|
||||
|
|
@ -13,13 +16,13 @@
|
|||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/25f87dfd-b7bb-475a-ab05-732a5e2026d9";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/25f87dfd-b7bb-475a-ab05-732a5e2026d9";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/929D-FA32";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/929D-FA32";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
|
||||
|
|
@ -13,18 +17,18 @@
|
|||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/29ecd09f-8852-4582-a78a-ec1aa1e7b2b9";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/29ecd09f-8852-4582-a78a-ec1aa1e7b2b9";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/pile" =
|
||||
{ device = "/dev/disk/by-uuid/51ff5791-f197-4dfd-850a-00a8726ddb31";
|
||||
fileSystems."/pile" = {
|
||||
device = "/dev/disk/by-uuid/51ff5791-f197-4dfd-850a-00a8726ddb31";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/E135-9F42";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/E135-9F42";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
|
|
|||
35
home.nix
35
home.nix
|
|
@ -1,4 +1,10 @@
|
|||
{ pkgs, nixvim, river-shifttags, kitty-unstable, ... }: let
|
||||
{
|
||||
pkgs,
|
||||
nixvim,
|
||||
river-shifttags,
|
||||
kitty-unstable,
|
||||
...
|
||||
}: let
|
||||
username = "khais";
|
||||
in {
|
||||
imports = [
|
||||
|
|
@ -9,7 +15,15 @@ in {
|
|||
home = {
|
||||
packages = with pkgs; [
|
||||
# system tools & bragging
|
||||
htop neofetch ripgrep usbutils wget curl ncdu trashy unzip
|
||||
htop
|
||||
neofetch
|
||||
ripgrep
|
||||
usbutils
|
||||
wget
|
||||
curl
|
||||
ncdu
|
||||
trashy
|
||||
unzip
|
||||
# remote working
|
||||
remmina
|
||||
# communication
|
||||
|
|
@ -22,13 +36,18 @@ in {
|
|||
# https://superuser.com/a/1803183
|
||||
wl-clipboard
|
||||
# wm river utils
|
||||
playerctl brightnessctl river-shifttags wlr-randr
|
||||
playerctl
|
||||
brightnessctl
|
||||
river-shifttags
|
||||
wlr-randr
|
||||
# dev tools
|
||||
gitu lnav
|
||||
gitu
|
||||
lnav
|
||||
# music
|
||||
cmus
|
||||
# music collection tools
|
||||
picard kid3
|
||||
picard
|
||||
kid3
|
||||
# audio
|
||||
audacity
|
||||
# video
|
||||
|
|
@ -36,14 +55,16 @@ in {
|
|||
# file sending
|
||||
magic-wormhole
|
||||
# drawing apps
|
||||
krita inkscape
|
||||
krita
|
||||
inkscape
|
||||
# office apps
|
||||
libreoffice-fresh
|
||||
hunspellDicts.fr-moderne
|
||||
hunspellDicts.de-de
|
||||
hunspellDicts.en-us
|
||||
# nixos tools
|
||||
nh nix-output-monitor
|
||||
nh
|
||||
nix-output-monitor
|
||||
];
|
||||
|
||||
file = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
self: super:
|
||||
{
|
||||
self: super: {
|
||||
cacert = super.cacert.override {
|
||||
extraCertificateFiles = [../certs/myCA.pem];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
let
|
||||
snipeit-fqdn = "snipe-it.nixos.local";
|
||||
in
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
services.snipe-it = {
|
||||
enable = true;
|
||||
appKeyFile = "/etc/nixos/secrets/snipe-it/appkey";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
sourcehut-fqdn = "sourcehut.nixos.local";
|
||||
in
|
||||
{
|
||||
in {
|
||||
systemd.services.gitsrht = {
|
||||
environment = {
|
||||
# make python's requests package use the global ca-certificates store, which will contain my own CA cert
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ breezex-cursor, pkgs, ... }:
|
||||
{
|
||||
breezex-cursor,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
stylix = {
|
||||
enable = true;
|
||||
image = ./wallpapers/nixos_inspector_tan.png;
|
||||
|
|
|
|||
6
t470.nix
6
t470.nix
|
|
@ -1,9 +1,11 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration-t470.nix
|
||||
./common.nix
|
||||
|
|
|
|||
1
void.nix
1
void.nix
|
|
@ -1,7 +1,6 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration-void.nix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
let
|
||||
lock-command = "swaylock";
|
||||
in
|
||||
{
|
||||
in {
|
||||
wayland.windowManager.river = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue