From 3bf9f9b6d1cabb22363d90d36fcffdbf394472ed Mon Sep 17 00:00:00 2001 From: Tristan Date: Wed, 14 Feb 2024 23:35:50 +0000 Subject: [PATCH] format + add alpine --- flake.nix | 4 +- hardware/alpine.nix | 104 ++++++++++++++++++------------ home/desktop/hyprland/default.nix | 8 ++- home/desktop/utils/display.nix | 4 +- home/programs/graphical.nix | 6 +- home/programs/mpv.nix | 3 +- home/programs/work.nix | 10 +-- pkgs/mpv-skipsilence.nix | 15 ++--- 8 files changed, 90 insertions(+), 64 deletions(-) diff --git a/flake.nix b/flake.nix index 9b7aefa..e71d09b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ system = "x86_64-linux"; pkgs = import inputs.nixpkgs { inherit system; - overlays = [ inputs.hyprland.overlays ]; + overlays = [inputs.hyprland.overlays]; }; user = "tristan"; userFullname = "Tristan Beedell"; @@ -49,6 +49,8 @@ ./home/desktop/hyprland/. ]; + alpine = mkConf [./hardware/alpine.nix] []; + vm-sway = builtins.trace '' use super+enter to start a terminal. diff --git a/hardware/alpine.nix b/hardware/alpine.nix index fddf266..68b55be 100644 --- a/hardware/alpine.nix +++ b/hardware/alpine.nix @@ -1,52 +1,70 @@ -# 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, + ... +}: let + user = config.user; +in { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/979fe496-10e8-41be-97d1-3d000cd2b384"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/979fe496-10e8-41be-97d1-3d000cd2b384"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/72d527de-fead-43d5-8f29-e06d2c584a18"; - fsType = "ext4"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/72d527de-fead-43d5-8f29-e06d2c584a18"; + fsType = "ext4"; + }; - fileSystems."/mnt/disk1" = - { device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63"; - fsType = "ext4"; - }; + fileSystems."/mnt/disk1" = { + device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63"; + fsType = "ext4"; + }; - fileSystems."/mnt/disk2" = - { device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2"; - fsType = "ext4"; - }; + fileSystems."/mnt/disk2" = { + device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2"; + fsType = "ext4"; + }; - fileSystems."/mnt/disk3" = - { device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831"; - fsType = "ext4"; - }; + fileSystems."/mnt/disk3" = { + device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831"; + fsType = "ext4"; + }; - fileSystems."/mnt/parity1" = - { device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713"; - fsType = "ext4"; - }; + fileSystems."/mnt/parity1" = { + device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713"; + fsType = "ext4"; + }; # /etc/fstab # /mnt/disk1:/mnt/disk2:/mnt/disk3 /mnt/storage mergerfs direct_io,use_ino,allow_other,minfreespace=50G,fsname=mergerfs,category.create=mfs,func.mkdir=epall 0 0 + fileSystems."/mnt/storage" = { + device = "/mnt/disk1:/mnt/disk2:/mnt/disk3"; + fsType = "mergerfs"; + depends = ["/mnt/disk1" "/mnt/disk2" "/mnt/disk3"]; + options = [ + "direct_io" + "use_ino" + "allow_other" + "minfreespace=50G" + "fsname=mergerfs" + "category.create=mfs" + "func.mkdir=epall" + ]; + }; + # auto-generated-config: looks sus # fileSystems."/mnt/storage" = @@ -60,9 +78,9 @@ # options = [ "bind" ]; # }; - swapDevices = - [ { device = "/dev/disk/by-uuid/27ad4809-211f-4ae9-90da-d17d9c1df271"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/27ad4809-211f-4ae9-90da-d17d9c1df271";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -76,6 +94,11 @@ hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; system.stateVersion = "24.05"; # don't change. + home-manager.users.${user}.imports = [ + { + home.stateVersion = "24.05"; + } + ]; services.snapraid = { enable = true; @@ -95,7 +118,4 @@ "/mnt/parity1/SnapRAID.parity" ]; }; - - } - diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 8919532..833a8bf 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -197,9 +197,11 @@ in { window=$(echo "$windows" | ${menu}) hyprctl dispatch focuswindow title:"$window" ''; - hotkeys = [{ - key = "tab"; - }]; + hotkeys = [ + { + key = "tab"; + } + ]; } ]; diff --git a/home/desktop/utils/display.nix b/home/desktop/utils/display.nix index fc11c8b..736cc7a 100644 --- a/home/desktop/utils/display.nix +++ b/home/desktop/utils/display.nix @@ -1,6 +1,4 @@ -{ - pkgs, ... -}: { +{pkgs, ...}: { home.packages = with pkgs; [wlr-randr nwg-displays]; wayland.windowManager.hyprland.settings.source = [ diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 621906f..820aab8 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -1,4 +1,8 @@ -{pkgs,lib, ...}: { +{ + pkgs, + lib, + ... +}: { imports = [ ./qutebrowser.nix ./pcmanfm.nix diff --git a/home/programs/mpv.nix b/home/programs/mpv.nix index 84e2b33..a0e14c5 100644 --- a/home/programs/mpv.nix +++ b/home/programs/mpv.nix @@ -19,8 +19,7 @@ }; scripts = [ pkgs.mpvScripts.mpris - (pkgs.callPackage ../../pkgs/mpv-skipsilence.nix {inherit ( pkgs.mpvScripts ) buildLua;}) + (pkgs.callPackage ../../pkgs/mpv-skipsilence.nix {inherit (pkgs.mpvScripts) buildLua;}) ]; }; - } diff --git a/home/programs/work.nix b/home/programs/work.nix index 5247e44..b12e205 100644 --- a/home/programs/work.nix +++ b/home/programs/work.nix @@ -1,12 +1,14 @@ -{config, pkgs, ...}: -let +{ + config, + pkgs, + ... +}: let modifier = config.windowManager.modifierKey; pwa = { slack = "mpagibdhafmlkgpemeicgogjnhclenoc"; teams = "cifhbcnohmdccbgoicgdjpfamggdegmo"; }; -in -{ +in { roles.email = { enable = true; email = "tristan.beedell@cryoserver.com"; diff --git a/pkgs/mpv-skipsilence.nix b/pkgs/mpv-skipsilence.nix index ebc710c..373dce3 100644 --- a/pkgs/mpv-skipsilence.nix +++ b/pkgs/mpv-skipsilence.nix @@ -1,9 +1,9 @@ -{ lib -, buildLua -, fetchgit -, gitUpdater +{ + lib, + buildLua, + fetchgit, + gitUpdater, }: - buildLua rec { pname = "mpv-skipsilence"; version = "1.0"; @@ -17,8 +17,7 @@ buildLua rec { meta = with lib; { description = "Increase playback speed during silence - a revolution in attention-deficit induction technology."; homepage = "https://github.com/ferreum/mpv-skipsilence"; - license = licenses.unlicense; # actually they don't have a license - maintainers = [ ]; + license = licenses.unlicense; # actually they don't have a license + maintainers = []; }; - }