petrichor
/
boxen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meta: run nixfmt

This commit is contained in:
Jez Cope 2021-07-28 18:37:14 +01:00
parent abdc9c9a4b
commit 3376e22cfe
10 changed files with 184 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -5,7 +5,7 @@
{ inputs, hostName, config, pkgs, lib, ... }:
{
imports = [./cachix.nix];
imports = [ ./cachix.nix ];
# Temporary fixes !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#

54
flake.nix
View File

@ -9,33 +9,43 @@
nur.url = "github:nix-community/NUR";
emacs-overlay.url = "github:nix-community/emacs-overlay";
sc3plugins.url = "git+https://tildegit.org/petrichor/sc3plugins-nix.git?ref=main";
sc3plugins.url =
"git+https://tildegit.org/petrichor/sc3plugins-nix.git?ref=main";
sc3plugins.inputs.nixpkgs.follows = "nixos";
};
outputs = { self, nixos, home-manager, nur, emacs-overlay, sc3plugins }@inputs: {
outputs =
{ self, nixos, home-manager, nur, emacs-overlay, sc3plugins }@inputs: {
nixosConfigurations = nixos.lib.attrsets.genAttrs [ "arianrhod" "gwydion" ]
(hostName:
nixos.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
(./hosts + "/${hostName}")
(./secrets + "/${hostName}.nix")
nixosConfigurations =
nixos.lib.attrsets.genAttrs [ "arianrhod" "gwydion" ] (hostName:
nixos.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
(./hosts + "/${hostName}")
(./secrets + "/${hostName}.nix")
{ nixpkgs.overlays = [ nur.overlay emacs-overlay.overlay
(final: prev: { inherit (sc3plugins.packages.x86_64-linux) supercolliderWithPlugins; })]; }
{
nixpkgs.overlays = [
nur.overlay
emacs-overlay.overlay
(final: prev: {
inherit (sc3plugins.packages.x86_64-linux)
supercolliderWithPlugins;
})
];
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = false;
home-manager.users.jez = import ./home;
}
];
specialArgs = { inherit inputs hostName; };
});
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = false;
home-manager.users.jez = import ./home;
}
];
specialArgs = { inherit inputs hostName; };
});
};
};
}

4
home/machines/gwydion.nix
View File

