mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 08:53:56 -05:00
treewide reformat
This commit is contained in:
parent
de7683556e
commit
fc21bf9436
42 changed files with 1012 additions and 876 deletions
|
|
@ -1,36 +1,39 @@
|
|||
{disko, ...}: {
|
||||
imports = [disko.nixosModules.disko];
|
||||
disko.devices.disk.sda = let
|
||||
baseDevice = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
|
||||
in {
|
||||
device = baseDevice;
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
device = "${baseDevice}-part1";
|
||||
start = "1MiB";
|
||||
end = "1GiB";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
{ disko, ... }:
|
||||
{
|
||||
imports = [ disko.nixosModules.disko ];
|
||||
disko.devices.disk.sda =
|
||||
let
|
||||
baseDevice = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
|
||||
in
|
||||
{
|
||||
device = baseDevice;
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
device = "${baseDevice}-part1";
|
||||
start = "1MiB";
|
||||
end = "1GiB";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
};
|
||||
};
|
||||
};
|
||||
root = {
|
||||
device = "${baseDevice}-part2";
|
||||
start = "1GiB";
|
||||
end = "100%";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
root = {
|
||||
device = "${baseDevice}-part2";
|
||||
start = "1GiB";
|
||||
end = "100%";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
_file = ./disko.nix;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
_: {
|
||||
_:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
local = {
|
||||
remoteBuild.enable = true;
|
||||
DM = {
|
||||
|
|
@ -19,18 +21,17 @@ _: {
|
|||
};
|
||||
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
neovim
|
||||
vlc
|
||||
nomacs
|
||||
rsync
|
||||
pavucontrol #gui volume control
|
||||
librewolf #best browser
|
||||
pavucontrol # gui volume control
|
||||
librewolf # best browser
|
||||
chromium
|
||||
;
|
||||
;
|
||||
};
|
||||
services.xserver.videoDrivers = ["intel"];
|
||||
services.xserver.videoDrivers = [ "intel" ];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
|
@ -45,7 +46,10 @@ _: {
|
|||
useDefaultShell = true;
|
||||
uid = 1000;
|
||||
isNormalUser = true;
|
||||
extraGroups = ["networkmanager" "audio"];
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"audio"
|
||||
];
|
||||
initialHashedPassword = "";
|
||||
};
|
||||
"root" = {
|
||||
|
|
@ -62,8 +66,16 @@ _: {
|
|||
};
|
||||
services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
|
||||
boot = {
|
||||
initrd.availableKernelModules = ["xhci-pci" "ehci-pci" "ahci" "usbhid" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"];
|
||||
kernelModules = ["kvm-intel"];
|
||||
initrd.availableKernelModules = [
|
||||
"xhci-pci"
|
||||
"ehci-pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
"rtsx_usb_sdmmc"
|
||||
];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
};
|
||||
systemd.user.tmpfiles.users.jo.rules = [
|
||||
"L+ %h/Desktop/gimp.desktop - - - - ${pkgs.gimp}/share/applications/gimp.desktop"
|
||||
|
|
@ -79,11 +91,9 @@ _: {
|
|||
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swapfile";
|
||||
size = 8 * 1024;
|
||||
}
|
||||
];
|
||||
swapDevices = [ {
|
||||
device = "/swapfile";
|
||||
size = 8 * 1024;
|
||||
} ];
|
||||
_file = ./main.nix;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,31 @@
|
|||
_: {pkgs, ...}: let
|
||||
xsane =
|
||||
pkgs.xsane.override {gimpSupport = true;};
|
||||
in {
|
||||
local.allowedUnfree = ["hplip"];
|
||||
_:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
xsane = pkgs.xsane.override { gimpSupport = true; };
|
||||
in
|
||||
{
|
||||
local.allowedUnfree = [ "hplip" ];
|
||||
environment.systemPackages = [
|
||||
xsane
|
||||
pkgs.gimp
|
||||
pkgs.libreoffice
|
||||
];
|
||||
users.users.jo.extraGroups = ["scanner" "lp" "cups"];
|
||||
users.users.jo.extraGroups = [
|
||||
"scanner"
|
||||
"lp"
|
||||
"cups"
|
||||
];
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = [pkgs.hplipWithPlugin];
|
||||
extraBackends = [ pkgs.hplipWithPlugin ];
|
||||
};
|
||||
systemd.user.tmpfiles.users.jo.rules = ["L %h/.config/GIMP/2.10/plug-ins/xsane - - - - ${xsane}"];
|
||||
systemd.user.tmpfiles.users.jo.rules = [
|
||||
"L %h/.config/GIMP/2.10/plug-ins/xsane - - - - ${xsane}"
|
||||
];
|
||||
services = {
|
||||
printing = {
|
||||
enable = true;
|
||||
drivers = [pkgs.hplipWithPlugin];
|
||||
drivers = [ pkgs.hplipWithPlugin ];
|
||||
};
|
||||
};
|
||||
_file = ./printing.nix;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue