$ nix fmt

Changes

14 changed files (+60/-92)

• essentials/default.nix
  • @@ -1,9 +1,8 @@
    # Essential modules: every machine should include this module. # Should covers everything from admin task to daily usages. # Other modules assumes this is included. - { catppuccinTheme }: - { ... }: { - xdg = { enable = true; }; + {catppuccinTheme}: {...}: { + xdg = {enable = true;}; imports = [ (
  • @@ -24,4 +23,3 @@ )
    ./zsh.nix ]; } -
• essentials/neovim.nix
  • @@ -1,7 +1,4 @@
    - { - catppuccinTheme, - }: - { + {catppuccinTheme}: { config, pkgs, ...
  • @@ -64,4 +61,3 @@ ];
    }; }; } -
• essentials/tmux.nix
  • @@ -1,7 +1,4 @@
    - { - catppuccinTheme, - }: - { + {catppuccinTheme}: { config, pkgs, ...
  • @@ -68,5 +65,3 @@ '';
    }; }; } - -
• essentials/tools.nix
  • @@ -1,17 +1,12 @@
    - { - catppuccinTheme, - }: - { + {catppuccinTheme}: { config, pkgs, ... - }: - { + }: { home.packages = [ # Must-have networking CLI tool # https://curl.se/ pkgs.curl - # A generator for LS_COLORS with support for multiple color themes # https://github.com/sharkdp/vivid
  • @@ -44,7 +39,10 @@ # https://github.com/gokcehan/lf
    lf = let # Linux: xdg-open # macOS: open - openCommand = if pkgs.stdenv.isLinux then "xdg-open" else "open"; + openCommand = + if pkgs.stdenv.isLinux + then "xdg-open" + else "open"; in { enable = true;
  • @@ -79,7 +77,8 @@ owner = "catppuccin";
    repo = "bat"; rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; sha256 = "1g2r6j33f4zys853i1c5gnwcdbwb6xv5w6pazfdslxf69904lrg9"; - } + "/Catppuccin-${catppuccinTheme}.tmTheme" + } + + "/Catppuccin-${catppuccinTheme}.tmTheme" ); };
  • @@ -95,8 +94,3 @@ enable = true;
    }; }; } - - - - -
• essentials/zsh.nix
  • @@ -69,4 +69,3 @@ '';
    }; }; } -
• flake.nix
  • @@ -42,31 +42,37 @@ system,
    # OS username username, # Modules to include - modules ? [ mods.essentials ], + modules ? [mods.essentials], # Timezone of the machine timezone ? "Asia/Tokyo", }: let isDarwin = (builtins.match "-darwin$" system) != null; - homeDir = if isDarwin then "/Users" else "/home"; - in home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; + homeDir = + if isDarwin + then "/Users" + else "/home"; + in + home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; - modules = [ - { - home = rec { - inherit username; - homeDirectory = "${homeDir}/${username}"; - stateVersion = "23.11"; - sessionVariables = { - TZ = timezone; - }; - }; + modules = + [ + { + home = rec { + inherit username; + homeDirectory = "${homeDir}/${username}"; + stateVersion = "23.11"; + sessionVariables = { + TZ = timezone; + }; + }; - # Turn off Home Manager news bs - news.display = "silent"; - } - ] ++ modules; - }; + # Turn off Home Manager news bs + news.display = "silent"; + } + ] + ++ modules; + }; availableSystems = [ "aarch64-darwin"
  • @@ -124,4 +130,3 @@ availableSystems
    ); }; } -
• scm/default.nix
  • @@ -2,7 +2,7 @@ # SCM module: SCM/VCS tools and their configurations.
    { username, email, - }: { ... }: { + }: {...}: { imports = [ ( import ./git.nix {
  • @@ -12,6 +12,3 @@ )
    ./fossil.nix ]; } - - -
• scm/fossil.nix
  • @@ -3,10 +3,5 @@ config,
    pkgs, ... }: { - home.packages = with pkgs; [ fossil ]; + home.packages = with pkgs; [fossil]; } - - - - -
• scm/git.nix
  • @@ -1,8 +1,7 @@
    { username, email, - }: - { + }: { config, pkgs, ...
  • @@ -58,4 +57,3 @@ maxCacheTtlSsh = 2592000;
    }; }; } -
• shell.nix
  • @@ -1,20 +1,22 @@
    # Shell for using home-manager & Flakes without installing/configuring. # Based on: # https://github.com/Misterio77/nix-config/blob/68939a161c97bb875fb1ead17c172c36de24bd01/shell.nix - { pkgs ? - let - lock = ( - builtins.fromJSON (builtins.readFile ./flake.lock) - ).nodes.nixpkgs.locked; + {pkgs ? let + lock = + ( + builtins.fromJSON (builtins.readFile ./flake.lock) + ) + .nodes + .nixpkgs + .locked; - # Pin nixpkgs, so the shell can be invoked without channels - nixpkgs = fetchTarball { - url = "https://github.com/${lock.owner}/${lock.repo}/archive/${lock.rev}.tar.gz"; - sha256 = lock.narHash; - }; - in import nixpkgs { overlays = []; }, - ... - }: { + # Pin nixpkgs, so the shell can be invoked without channels + nixpkgs = fetchTarball { + url = "https://github.com/${lock.owner}/${lock.repo}/archive/${lock.rev}.tar.gz"; + sha256 = lock.narHash; + }; + in + import nixpkgs {overlays = [];}, ...}: { default = pkgs.mkShell { shellHook = '' export NIX_CONFIG="experimental-features = nix-command flakes"
• wayland-de/default.nix
  • @@ -1,6 +1,5 @@
    # Wayland Desktop Environment - { catppuccinTheme }: - { ... }: { + {catppuccinTheme}: {...}: { # I'm not sure this changes behaviour in a meaningful way. targets.genericLinux = { enable = true;
  • @@ -20,5 +19,3 @@ }
    ) ]; } - -
• wayland-de/foot.nix
  • @@ -1,7 +1,4 @@
    - { - catppuccinTheme, - }: - { + {catppuccinTheme}: { config, pkgs, ...
  • @@ -55,9 +52,9 @@ owner = "catppuccin";
    repo = "foot"; rev = "009cd57bd3491c65bb718a269951719f94224eb7"; sha256 = "0f0r8d4rn54gibrzfhiy4yr8bi7c8j18ggp1y9lyidc1dmy9kvw0"; - } + "/catppuccin-${catppuccinTheme}.conf" + } + + "/catppuccin-${catppuccinTheme}.conf" ); }; }; } -
• webdev/default.nix
  • @@ -1,7 +1,5 @@
    - { ... }: { + {...}: { imports = [ ./neovim.nix ]; } - -
• webdev/neovim.nix
  • @@ -42,6 +42,3 @@ ];
    }; }; } - - -