Run nixpkgs-fmt
This commit is contained in:
parent
12081e5172
commit
f42247f51a
|
@ -93,5 +93,5 @@
|
||||||
mutableUsers = false;
|
mutableUsers = false;
|
||||||
};
|
};
|
||||||
systemd.extraConfig = "DefaultLimitCORE=infinity";
|
systemd.extraConfig = "DefaultLimitCORE=infinity";
|
||||||
security.pam.loginLimits = [ { domain = "*"; item = "core"; type = "hard"; value = "infinity"; } ];
|
security.pam.loginLimits = [{ domain = "*"; item = "core"; type = "hard"; value = "infinity"; }];
|
||||||
}
|
}
|
||||||
|
|
1
externals/packages/jlink/default.nix
vendored
1
externals/packages/jlink/default.nix
vendored
|
@ -17,7 +17,6 @@
|
||||||
, libXrender
|
, libXrender
|
||||||
, libXrandr
|
, libXrandr
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
jlinkVersion = "686a";
|
jlinkVersion = "686a";
|
||||||
|
|
||||||
|
|
4
externals/systemd-boot-secure/default.nix
vendored
4
externals/systemd-boot-secure/default.nix
vendored
|
@ -1,7 +1,6 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.boot.loader.systemd-boot-secure;
|
cfg = config.boot.loader.systemd-boot-secure;
|
||||||
|
|
||||||
|
@ -38,7 +37,8 @@ let
|
||||||
|
|
||||||
signingCertificate = if cfg.signed then cfg.signing-certificate else "/no-signing-crt";
|
signingCertificate = if cfg.signed then cfg.signing-certificate else "/no-signing-crt";
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
|
|
||||||
options.boot.loader.systemd-boot-secure = {
|
options.boot.loader.systemd-boot-secure = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
llvm = pkgs.llvmPackages_10;
|
llvm = pkgs.llvmPackages_10;
|
||||||
go = pkgs.go_1_15;
|
go = pkgs.go_1_15;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
environment.systemPackages = (with pkgs; [
|
environment.systemPackages = (with pkgs; [
|
||||||
# Audiovisual
|
# Audiovisual
|
||||||
audacity
|
audacity
|
||||||
darktable
|
darktable
|
||||||
|
|
2
private
2
private
|
@ -1 +1 @@
|
||||||
Subproject commit 37ff0f2defe0902161d79d79cb4a9f7ef30bfbed
|
Subproject commit 2f3480efc17b6cbd3edf01f2cee877ce2c9a8cf4
|
|
@ -18,6 +18,6 @@
|
||||||
dfu-util
|
dfu-util
|
||||||
tinyprog
|
tinyprog
|
||||||
wishbone-tool
|
wishbone-tool
|
||||||
( callPackage ../externals/packages/fujproj { } )
|
(callPackage ../externals/packages/fujproj { })
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ...}:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
|
|
|
@ -16,6 +16,6 @@
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
users.artemis.extraGroups = [ "plugdev" "dialout" ];
|
users.artemis.extraGroups = [ "plugdev" "dialout" ];
|
||||||
extraGroups.plugdev = {};
|
extraGroups.plugdev = { };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,52 +1,50 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
wofi = pkgs.wofi.overrideAttrs ( old: {
|
wofi = pkgs.wofi.overrideAttrs (old: {
|
||||||
src = pkgs.fetchhg {
|
src = pkgs.fetchhg {
|
||||||
url = old.src.url;
|
url = old.src.url;
|
||||||
rev = "e3db9b8075e71399bba14a568c59032f47981dab";
|
rev = "e3db9b8075e71399bba14a568c59032f47981dab";
|
||||||
sha256 = "07fr1yfls94gxpwv3azgzxm7shjs4g5ribvqrh88flpf4cv5hq2d";
|
sha256 = "07fr1yfls94gxpwv3azgzxm7shjs4g5ribvqrh88flpf4cv5hq2d";
|
||||||
};
|
};
|
||||||
} );
|
});
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
services = {
|
services = {
|
||||||
accounts-daemon.enable = true;
|
accounts-daemon.enable = true;
|
||||||
logind.extraConfig = "HandlePowerKey=suspend";
|
logind.extraConfig = "HandlePowerKey=suspend";
|
||||||
};
|
};
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
xdg-desktop-portal-wlr
|
xdg-desktop-portal-wlr
|
||||||
];
|
|
||||||
};
|
|
||||||
sound.enable = true;
|
|
||||||
programs.sway = {
|
|
||||||
enable = true;
|
|
||||||
wrapperFeatures.gtk = true;
|
|
||||||
extraSessionCommands = ''
|
|
||||||
export MOZ_USE_XINPUT2=1
|
|
||||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
|
||||||
export GTK_THEME=Adwaita-dark
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
dex
|
|
||||||
glib
|
|
||||||
grim
|
|
||||||
imagemagick
|
|
||||||
libnotify
|
|
||||||
mako
|
|
||||||
polkit_gnome
|
|
||||||
slurp
|
|
||||||
wf-recorder
|
|
||||||
wl-clipboard
|
|
||||||
wofi
|
|
||||||
xdg-user-dirs
|
|
||||||
xdg_utils
|
|
||||||
xsettingsd
|
|
||||||
];
|
];
|
||||||
}
|
};
|
||||||
|
sound.enable = true;
|
||||||
|
programs.sway = {
|
||||||
|
enable = true;
|
||||||
|
wrapperFeatures.gtk = true;
|
||||||
|
extraSessionCommands = ''
|
||||||
|
export MOZ_USE_XINPUT2=1
|
||||||
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
|
export GTK_THEME=Adwaita-dark
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
dex
|
||||||
|
glib
|
||||||
|
grim
|
||||||
|
imagemagick
|
||||||
|
libnotify
|
||||||
|
mako
|
||||||
|
polkit_gnome
|
||||||
|
slurp
|
||||||
|
wf-recorder
|
||||||
|
wl-clipboard
|
||||||
|
wofi
|
||||||
|
xdg-user-dirs
|
||||||
|
xdg_utils
|
||||||
|
xsettingsd
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
users.users = {
|
users.users = {
|
||||||
artemis.extraGroups = [ "docker" "lxd" ];
|
artemis.extraGroups = [ "docker" "lxd" ];
|
||||||
root = {
|
root = {
|
||||||
subUidRanges = [ { startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; } ];
|
subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }];
|
||||||
subGidRanges = [ { startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } ];
|
subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; }];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/home".options = ["noatime"];
|
"/home".options = [ "noatime" ];
|
||||||
"/boot".options = ["noatime"];
|
"/boot".options = [ "noatime" ];
|
||||||
"/".options = ["noatime"];
|
"/".options = [ "noatime" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||||
|
@ -14,25 +15,27 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/mapper/rainbowdash-root";
|
{
|
||||||
|
device = "/dev/mapper/rainbowdash-root";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=root" ];
|
options = [ "subvol=root" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{ device = "/dev/mapper/rainbowdash-root";
|
{
|
||||||
|
device = "/dev/mapper/rainbowdash-root";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=home" ];
|
options = [ "subvol=home" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/642D-02DF";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/642D-02DF";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/289be8e5-6547-41d4-a6ba-309141f9fccd"; }
|
[{ device = "/dev/disk/by-uuid/289be8e5-6547-41d4-a6ba-309141f9fccd"; }];
|
||||||
];
|
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
# High-DPI console
|
# High-DPI console
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
|
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
|
||||||
|
@ -14,37 +15,41 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=root" ];
|
options = [ "subvol=root" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
fileSystems."/nix" =
|
||||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=nix" ];
|
options = [ "subvol=nix" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/var/lib/flatpak" =
|
fileSystems."/var/lib/flatpak" =
|
||||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=flatpak" ];
|
options = [ "subvol=flatpak" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=home" ];
|
options = [ "subvol=home" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/597E-B7FC";
|
{
|
||||||
|
device = "/dev/disk/by-uuid/597E-B7FC";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[ { device = "/dev/disk/by-uuid/52effd04-0e5a-4ac6-a0c9-5970c063e5f4"; }
|
[{ device = "/dev/disk/by-uuid/52effd04-0e5a-4ac6-a0c9-5970c063e5f4"; }];
|
||||||
];
|
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue