diff --git a/home/apps/mpv.nix b/home/apps/mpv.nix index cf98e40..99552eb 100644 --- a/home/apps/mpv.nix +++ b/home/apps/mpv.nix @@ -6,5 +6,6 @@ "script-opts" = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp"; }; }; - programs.zsh.shellAliases.listen = "${pkgs.mpv}/bin/mpv \"https://music:$(cat /secrets/music-stream-password)@stream.owo.monster/flac\" --cache=yes --cache-pause-initial=yes --cache-pause-wait=5"; + programs.zsh.shellAliases.listen = '' + ${pkgs.mpv}/bin/mpv "https://music:$(cat /secrets/music-stream-password)@stream.owo.monster/flac" --cache=yes --cache-pause-initial=yes --cache-pause-wait=5''; } diff --git a/home/apps/rofi/default.nix b/home/apps/rofi/default.nix index 22e4644..f17b138 100644 --- a/home/apps/rofi/default.nix +++ b/home/apps/rofi/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - home.packages = with pkgs; [rofi]; + home.packages = with pkgs; [ rofi ]; home.file.".local/share/rofi/themes/rofi-nord.rasi".source = ./rofi-nord.rasi; home.file.".config/rofi/config.rasi".source = ./config.rasi; } diff --git a/home/dev/all/deploy-rs.nix b/home/dev/all/deploy-rs.nix index 2057a82..ee275fd 100644 --- a/home/dev/all/deploy-rs.nix +++ b/home/dev/all/deploy-rs.nix @@ -1,3 +1 @@ -{ pkgs, inputs, ... }: { - home.packages = with pkgs.deploy-rs; [ deploy-rs ]; -} +{ pkgs, inputs, ... }: { home.packages = with pkgs.deploy-rs; [ deploy-rs ]; } diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix index 81042e0..88e4648 100644 --- a/home/gui/environments/gnome/default.nix +++ b/home/gui/environments/gnome/default.nix @@ -1,6 +1 @@ -{tree, ...}: { - imports = with tree; [ - home.apps.kitty - home.apps.rofi - ]; -} \ No newline at end of file +{ tree, ... }: { imports = with tree; [ home.apps.kitty home.apps.rofi ]; } diff --git a/hosts/hetzner-vm/services/mpd.nix b/hosts/hetzner-vm/services/mpd.nix index c514875..abec458 100644 --- a/hosts/hetzner-vm/services/mpd.nix +++ b/hosts/hetzner-vm/services/mpd.nix @@ -71,4 +71,4 @@ }; networking.firewall.allowedTCPPorts = [ 6600 ]; -} +} diff --git a/hosts/lappy/hardware.nix b/hosts/lappy/hardware.nix index 689c057..3becbbd 100644 --- a/hosts/lappy/hardware.nix +++ b/hosts/lappy/hardware.nix @@ -1,7 +1,7 @@ { pkgs, ... }: let - usb_data = import ./hardware/usb_data.nix {}; - ssd_data = import ./hardware/ssd_data.nix {}; + usb_data = import ./hardware/usb_data.nix { }; + ssd_data = import ./hardware/ssd_data.nix { }; in { boot = { loader = { @@ -25,33 +25,32 @@ in { "cryptd" ]; kernelModules = [ "kvm-intel" ]; - - initrd.postDeviceCommands = pkgs.lib.mkBefore '' - mkdir -m 0755 -p ${usb_data.mountpoint} + initrd.postDeviceCommands = pkgs.lib.mkBefore '' + mkdir -m 0755 -p ${usb_data.mountpoint} - while !(test -b ${usb_data.encrypted_path}) - do - echo "Please Plug In USB" - sleep 1 - done + while !(test -b ${usb_data.encrypted_path}) + do + echo "Please Plug In USB" + sleep 1 + done - echo "Please Decrypt USB" + echo "Please Decrypt USB" - cryptsetup luksOpen ${usb_data.encrypted_path} ${usb_data.mapper_name} + cryptsetup luksOpen ${usb_data.encrypted_path} ${usb_data.mapper_name} - mount -n -t ${usb_data.unencrypted_fs_type} -o ro ${usb_data.mapper_path} ${usb_data.mountpoint} - ''; + mount -n -t ${usb_data.unencrypted_fs_type} -o ro ${usb_data.mapper_path} ${usb_data.mountpoint} + ''; - initrd.luks.devices = { - "${ssd_data.root_mapper_name}" = { - device = "${ssd_data.encrypted_root_path}"; - keyFile = "${usb_data.lappy_encryption_key_path}"; - preLVM = false; - allowDiscards = true; + initrd.luks.devices = { + "${ssd_data.root_mapper_name}" = { + device = "${ssd_data.encrypted_root_path}"; + keyFile = "${usb_data.lappy_encryption_key_path}"; + preLVM = false; + allowDiscards = true; + }; }; }; -}; fileSystems = { "/" = { diff --git a/hosts/lappy/hardware/ssd_data.nix b/hosts/lappy/hardware/ssd_data.nix index 8d61f34..45033c1 100644 --- a/hosts/lappy/hardware/ssd_data.nix +++ b/hosts/lappy/hardware/ssd_data.nix @@ -1,23 +1,23 @@ -{}: rec { - # Mountpoints - root_mountpoint = "/"; - boot_mountpoint = "/boot"; +{ }: rec { + # Mountpoints + root_mountpoint = "/"; + boot_mountpoint = "/boot"; - # Partition Labels - boot_label = "nixboot"; - encrypted_root_partlabel = "nixos_encrypted"; + # Partition Labels + boot_label = "nixboot"; + encrypted_root_partlabel = "nixos_encrypted"; - # Partition Filesystems - unencrypted_root_fs_type = "ext4"; - boot_fs_type = "vfat"; + # Partition Filesystems + unencrypted_root_fs_type = "ext4"; + boot_fs_type = "vfat"; - # Mapper Name - root_mapper_name = "cryptroot"; + # Mapper Name + root_mapper_name = "cryptroot"; - # FS Paths - encrypted_root_path = "/dev/disk/by-partlabel/${encrypted_root_partlabel}"; - decrypted_root_path = "/dev/mapper/${root_mapper_name}"; + # FS Paths + encrypted_root_path = "/dev/disk/by-partlabel/${encrypted_root_partlabel}"; + decrypted_root_path = "/dev/mapper/${root_mapper_name}"; - boot_path = "/dev/disk/by-label/${boot_label}"; + boot_path = "/dev/disk/by-label/${boot_label}"; -} \ No newline at end of file +} diff --git a/hosts/lappy/hardware/usb_data.nix b/hosts/lappy/hardware/usb_data.nix index 5ad3340..083b377 100644 --- a/hosts/lappy/hardware/usb_data.nix +++ b/hosts/lappy/hardware/usb_data.nix @@ -1,24 +1,23 @@ -{...}: rec { - # Mountpoints - mountpoint = "/usb"; +{ ... }: rec { + # Mountpoints + mountpoint = "/usb"; - # Partition Labels - encrypted_partlabel = "usb"; - unencrypted_label = "usb_unencrypted"; + # Partition Labels + encrypted_partlabel = "usb"; + unencrypted_label = "usb_unencrypted"; - # Partition Filesystems - unencrypted_fs_type = "ext4"; + # Partition Filesystems + unencrypted_fs_type = "ext4"; - # Mapper Information - mapper_name = "usb_unencrypted"; + # Mapper Information + mapper_name = "usb_unencrypted"; - # FS Paths - encrypted_path = "/dev/disk/by-partlabel/${encrypted_partlabel}"; - unencrypted_path = "/dev/disk/by-label/${unencrypted_label}"; - mapper_path = "/dev/mapper/${mapper_name}"; + # FS Paths + encrypted_path = "/dev/disk/by-partlabel/${encrypted_partlabel}"; + unencrypted_path = "/dev/disk/by-label/${unencrypted_label}"; + mapper_path = "/dev/mapper/${mapper_name}"; + # Paths to some important files + lappy_encryption_key_path = "${mountpoint}/encryption-keys/lappy.key"; - # Paths to some important files - lappy_encryption_key_path = "${mountpoint}/encryption-keys/lappy.key"; - -} \ No newline at end of file +} diff --git a/hosts/lappy/vm.nix b/hosts/lappy/vm.nix index 4c1001e..6d982a2 100644 --- a/hosts/lappy/vm.nix +++ b/hosts/lappy/vm.nix @@ -1,13 +1,11 @@ -{lib, inputs, ...}: { - imports = [ - "${inputs.nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix" - ]; - users.users.root.password = "password"; - users.users.chaos.password = "password"; - home-manager.users.chaos.home.sessionVariables = { - WLR_RENDERER_ALLOW_SOFTWARE = "1"; - }; - services.getty.extraArgs = lib.mkForce []; - virtualisation.cores = 4; - virtualisation.qemu.options = ["-vga" "qxl"]; -} \ No newline at end of file +{ lib, inputs, ... }: { + imports = [ "${inputs.nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix" ]; + users.users.root.password = "password"; + users.users.chaos.password = "password"; + home-manager.users.chaos.home.sessionVariables = { + WLR_RENDERER_ALLOW_SOFTWARE = "1"; + }; + services.getty.extraArgs = lib.mkForce [ ]; + virtualisation.cores = 4; + virtualisation.qemu.options = [ "-vga" "qxl" ]; +} diff --git a/overlay/alsa-lib/default.nix b/overlay/alsa-lib/default.nix index c6ca44e..99477c2 100644 --- a/overlay/alsa-lib/default.nix +++ b/overlay/alsa-lib/default.nix @@ -1,9 +1,4 @@ -{ lib -, stdenv -, fetchurl -, alsa-topology-conf -, alsa-ucm-conf -}: +{ lib, stdenv, fetchurl, alsa-topology-conf, alsa-ucm-conf }: stdenv.mkDerivation rec { pname = "alsa-lib"; @@ -44,4 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ l-as ]; }; -} \ No newline at end of file +} diff --git a/overlay/default.nix b/overlay/default.nix index 2907b5b..2ea5c1c 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -12,7 +12,6 @@ final: prev: { }; roc-toolkit-patched = final.callPackage ./roc-toolkit-patched { }; roc-send-pcm = final.callPackage ./roc-send-pcm { }; - vivaldi = prev.vivaldi.override { - alsa-lib = final.callPackage ./alsa-lib {}; - }; + vivaldi = + prev.vivaldi.override { alsa-lib = final.callPackage ./alsa-lib { }; }; } diff --git a/profiles/gui/environments/gnome/default.nix b/profiles/gui/environments/gnome/default.nix index 795c2b7..f42a06e 100644 --- a/profiles/gui/environments/gnome/default.nix +++ b/profiles/gui/environments/gnome/default.nix @@ -27,7 +27,7 @@ gnomeExtensions.appindicator gnome.gnome-tweaks gnomeExtensions.just-perfection - ]; + ]; services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; services.power-profiles-daemon.enable = lib.mkForce false; diff --git a/profiles/sound/pulseaudio/pulse-48000.nix b/profiles/sound/pulseaudio/pulse-48000.nix index 0180974..3d3417b 100644 --- a/profiles/sound/pulseaudio/pulse-48000.nix +++ b/profiles/sound/pulseaudio/pulse-48000.nix @@ -1,3 +1 @@ -_: { - hardware.pulseaudio.daemon.config = { default-sample-rate = "48000"; }; -} +_: { hardware.pulseaudio.daemon.config = { default-sample-rate = "48000"; }; } diff --git a/tree.nix b/tree.nix index ffd1d8a..a71c99d 100644 --- a/tree.nix +++ b/tree.nix @@ -16,7 +16,8 @@ let in result != null && builtins.length result > 0; nixFiles = filterAttrs isNixFile dirContents; getPath = entry: "${realPath}/${entry}"; - getPaths = mapAttrs' (n: v: nameValuePair (removeSuffix ".nix" n) (getPath n)); + getPaths = + mapAttrs' (n: v: nameValuePair (removeSuffix ".nix" n) (getPath n)); nixFilePaths = getPaths nixFiles; dirPaths = getPaths directories; recursedPaths = mapAttrs (_: fullPath: @@ -100,12 +101,11 @@ let let processFunctor = prev: prev // { - __functor = self: - _: { - imports = - attrValues (removeAttrs prev leafConfig.functor.excludes) - ++ leafConfig.functor.external; - }; + __functor = self: _: { + imports = + attrValues (removeAttrs prev leafConfig.functor.excludes) + ++ leafConfig.functor.external; + }; }; processAliasDefault = prev: prev.default; processDefault = prev: