From: Skullheadx Date: Sun, 14 Jun 2026 03:05:19 +0000 (-0400) Subject: format using alejandra X-Git-Url: http://git.skullheadx.com/projects/blog/static/index.html?a=commitdiff_plain;ds=inline;p=nixos.git format using alejandra --- diff --git a/audio.nix b/audio.nix index 14323da..f146189 100644 --- a/audio.nix +++ b/audio.nix @@ -2,8 +2,7 @@ config, pkgs, ... -}: -{ +}: { services.pipewire = { enable = true; audio.enable = true; @@ -33,7 +32,7 @@ systemd.user.services.mpd = { description = "Music Player Daemon"; - wantedBy = [ "default.target" ]; + wantedBy = ["default.target"]; serviceConfig = { ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /home/andrew/.config/mpd/mpd.conf"; Restart = "on-failure"; diff --git a/hosts/icon/configuration.nix b/hosts/icon/configuration.nix index f15fbf2..62c5bb8 100644 --- a/hosts/icon/configuration.nix +++ b/hosts/icon/configuration.nix @@ -50,8 +50,15 @@ users.users.nginx.extraGroups = ["git"]; systemd.services.nginx.serviceConfig = { SupplementaryGroups = ["git"]; - ReadOnlyPaths = ["/srv/git" "/srv"]; - InaccessiblePaths = ["/srv/git/.ssh" "/srv/git/migrate_from_gh.sh" "/srv/git/make_new_repo.sh"]; + ReadOnlyPaths = [ + "/srv/git" + "/srv" + ]; + InaccessiblePaths = [ + "/srv/git/.ssh" + "/srv/git/migrate_from_gh.sh" + "/srv/git/make_new_repo.sh" + ]; }; # systemd.services.fcgiwrap.serviceConfig.ReadOnlyPaths = ["/srv/git"]; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -72,7 +79,11 @@ home = "/srv/git"; createHome = true; homeMode = "755"; - openssh.authorizedKeys.keyFiles = [../../pubkeys/desktop_ssh.pub ../../pubkeys/homelab_ssh.pub ../../pubkeys/laptop_ssh.pub]; + openssh.authorizedKeys.keyFiles = [ + ../../pubkeys/desktop_ssh.pub + ../../pubkeys/homelab_ssh.pub + ../../pubkeys/laptop_ssh.pub + ]; }; }; @@ -151,7 +162,10 @@ fileSystems."/srv/data" = { device = "/dev/disk/by-uuid/9014f510-b08e-488f-8c43-20a4ac7f15cc"; fsType = "ext4"; - options = ["defaults" "nofail"]; + options = [ + "defaults" + "nofail" + ]; }; networking.hostName = "icon"; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -197,7 +211,12 @@ }; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [9418 8080 6667 2049]; # git, gitweb, irc, nfs + networking.firewall.allowedTCPPorts = [ + 9418 + 8080 + 6667 + 2049 + ]; # git, gitweb, irc, nfs networking.firewall.allowedUDPPorts = [55555]; # wireguard # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/hosts/icon/hardware-configuration.nix b/hosts/icon/hardware-configuration.nix index 4fdf938..2bbb7e6 100644 --- a/hosts/icon/hardware-configuration.nix +++ b/hosts/icon/hardware-configuration.nix @@ -7,9 +7,7 @@ pkgs, modulesPath, ... -}: - -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -21,9 +19,9 @@ "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; fileSystems."/" = { device = "/dev/disk/by-uuid/2e969677-74d5-4c22-a708-fa27ba11f2f9"; @@ -40,7 +38,7 @@ }; swapDevices = [ - { device = "/dev/disk/by-uuid/c562b7b7-2a7e-4416-8223-120956671eae"; } + {device = "/dev/disk/by-uuid/c562b7b7-2a7e-4416-8223-120956671eae";} ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/nepsis/hardware-configuration.nix b/hosts/nepsis/hardware-configuration.nix index 9e77966..312756f 100644 --- a/hosts/nepsis/hardware-configuration.nix +++ b/hosts/nepsis/hardware-configuration.nix @@ -7,9 +7,7 @@ pkgs, modulesPath, ... -}: - -{ +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -22,9 +20,9 @@ "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; fileSystems."/" = { device = "/dev/disk/by-uuid/a0aa3a6b-4970-4c7d-b793-57561ed4ae03"; @@ -41,7 +39,7 @@ }; swapDevices = [ - { device = "/dev/disk/by-uuid/1efeebba-c2ce-4ab9-87d6-e986933d7678"; } + {device = "/dev/disk/by-uuid/1efeebba-c2ce-4ab9-87d6-e986933d7678";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/linux-common.nix b/linux-common.nix index 5148a96..aa51e67 100644 --- a/linux-common.nix +++ b/linux-common.nix @@ -42,6 +42,7 @@ fastfetch pamixer gcc + alejandra ]; fonts = { diff --git a/lockscreen.nix b/lockscreen.nix index 2ffb591..d5b395a 100644 --- a/lockscreen.nix +++ b/lockscreen.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: { - + config, + pkgs, + ... +}: { # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -12,7 +14,7 @@ enable = true; package = pkgs.i3lock-color; }; - security.pam.services.betterlockscreen = { }; + security.pam.services.betterlockscreen = {}; services.xserver = { xautolock = { enable = true; @@ -21,5 +23,4 @@ locker = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dimblur"; }; }; - } diff --git a/nvf/keymaps.nix b/nvf/keymaps.nix index 61cdcc8..a9bc375 100644 --- a/nvf/keymaps.nix +++ b/nvf/keymaps.nix @@ -1,5 +1,4 @@ -{ ... }: -[ +{...}: [ # Top Pickers & Explorer { key = ""; diff --git a/nvf/nvf.nix b/nvf/nvf.nix index ff1a3db..0903c5d 100644 --- a/nvf/nvf.nix +++ b/nvf/nvf.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { config.vim = { # core syntaxHighlighting = true; @@ -94,11 +93,11 @@ enable = true; format = { enable = true; - type = [ "alejandra" ]; + type = ["alejandra"]; }; lsp = { enable = true; - servers = [ "nixd" ]; + servers = ["nixd"]; }; treesitter.enable = true; }; @@ -223,7 +222,7 @@ autopairs.nvim-autopairs.enable = true; # keymaps - keymaps = import ./keymaps.nix { }; + keymaps = import ./keymaps.nix {}; # tools extraPackages = with pkgs; [ diff --git a/overlays.nix b/overlays.nix index 7b7f25d..84c6b73 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,14 +1,17 @@ -{ pkgs, inputs, ... }: { + pkgs, + inputs, + ... +}: { nixpkgs.overlays = [ (final: prev: { - lock-screen = import ./scripts/lock-screen.nix { pkgs = prev; }; + lock-screen = import ./scripts/lock-screen.nix {pkgs = prev;}; }) (final: prev: { - scrolling-title = import ./scripts/scrolling-title.nix { pkgs = prev; }; + scrolling-title = import ./scripts/scrolling-title.nix {pkgs = prev;}; }) (final: prev: { - surf_search = import ./scripts/surf_search.nix { pkgs = prev; }; + surf_search = import ./scripts/surf_search.nix {pkgs = prev;}; }) (final: prev: { diff --git a/scripts/lock-screen.nix b/scripts/lock-screen.nix index ca45903..f4610f7 100644 --- a/scripts/lock-screen.nix +++ b/scripts/lock-screen.nix @@ -1,12 +1,12 @@ -{ pkgs }: +{pkgs}: pkgs.writeShellApplication { name = "lock-screen"; - runtimeInputs = [ pkgs.betterlockscreen ]; + runtimeInputs = [pkgs.betterlockscreen]; text = '' - if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then - betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur - fi + if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then + betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur + fi - betterlockscreen -l dimblur - ''; + betterlockscreen -l dimblur + ''; } diff --git a/scripts/scrolling-title.nix b/scripts/scrolling-title.nix index 05eaa53..70a6dd7 100644 --- a/scripts/scrolling-title.nix +++ b/scripts/scrolling-title.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{pkgs}: pkgs.writeShellApplication { name = "scrolling-title"; runtimeInputs = with pkgs; [ @@ -7,7 +7,7 @@ pkgs.writeShellApplication { ]; text = '' WIDTH=20 - PADDING=" " + PADDING=" " RAW_STR=$(mpc current) @@ -17,7 +17,7 @@ pkgs.writeShellApplication { fi STR="$RAW_STR$PADDING" - LEN=''${#STR} + LEN=''${#STR} T=$(date +%s) INDEX=$(( T % LEN )) diff --git a/scripts/surf_search.nix b/scripts/surf_search.nix index e186bdb..3882265 100644 --- a/scripts/surf_search.nix +++ b/scripts/surf_search.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{pkgs}: pkgs.writeShellApplication { name = "surf_search"; runtimeInputs = with pkgs; [ diff --git a/sh.nix b/sh.nix index 2e280dc..4de93db 100644 --- a/sh.nix +++ b/sh.nix @@ -1,5 +1,8 @@ -{ config, pkgs, ... }: { + config, + pkgs, + ... +}: { programs.bash = { enable = true; interactiveShellInit = '' @@ -19,7 +22,6 @@ shellAliases = { nix-sw = "sudo nixos-rebuild switch --flake ."; nix-upd-sl = "sudo nix flake update my-slstatus my-dwm my-surf my-st my-dmenu"; - }; }; diff --git a/vim.nix b/vim.nix index c496418..0c58e42 100644 --- a/vim.nix +++ b/vim.nix @@ -1,17 +1,14 @@ { config, pkgs, - customNeovim, ... -}: -{ - +}: { environment.systemPackages = with pkgs; [ (lib.lowPrio pkgs.vim-full) # Lower Vim's priority (pkgs.writeShellApplication { name = "vi"; - runtimeInputs = [ pkgs.nvi ]; + runtimeInputs = [pkgs.nvi]; text = '' exec ${pkgs.nvi}/bin/vi "$@" ''; @@ -123,5 +120,4 @@ # ''; # }; # }; - } diff --git a/x11.nix b/x11.nix index 743ffd0..47732ac 100644 --- a/x11.nix +++ b/x11.nix @@ -1,5 +1,8 @@ -{ config, pkgs, ... }: { + config, + pkgs, + ... +}: { services.displayManager.ly = { enable = true; settings = { @@ -11,7 +14,6 @@ bigclock = "en"; bigclock_seconds = true; }; - }; services.dunst = { @@ -27,9 +29,9 @@ displayManager = { setupCommands = ""; sessionCommands = '' - #!/bin/sh - ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360 - ${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg' + #!/bin/sh + ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360 + ${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg' ''; }; xkb = { @@ -106,12 +108,12 @@ ExecStart = "${pkgs.sxhkd}/bin/sxhkd"; Restart = "on-failure"; }; - wantedBy = [ "graphical-session.target" ]; + wantedBy = ["graphical-session.target"]; }; systemd.user.services.slstatus = { description = "slstatus bar"; - wantedBy = [ "graphical-session.target" ]; + wantedBy = ["graphical-session.target"]; path = with pkgs; [ pamixer