style: format with alejandra · 42willow.bsky.social/flake@9d1be94

+21 -14

flake.nix

··· 19 19 }; 20 20 }; 21 21 22 - outputs = { self, nixpkgs, home-manager, catppuccin, ... } @ inputs: 23 - let 22 + outputs = { 23 + self, 24 + nixpkgs, 25 + home-manager, 26 + catppuccin, 27 + ... 28 + } @ inputs: let 24 29 username = "willow"; 25 30 system = "x86_64-linux"; 26 31 pkgs = import nixpkgs { 27 - inherit system; 28 - config.allowUnfree = true; 32 + inherit system; 33 + config.allowUnfree = true; 29 34 }; 30 35 lib = nixpkgs.lib; 31 - in 32 - { 33 - nixosConfigurations = { 34 - earthy = nixpkgs.lib.nixosSystem { 35 - inherit system; 36 - modules = [ 36 + in { 37 + nixosConfigurations = { 38 + earthy = nixpkgs.lib.nixosSystem { 39 + inherit system; 40 + modules = [ 37 41 (import ./hosts/earthy) 38 42 catppuccin.nixosModules.catppuccin 39 43 # if you use home-manager 40 44 home-manager.nixosModules.home-manager 41 45 ]; 42 - specialArgs = { host="earthy"; inherit self inputs username ; }; 43 - }; 44 - }; 45 - }; 46 + specialArgs = { 47 + host = "earthy"; 48 + inherit self inputs username; 49 + }; 50 + }; 51 + }; 52 + }; 46 53 }

+16 -18

hosts/earthy/default.nix

··· 1 1 # Edit this configuration file to define what should be installed on 2 2 # your system. Help is available in the configuration.nix(5) man page 3 3 # and in the NixOS manual (accessible by running ‘nixos-help’). 4 - 5 - { pkgs, config, catppuccin, ... }: 6 - 7 4 { 8 - imports = [ # Include the results of the hardware scan. 5 + pkgs, 6 + config, 7 + catppuccin, 8 + ... 9 + }: { 10 + imports = [ 11 + # Include the results of the hardware scan. 9 12 ./hardware-configuration.nix 10 13 ./../../modules/core 11 14 ]; 12 15 13 - catppuccin = { 14 - flavor = "macchiato"; 15 - accent = "pink"; 16 - }; 16 + catppuccin = { 17 + flavor = "macchiato"; 18 + accent = "pink"; 19 + }; 17 20 18 21 console = { 19 22 enable = true; 20 - catppuccin = { 21 - enable = true; 22 - }; 23 + catppuccin = {enable = true;}; 23 24 }; 24 25 25 26 # Bootloader. ··· 37 38 # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. 38 39 39 40 # enable nix flakes! 40 - nix.settings.experimental-features = [ "nix-command" "flakes" ]; 41 + nix.settings.experimental-features = ["nix-command" "flakes"]; 41 42 42 43 # Configure network proxy if necessary 43 44 # networking.proxy.default = "http://user:password@proxy:port/"; ··· 53 54 54 55 # Set your time zone. 55 56 time.timeZone = "Australia/Sydney"; 56 - 57 + 57 58 # Select internationalisation properties. 58 59 i18n.defaultLocale = "en_AU.UTF-8"; 59 60 ··· 113 114 # List packages installed in system profile. To search, run: 114 115 # $ nix search wget 115 116 environment = { 116 - sessionVariables = { 117 - FLAKE = "/etc/nixos"; 118 - }; 119 - 117 + sessionVariables = {FLAKE = "/etc/nixos";}; 118 + 120 119 systemPackages = with pkgs; [ 121 120 vim 122 121 wget ··· 153 152 # Before changing this value read the documentation for this option 154 153 # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). 155 154 system.stateVersion = "24.05"; # Did you read the comment? 156 - 157 155 }

+24 -21

hosts/earthy/hardware-configuration.nix

··· 1 1 # Do not modify this file! It was generated by ‘nixos-generate-config’ 2 2 # and may be overwritten by future invocations. Please make changes 3 3 # to /etc/nixos/configuration.nix instead. 4 - { config, lib, pkgs, modulesPath, ... }: 5 - 6 4 { 7 - imports = 8 - [ (modulesPath + "/installer/scan/not-detected.nix") 9 - ]; 5 + config, 6 + lib, 7 + pkgs, 8 + modulesPath, 9 + ... 10 + }: { 11 + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; 10 12 11 - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; 12 - boot.initrd.kernelModules = [ ]; 13 - boot.kernelModules = [ "kvm-intel" ]; 14 - boot.extraModulePackages = [ ]; 13 + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"]; 14 + boot.initrd.kernelModules = []; 15 + boot.kernelModules = ["kvm-intel"]; 16 + boot.extraModulePackages = []; 15 17 16 - fileSystems."/" = 17 - { device = "/dev/disk/by-uuid/b1df1ad2-a48d-46d9-a197-76b08b03c540"; 18 - fsType = "btrfs"; 19 - options = [ "subvol=@" ]; 20 - }; 18 + fileSystems."/" = { 19 + device = "/dev/disk/by-uuid/b1df1ad2-a48d-46d9-a197-76b08b03c540"; 20 + fsType = "btrfs"; 21 + options = ["subvol=@"]; 22 + }; 21 23 22 - fileSystems."/boot" = 23 - { device = "/dev/disk/by-uuid/0821-BB6D"; 24 - fsType = "vfat"; 25 - options = [ "fmask=0022" "dmask=0022" ]; 26 - }; 24 + fileSystems."/boot" = { 25 + device = "/dev/disk/by-uuid/0821-BB6D"; 26 + fsType = "vfat"; 27 + options = ["fmask=0022" "dmask=0022"]; 28 + }; 27 29 28 - swapDevices = [ ]; 30 + swapDevices = []; 29 31 30 32 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking 31 33 # (the default) this is the recommended approach. When using systemd-networkd it's ··· 37 39 # networking.interfaces.wwan0.useDHCP = lib.mkDefault true; 38 40 39 41 nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 40 - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; 42 + hardware.cpu.intel.updateMicrocode = 43 + lib.mkDefault config.hardware.enableRedistributableFirmware; 41 44 }

+4 -1

justfile

··· 10 10 sudo nixos-rebuild switch --upgrade --flake /etc/nixos#earthy 11 11 12 12 boot: 13 - sudo nixos-rebuild boot --flake /etc/nixos#earthy 13 + sudo nixos-rebuild boot --flake /etc/nixos#earthy 14 + 15 + format: 16 + alejandra *

+10 -5

modules/core/default.nix

··· 1 - { inputs, nixpkgs, self, username, host, ...}: 2 1 { 3 - imports = 4 - [ (import ./user.nix) ]; 5 - # ++ [ (import ./user.nix) ] 6 - } 2 + inputs, 3 + nixpkgs, 4 + self, 5 + username, 6 + host, 7 + ... 8 + }: { 9 + imports = [(import ./user.nix)]; 10 + # ++ [ (import ./user.nix) ] 11 + }

+11 -12

modules/core/user.nix

··· 1 - { pkgs, inputs, username, ...}: 2 1 { 3 - imports = [ 4 - inputs.home-manager.nixosModules.home-manager 5 - ]; 2 + pkgs, 3 + inputs, 4 + username, 5 + ... 6 + }: { 7 + imports = [inputs.home-manager.nixosModules.home-manager]; 6 8 home-manager = { 7 9 useUserPackages = true; 8 10 useGlobalPkgs = true; 9 - extraSpecialArgs = { inherit inputs username; }; 11 + extraSpecialArgs = {inherit inputs username;}; 10 12 users.${username} = { 11 - imports = [ 12 - ./../home 13 - inputs.catppuccin.homeManagerModules.catppuccin 14 - ]; 13 + imports = [./../home inputs.catppuccin.homeManagerModules.catppuccin]; 15 14 home.username = "${username}"; 16 15 home.homeDirectory = "/home/${username}"; 17 16 home.stateVersion = "24.05"; ··· 22 21 users.users.${username} = { 23 22 isNormalUser = true; 24 23 description = "${username}"; 25 - extraGroups = [ "networkmanager" "wheel" "dialout" ]; 24 + extraGroups = ["networkmanager" "wheel" "dialout"]; 26 25 }; 27 - nix.settings.allowed-users = [ "${username}" ]; 28 - } 26 + nix.settings.allowed-users = ["${username}"]; 27 + }

+26 -25

modules/home/default.nix

··· 1 - { pkgs, config, lib, catppuccin, inputs, username, host, ... }: 2 - 3 1 { 2 + pkgs, 3 + config, 4 + lib, 5 + catppuccin, 6 + inputs, 7 + username, 8 + host, 9 + ... 10 + }: { 4 11 imports = 5 - [(import ./dotfiles)] 12 + [(import ./dotfiles)] 6 13 ++ [(import ./spicetify.nix)] 7 14 ++ [(import ./packages.nix)]; 8 - 9 - catppuccin = { 10 - flavor = "macchiato"; 11 - accent = "pink"; 15 + 16 + catppuccin = { 17 + flavor = "macchiato"; 18 + accent = "pink"; 12 19 enable = true; 13 - }; 20 + }; 14 21 15 22 programs.kitty = { 16 - enable = true; 17 - settings = { 18 - confirm_os_window_close = 0; 19 - background_opacity = "0.8"; 20 - cursor_blink_interval = 0; 21 - mouse_hide_wait = 0; 22 - }; 23 - }; 24 - 25 - programs.bat = { 26 23 enable = true; 24 + settings = { 25 + confirm_os_window_close = 0; 26 + background_opacity = "0.8"; 27 + cursor_blink_interval = 0; 28 + mouse_hide_wait = 0; 29 + }; 27 30 }; 28 31 32 + programs.bat = {enable = true;}; 33 + 29 34 programs.tofi = { 30 35 enable = true; 31 36 settings = { ··· 45 50 }; 46 51 }; 47 52 48 - programs.btop = { 49 - enable = true; 50 - }; 53 + programs.btop = {enable = true;}; 51 54 52 - programs.bun = { 53 - enable = true; 54 - }; 55 + programs.bun = {enable = true;}; 55 56 56 57 gtk = { 57 58 enable = true; ··· 71 72 72 73 home.activation = { 73 74 # https://github.com/philj56/tofi/issues/115#issuecomment-1701748297 74 - regenerateTofiCache = lib.hm.dag.entryAfter [ "writeBoundary" ] '' 75 + regenerateTofiCache = lib.hm.dag.entryAfter ["writeBoundary"] '' 75 76 tofi_cache=${config.xdg.cacheHome}/tofi-drun 76 77 [[ -f "$tofi_cache" ]] && rm "$tofi_cache" 77 78 '';

+2 -3

modules/home/dotfiles/default.nix

··· 1 - { inputs, ... }: 2 - { 1 + {inputs, ...}: { 3 2 home.file = { 4 3 ".config/hypr".source = ./hypr; 5 4 # ".config/tofi".source = dotfiles/tofi; ··· 14 13 # org.gradle.daemon.idletimeout=3600000 15 14 # ''; 16 15 }; 17 - } 16 + }

+34 -30

modules/home/packages.nix

··· 1 - { inputs, pkgs, ... }: 2 1 { 3 - home.packages = (with pkgs; [ 4 - pkgs.xdg-desktop-portal-hyprland 5 - pkgs.hyprlock 6 - pkgs.hypridle 7 - pkgs.hyprpaper 8 - pkgs.hyprpicker 9 - pkgs.hyprcursor 2 + inputs, 3 + pkgs, 4 + ... 5 + }: { 6 + home.packages = with pkgs; [ 7 + xdg-desktop-portal-hyprland 8 + hyprlock 9 + hypridle 10 + hyprpaper 11 + hyprpicker 12 + hyprcursor 10 13 # Core 11 - pkgs.firefox 12 - pkgs.keepassxc 13 - pkgs.gnome.nautilus 14 - pkgs.gparted 15 - pkgs.blueman 14 + firefox 15 + keepassxc 16 + gnome.nautilus 17 + gparted 18 + blueman 16 19 # Programming 17 - pkgs.kitty 18 - pkgs.vscode 20 + kitty 21 + vscode 19 22 # Fun 20 - pkgs.prismlauncher 21 - pkgs.vesktop 22 - pkgs.aseprite 23 + prismlauncher 24 + vesktop 25 + aseprite 23 26 # Work 24 - pkgs.obsidian 25 - pkgs.activitywatch 27 + obsidian 28 + activitywatch 26 29 # CLI 27 - pkgs.tldr 28 - pkgs.fastfetch 29 - pkgs.just 30 + tldr 31 + fastfetch 32 + just 33 + alejandra 30 34 # Screen 31 - pkgs.grim 32 - pkgs.slurp 33 - pkgs.wl-clipboard 34 - pkgs.ddcutil 35 - pkgs.brightnessctl 36 - ]); 37 - } 35 + grim 36 + slurp 37 + wl-clipboard 38 + ddcutil 39 + brightnessctl 40 + ]; 41 + }

+10 -13

modules/home/spicetify.nix

··· 1 - { pkgs, lib, inputs, ...}: 2 - 3 - let 4 - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; 5 - in 6 1 { 2 + pkgs, 3 + lib, 4 + inputs, 5 + ... 6 + }: let 7 + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; 8 + in { 7 9 imports = [inputs.spicetify-nix.homeManagerModules.default]; 8 10 9 11 nixpkgs.config.allowUnfreePredicate = pkg: 10 - builtins.elem (lib.getName pkg) [ 11 - "spotify" 12 - ]; 12 + builtins.elem (lib.getName pkg) ["spotify"]; 13 13 14 14 programs.spicetify = { 15 15 enable = true; ··· 18 18 hidePodcasts 19 19 shuffle 20 20 ]; 21 - enabledCustomApps = with spicePkgs.apps; [ 22 - lyricsPlus 23 - newReleases 24 - ]; 21 + enabledCustomApps = with spicePkgs.apps; [lyricsPlus newReleases]; 25 22 enabledSnippets = with spicePkgs.snippets; [ 26 23 pointer 27 24 smooth-progress-bar ··· 32 29 theme = spicePkgs.themes.catppuccin; 33 30 colorScheme = "macchiato"; 34 31 }; 35 - } 32 + }

Configure Feed

Configure Feed