@ -44,9 +44,7 @@ in {
mod = config.wayland.windowManager.sway.config.modifier;
in {
config = {
keybindings = {
"${mod}+Ctrl+a" = "output ${outputs.alt} toggle";
};
keybindings = { "${mod}+Ctrl+a" = "output ${outputs.alt} toggle"; };
output = {
"${outputs.main}" = {

6
home/modules/protonmail.nix
View File

@ -2,8 +2,7 @@
with lib;
let
cfg = config.services.protonmail-bridge;
let cfg = config.services.protonmail-bridge;
in {
options = {
services.protonmail-bridge = {
@ -21,7 +20,8 @@ in {
After = "network.target";
};
Service = {
ExecStart = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive";
ExecStart =
"${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive";
Restart = "on-failure";
};
Install.WantedBy = [ "default.target" ];

7
home/modules/wal.nix
View File

@ -42,9 +42,10 @@ in {
packages = [ pkgs.pywal ];
activation = {
# Must be before onFilesChange because that's when other configs are reloaded
updateWalScheme = lib.hm.dag.entryBetween [ "onFilesChange" ] [ "writeBoundary" ] ''
${walCmd} -i ${cfg.background} --backend ${cfg.backend} -e
'';
updateWalScheme =
lib.hm.dag.entryBetween [ "onFilesChange" ] [ "writeBoundary" ] ''
${walCmd} -i ${cfg.background} --backend ${cfg.backend} -e
'';
};
};

17
home/profiles/sway/default.nix
View File

@ -30,8 +30,10 @@ let
term = "${kitty} --single-instance";
initial-term = "${kitty} --session ~/.config/kitty/sessions/default.conf";
menu = "${wofi} --show drun";
passmenu = "${gopass} list -f | ${wofi} --show dmenu | xargs ${gopass} show -c";
oathmenu = "ykman oath code -s $(ykman oath list | wofi --show dmenu) | wl-copy";
passmenu =
"${gopass} list -f | ${wofi} --show dmenu | xargs ${gopass} show -c";
oathmenu =
"ykman oath code -s $(ykman oath list | wofi --show dmenu) | wl-copy";
screenshot = ''${grim} -g "$(${slurp})"'';
idle = ''
${swayidle} -w \
@ -41,7 +43,8 @@ let
before-sleep 'swaylock -f -i ${lockImage}'
'';
swaydump = "${swaymsg} -t get_tree > ~/swaydump.json";
kill-current = ''kill -9 "$(${swaymsg} -t get_tree | ${jq} '.. | (.nodes? // empty)[] | select(.focused==true) | .pid')"'';
kill-current = ''
kill -9 "$(${swaymsg} -t get_tree | ${jq} '.. | (.nodes? // empty)[] | select(.focused==true) | .pid')"'';
};
in {
@ -123,7 +126,8 @@ in {
xkb_options = "compose:ralt";
};
# Penguin wireless mouse
input."1578:16641:MOSART_Semi._2.4G_Keyboard_Mouse".natural_scroll = "enabled";
input."1578:16641:MOSART_Semi._2.4G_Keyboard_Mouse".natural_scroll =
"enabled";
# One by Wacom tablet
input."1386:891:Wacom_One_by_Wacom_M_Pen".left_handed = "enabled";
@ -214,8 +218,9 @@ in {
"${mod}+Shift+minus" = "move scratchpad";
"${mod}+minus" = "scratchpad show";
"${mod}+g" = ''exec ${cmds.screenshot} - | ${cmds.wl-copy}'';
"${mod}+Shift+g" = ''exec ${cmds.screenshot} "Downloads/screenshot-$(date ${grim-date-fmt}).png"'';
"${mod}+g" = "exec ${cmds.screenshot} - | ${cmds.wl-copy}";
"${mod}+Shift+g" = ''
exec ${cmds.screenshot} "Downloads/screenshot-$(date ${grim-date-fmt}).png"'';
"${mod}+l" = "exec pkill -USR1 swayidle";
"${mod}+Shift+e" =

55
hosts/arianrhod/hardware.nix
View File

@ -4,44 +4,43 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "puddle/ROOT/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "puddle/ROOT/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "puddle/DATA/home";
fsType = "zfs";
};
fileSystems."/home" = {
device = "puddle/DATA/home";
fsType = "zfs";
};
fileSystems."/root" =
{ device = "puddle/DATA/home/root";
fsType = "zfs";
};
fileSystems."/root" = {
device = "puddle/DATA/home/root";
fsType = "zfs";
};
fileSystems."/home/jez" =
{ device = "puddle/DATA/home/jez";
fsType = "zfs";
};
fileSystems."/home/jez" = {
device = "puddle/DATA/home/jez";
fsType = "zfs";
};
fileSystems."/puddle" =
{ device = "puddle";
fsType = "zfs";
};
fileSystems."/puddle" = {
device = "puddle";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4A6A-FC6D";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4A6A-FC6D";
fsType = "vfat";
};
swapDevices = [ ];

2
hosts/gwydion/default.nix
View File

@ -35,7 +35,7 @@
networking.firewall.allowedTCPPorts = [
6600 # mpd
21 # ftp
21 # ftp
1313 # Hugo preview
];

209
hosts/gwydion/hardware.nix
View File

@ -4,140 +4,139 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "trough/ROOT/nixos";
fsType = "zfs";
};
fileSystems."/" = {
device = "trough/ROOT/nixos";
fsType = "zfs";
};
fileSystems."/nix" =
{ device = "trough/ROOT/nixos/nix";
fsType = "zfs";
};
fileSystems."/nix" = {
device = "trough/ROOT/nixos/nix";
fsType = "zfs";
};
fileSystems."/var" =
{ device = "trough/ROOT/nixos/var";
fsType = "zfs";
};
fileSystems."/var" = {
device = "trough/ROOT/nixos/var";
fsType = "zfs";
};
fileSystems."/home/jez" =
{ device = "trough/ROOT/nixos/home/jez";
fsType = "zfs";
};
fileSystems."/home/jez" = {
device = "trough/ROOT/nixos/home/jez";
fsType = "zfs";
};
fileSystems."/home/jez/.config" =
{ device = "trough/DATA/home/jez/Config/nixos";
fsType = "zfs";
};
fileSystems."/home/jez/.config" = {
device = "trough/DATA/home/jez/Config/nixos";
fsType = "zfs";
};
fileSystems."/home/jez/Games" =
{ device = "trough/DATA/home/jez/Games";
fsType = "zfs";
};
fileSystems."/home/jez/Games" = {
device = "trough/DATA/home/jez/Games";
fsType = "zfs";
};
fileSystems."/home/jez/Scratch" =
{ device = "trough/DATA/home/jez/Scratch";
fsType = "zfs";
};
fileSystems."/home/jez/Scratch" = {
device = "trough/DATA/home/jez/Scratch";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/f3e0124a-a0ac-4840-95f0-4d4643ce3e88";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/f3e0124a-a0ac-4840-95f0-4d4643ce3e88";
fsType = "ext4";
};
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/E6E8-4214";
fsType = "vfat";
};
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/E6E8-4214";
fsType = "vfat";
};
fileSystems."/home/jez/Documents" =
{ device = "tank/home/jez/Documents";
fsType = "zfs";
};
fileSystems."/home/jez/Documents" = {
device = "tank/home/jez/Documents";
fsType = "zfs";
};
fileSystems."/home/jez/Sync" =
{ device = "tank/home/jez/Sync";
fsType = "zfs";
};
fileSystems."/home/jez/Sync" = {
device = "tank/home/jez/Sync";
fsType = "zfs";
};
fileSystems."/home/jez/Projects" =
{ device = "tank/home/jez/Projects";
fsType = "zfs";
};
fileSystems."/home/jez/Projects" = {
device = "tank/home/jez/Projects";
fsType = "zfs";
};
fileSystems."/home/jez/Music" =
{ device = "tank/home/jez/Music";
fsType = "zfs";
};
fileSystems."/home/jez/Music" = {
device = "tank/home/jez/Music";
fsType = "zfs";
};
fileSystems."/home/jez/Private" =
{ device = "tank/home/jez/Private";
fsType = "zfs";
};
fileSystems."/home/jez/Private" = {
device = "tank/home/jez/Private";
fsType = "zfs";
};
fileSystems."/home/jez/Downloads" =
{ device = "tank/home/jez/Downloads";
fsType = "zfs";
};
fileSystems."/home/jez/Downloads" = {
device = "tank/home/jez/Downloads";
fsType = "zfs";
};
fileSystems."/home/jez/10Pending" =
{ device = "tank/home/jez/10Pending";
fsType = "zfs";
};
fileSystems."/home/jez/10Pending" = {
device = "tank/home/jez/10Pending";
fsType = "zfs";
};
fileSystems."/home/jez/Archive" =
{ device = "tank/home/jez/Archive";
fsType = "zfs";
};
fileSystems."/home/jez/Archive" = {
device = "tank/home/jez/Archive";
fsType = "zfs";
};
fileSystems."/home/jez/Pictures" =
{ device = "tank/home/jez/Pictures";
fsType = "zfs";
};
fileSystems."/home/jez/Pictures" = {
device = "tank/home/jez/Pictures";
fsType = "zfs";
};
fileSystems."/home/jez/VMs" =
{ device = "tank/home/jez/VMs";
fsType = "zfs";
};
fileSystems."/home/jez/VMs" = {
device = "tank/home/jez/VMs";
fsType = "zfs";
};
fileSystems."/home/jez/Videos" =
{ device = "tank/home/jez/Videos";
fsType = "zfs";
};
fileSystems."/home/jez/Videos" = {
device = "tank/home/jez/Videos";
fsType = "zfs";
};
fileSystems."/home/jez/Web" =
{ device = "tank/home/jez/Web";
fsType = "zfs";
};
fileSystems."/home/jez/Web" = {
device = "tank/home/jez/Web";
fsType = "zfs";
};
fileSystems."/home/jez/00Inbox" =
{ device = "tank/home/jez/00Inbox";
fsType = "zfs";
};
fileSystems."/home/jez/00Inbox" = {
device = "tank/home/jez/00Inbox";
fsType = "zfs";
};
fileSystems."/var/lib/music" =
{ device = "/home/jez/Music/Best";
fsType = "none";
options = [ "bind" ];
};
fileSystems."/var/lib/music" = {
device = "/home/jez/Music/Best";
fsType = "none";
options = [ "bind" ];
};
fileSystems."/home/jez/Reference" =
{ device = "tank/home/jez/Reference";
fsType = "zfs";
};
fileSystems."/home/jez/Reference" = {
device = "tank/home/jez/Reference";
fsType = "zfs";
};
fileSystems."/home/jez/VMs/Disks/SSD" =
{ device = "trough/DATA/home/jez/VMs/Disks/SSD";
fsType = "zfs";
};
fileSystems."/home/jez/VMs/Disks/SSD" = {
device = "trough/DATA/home/jez/VMs/Disks/SSD";
fsType = "zfs";
};
swapDevices = [ ];

BIN
secrets/gwydion.nix
View File

Binary file not shown.