Run nixpkgs-fmt
This commit is contained in:
parent
12081e5172
commit
f42247f51a
|
@ -93,5 +93,5 @@
|
|||
mutableUsers = false;
|
||||
};
|
||||
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
|
||||
, libXrandr
|
||||
}:
|
||||
|
||||
let
|
||||
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, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.boot.loader.systemd-boot-secure;
|
||||
|
||||
|
@ -38,7 +37,8 @@ let
|
|||
|
||||
signingCertificate = if cfg.signed then cfg.signing-certificate else "/no-signing-crt";
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
|
||||
options.boot.loader.systemd-boot-secure = {
|
||||
enable = mkOption {
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
llvm = pkgs.llvmPackages_10;
|
||||
go = pkgs.go_1_15;
|
||||
in
|
||||
{
|
||||
environment.systemPackages = (with pkgs; [
|
||||
{
|
||||
environment.systemPackages = (with pkgs; [
|
||||
# Audiovisual
|
||||
audacity
|
||||
darktable
|
||||
|
@ -107,7 +106,7 @@ in
|
|||
xclip
|
||||
xxd
|
||||
zip
|
||||
|
||||
|
||||
# Networking
|
||||
curlFull
|
||||
httpie
|
||||
|
|
2
private
2
private
|
@ -1 +1 @@
|
|||
Subproject commit 37ff0f2defe0902161d79d79cb4a9f7ef30bfbed
|
||||
Subproject commit 2f3480efc17b6cbd3edf01f2cee877ce2c9a8cf4
|
|
@ -18,6 +18,6 @@
|
|||
dfu-util
|
||||
tinyprog
|
||||
wishbone-tool
|
||||
( callPackage ../externals/packages/fujproj { } )
|
||||
(callPackage ../externals/packages/fujproj { })
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
|
|
|
@ -16,6 +16,6 @@
|
|||
|
||||
users = {
|
||||
users.artemis.extraGroups = [ "plugdev" "dialout" ];
|
||||
extraGroups.plugdev = {};
|
||||
extraGroups.plugdev = { };
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,52 +1,50 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
wofi = pkgs.wofi.overrideAttrs ( old: {
|
||||
wofi = pkgs.wofi.overrideAttrs (old: {
|
||||
src = pkgs.fetchhg {
|
||||
url = old.src.url;
|
||||
rev = "e3db9b8075e71399bba14a568c59032f47981dab";
|
||||
sha256 = "07fr1yfls94gxpwv3azgzxm7shjs4g5ribvqrh88flpf4cv5hq2d";
|
||||
};
|
||||
} );
|
||||
});
|
||||
in
|
||||
{
|
||||
security.polkit.enable = true;
|
||||
services = {
|
||||
accounts-daemon.enable = true;
|
||||
logind.extraConfig = "HandlePowerKey=suspend";
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
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
|
||||
{
|
||||
security.polkit.enable = true;
|
||||
services = {
|
||||
accounts-daemon.enable = true;
|
||||
logind.extraConfig = "HandlePowerKey=suspend";
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
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
|
||||
];
|
||||
}
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
users.users = {
|
||||
artemis.extraGroups = [ "docker" "lxd" ];
|
||||
root = {
|
||||
subUidRanges = [ { startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; } ];
|
||||
subGidRanges = [ { startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } ];
|
||||
subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }];
|
||||
subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; }];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
};
|
||||
|
||||
fileSystems = {
|
||||
"/home".options = ["noatime"];
|
||||
"/boot".options = ["noatime"];
|
||||
"/".options = ["noatime"];
|
||||
"/home".options = [ "noatime" ];
|
||||
"/boot".options = [ "noatime" ];
|
||||
"/".options = [ "noatime" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
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" ];
|
||||
|
@ -14,25 +15,27 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/mapper/rainbowdash-root";
|
||||
{
|
||||
device = "/dev/mapper/rainbowdash-root";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/mapper/rainbowdash-root";
|
||||
{
|
||||
device = "/dev/mapper/rainbowdash-root";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/642D-02DF";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/642D-02DF";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
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";
|
||||
# High-DPI console
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
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" ];
|
||||
|
@ -14,37 +15,41 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
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";
|
||||
options = [ "subvol=flatpak" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/597E-B7FC";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/597E-B7FC";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
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";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue