GC slightly less agressively

devshells/idris2.nix

@@ -1,24 +1,23 @@
-{ withSystem, inputs, ... }:
-{
-  perSystem =
 {
+  withSystem,
+  inputs,
+  ...
+}: {
+  perSystem = {
     config,
     pkgs,
     lib,
     inputs',
     ...
-    }:
+  }: {
-    {
+    devShells.idris2 = let
-      devShells.idris2 =
-        let
       libPackages = with pkgs; [
         readline70
         openssl
       ];
     in
       pkgs.mkShell {
-          buildInputs =
+        buildInputs = with pkgs;
-            with pkgs;
           [
             # Idris toolchain
             inputs'.nixpkgs-unstable.legacyPackages.idris2Packages.pack

devshells/markdown.nix

@@ -0,0 +1,25 @@
+{
+  withSystem,
+  inputs,
+  ...
+}: {
+  perSystem = {
+    config,
+    pkgs,
+    lib,
+    inputs',
+    ...
+  }: {
+    devShells.markdown = pkgs.mkShell {
+      buildInputs = with pkgs; [
+        (python3.withPackages (ps:
+          with ps; [
+            mdformat
+            mdformat-gfm
+            mdformat-tables
+            mdformat-footnote
+          ]))
+      ];
+    };
+  };
+}

devshells/raku.nix

@@ -1,16 +1,16 @@
-{ withSystem, inputs, ... }:
-{
-  perSystem =
 {
+  withSystem,
+  inputs,
+  ...
+}: {
+  perSystem = {
     config,
     pkgs,
     lib,
     inputs',
     ...
-    }:
+  }: {
-    {
+    devShells.raku = let
-      devShells.raku =
-        let
       rakudo_env = pkgs.buildEnv {
         name = "rakudo-env";
         paths = with pkgs; [
@@ -26,8 +26,7 @@
       libPackages = with pkgs; [readline70];
     in
       pkgs.mkShell {
-          buildInputs =
+        buildInputs = with pkgs;
-            with pkgs;
           [
             # Raku toolchain
             rakudo_env

devshells/rust.nix

@@ -1,8 +1,13 @@
-{ withSystem, inputs, ... }:
-{
-  perSystem =
-    { config, pkgs, ... }:
 {
+  withSystem,
+  inputs,
+  ...
+}: {
+  perSystem = {
+    config,
+    pkgs,
+    ...
+  }: {
     devShells.rust = pkgs.mkShell {
       buildInputs = with pkgs; [
         # Rust toolchain

flake.nix

@@ -20,8 +20,11 @@
     };
   };
 
-  outputs =
+  outputs = inputs @ {
-    inputs@{ flake-parts, self, ... }:
+    flake-parts,
+    self,
+    ...
+  }:
     flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
         inputs.devshell.flakeModule
@@ -33,6 +36,7 @@
         ./devshells/rust.nix
         ./devshells/idris2.nix
         ./devshells/raku.nix
+        ./devshells/markdown.nix
       ];
       config = {
         systems = [
@@ -41,16 +45,14 @@
           "aarch64-darwin"
           "x86_64-darwin"
         ];
-        perSystem =
+        perSystem = {
-          {
           config,
           self',
           inputs',
           pkgs,
           system,
           ...
-          }:
+        }: {
-          {
           # Per-system attributes can be defined here. The self' and inputs'
           # module parameters provide easy access to attributes of the same
           # system.
@@ -65,7 +67,6 @@
             type = types.lazyAttrsOf types.raw;
             default = {};
           };
-
         };
       };
     };

home-manager/machines/crash/home.nix

@@ -1,9 +1,16 @@
-{ withSystem, inputs, ... }:
 {
+  withSystem,
+  inputs,
+  ...
+}: {
   # perSystem = { ... }: { config.packages.hello = ...; };
 
   flake.homeConfigurations.crash = withSystem "x86_64-linux" (
-    ctx@{ config, inputs', ... }:
+    ctx @ {
+      config,
+      inputs',
+      ...
+    }:
       inputs.home-manager.lib.homeManagerConfiguration {
         pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
         extraSpecialArgs = {
@@ -17,8 +24,7 @@
               lib,
               pkgs,
               ...
-          }:
+            }: {
-          {
               imports = [
                 ../../modules/programs/shell.nix
                 ../../modules/programs/neovim.nix
@@ -42,10 +48,15 @@
               # Machine specific configuration
               services.emacs.defaultEditor = true;
 
-            systemd.user.targets.tray = {
+              systemd.user = {
+                targets.tray = {
                   Unit = {
                     Description = "Home Manager System Tray";
-                Requires = [ "graphical-session-pre.target" ];
+                    Requires = ["graphical-session.target"];
+                  };
+                };
+                services.syncthingtray = {
+                  Service.ExecStart = lib.mkForce "${pkgs.syncthingtray}/bin/syncthingtray --wait";
                 };
               };
             }

home-manager/machines/wsl/home.nix

@@ -1,9 +1,16 @@
-{ withSystem, inputs, ... }:
 {
+  withSystem,
+  inputs,
+  ...
+}: {
   # perSystem = { ... }: { config.packages.hello = ...; };
 
   flake.homeConfigurations.wsl = withSystem "x86_64-linux" (
-    ctx@{ config, inputs', ... }:
+    ctx @ {
+      config,
+      inputs',
+      ...
+    }:
       inputs.home-manager.lib.homeManagerConfiguration {
         pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
         extraSpecialArgs = {
@@ -17,8 +24,7 @@
               lib,
               pkgs,
               ...
-          }:
+            }: {
-          {
               imports = [
                 ../../modules/programs/shell.nix
                 ../../modules/programs/neovim.nix

home-manager/modules/programs/core.nix

@@ -3,9 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   home.packages = with pkgs; [
     # Rust rewrites of cli stuff
     fd
@@ -41,7 +39,10 @@
     aggressiveResize = true;
     keyMode = "vi";
     shortcut = "x";
-    terminal = if pkgs.stdenv.isLinux then "tmux-256color" else "screen-256color";
+    terminal =
+      if pkgs.stdenv.isLinux
+      then "tmux-256color"
+      else "screen-256color";
     escapeTime = 100;
     plugins = with pkgs; [
       tmuxPlugins.cpu
@@ -56,5 +57,4 @@
   };
   programs.btop.enable = true;
   programs.jq.enable = true;
-
 }

home-manager/modules/programs/desktop.nix

@@ -4,9 +4,7 @@
   pkgs,
   inputs',
   ...
-}:
+}: {
-
-{
   home.packages = with pkgs; [
     # Communications
     webcord-vencord
@@ -27,5 +25,4 @@
       enable = true;
     };
   };
-
 }

home-manager/modules/programs/devel.nix

@@ -2,10 +2,9 @@
   config,
   lib,
   pkgs,
+  inputs',
   ...
-}:
+}: {
-
-{
   home.packages = with pkgs; [
     # Git addons
     git-secret
@@ -15,6 +14,10 @@
     nix-du
     sops
     hut
+    # Markdown
+    cmark-gfm
+    pandoc
+    mdbook
   ];
   programs = {
     direnv.enable = true;

home-manager/modules/programs/emacs.nix

@@ -1,21 +1,19 @@
-{
+{emacsPackage ? null}: {
-  emacsPackage ? null,
-}:
-{
   config,
   lib,
   pkgs,
   ...
-}:
+}: let
-let
   myAspell = pkgs.aspellWithDicts (d: [
     d.en
     d.en-science
     d.en-computers
   ]);
-  emacsPackage' = if emacsPackage == null then pkgs.emacs29-pgtk else emacsPackage;
+  emacsPackage' =
-in
+    if emacsPackage == null
-{
+    then pkgs.emacs29-pgtk
+    else emacsPackage;
+in {
   home.packages = with pkgs; [
     # For markdown rendering
     python312Packages.grip
@@ -56,15 +54,16 @@ in
   programs.emacs = {
     enable = true;
     package = emacsPackage';
-    extraPackages =
+    extraPackages = epkgs:
-      epkgs: with pkgs; [
+      with pkgs; [
         epkgs.mu4e
         epkgs.vterm
         epkgs.pdf-tools
         epkgs.emacsql
         epkgs.emacsql-sqlite
         (tree-sitter.withPlugins (
-          grammars: with grammars; [
+          grammars:
+            with grammars; [
               tree-sitter-nix
               tree-sitter-rust
               tree-sitter-toml

home-manager/modules/programs/fonts.nix

@@ -3,9 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   fonts.fontconfig = {
     enable = true;
     defaultFonts = {

home-manager/modules/programs/git.nix

@@ -1,15 +1,12 @@
 {
   gitUserName ? "Nathan McCarty",
   gitUserEmail ? "thatonelutenist@stranger.systems",
-}:
+}: {
-{
   config,
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   programs.git = {
     enable = true;
     package = pkgs.gitAndTools.gitFull;

home-manager/modules/programs/neovim.nix

@@ -3,9 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   programs.neovim = {
     enable = true;
     viAlias = true;

home-manager/modules/programs/shell.nix

@@ -3,9 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   programs.nushell = {
     enable = true;
     configFile.source = ./nushell/config.nu;
@@ -64,5 +62,4 @@
   };
 
   programs.fzf.enable = true;
-
 }

home-manager/modules/programs/ssh.nix

@@ -3,9 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   programs.ssh = {
     # SSH configuration
     enable = true;

nixos/machines/crash/configuration.nix

@@ -1,13 +1,15 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
   ];
 
+  # Setup nixbuild.net, since this laptop is somewhat under powered
   programs.ssh.extraConfig = ''
     Host eu.nixbuild.net
     PubkeyAcceptedKeyTypes ssh-ed25519
@@ -15,7 +17,6 @@
     IPQoS throughput
     IdentityFile /home/nathan/.ssh/id_ed25519
   '';
-
   programs.ssh.knownHosts = {
     nixbuild = {
       hostNames = ["eu.nixbuild.net"];
@@ -23,17 +24,20 @@
     };
   };
 
+  # Configure nix
   nix = {
     settings = {
+      # Auto optimize the store after every action
       auto-optimise-store = true;
       trusted-users = [
         "root"
         "nathan"
       ];
     };
+    # GC agressively
     gc = {
       automatic = true;
-      dates = "hourly";
+      dates = "daily";
       options = "--delete-older-than 7d";
     };
     distributedBuilds = true;
@@ -50,9 +54,30 @@
     ];
   };
 
-  # Bootloader.
+  # Bootloader and plymouth
-  boot.loader.systemd-boot.enable = true;
+  boot = {
-  boot.loader.efi.canTouchEfiVariables = true;
+    loader = {
+      systemd-boot = {
+        enable = true;
+        consoleMode = "auto";
+      };
+      efi.canTouchEfiVariables = true;
+    };
+    plymouth = {
+      enable = true;
+    };
+  };
+
+  # Steam setup
+  programs.steam = {
+    enable = true;
+    gamescopeSession = {
+      enable = true;
+      args = [
+        "--expose-wayland"
+      ];
+    };
+  };
 
   networking.hostName = "crash"; # Define your hostname.
 
@@ -161,5 +186,4 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
 
   system.stateVersion = "24.11"; # Did you read the comment?
-
 }

nixos/machines/crash/hardware.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

nixos/machines/crash/machine.nix

@@ -1,9 +1,16 @@
-{ withSystem, inputs, ... }:
 {
+  withSystem,
+  inputs,
+  ...
+}: {
   # perSystem = { ... }: { config.packages.hello = ...; };
 
   flake.nixosConfigurations.crash = withSystem "x86_64-linux" (
-    ctx@{ config, inputs', ... }:
+    ctx @ {
+      config,
+      inputs',
+      ...
+    }:
       inputs.nixpkgs.lib.nixosSystem {
         # Expose `packages`, `inputs` and `inputs'` as module arguments.
         # Use specialArgs permits use in `imports`.
@@ -20,9 +27,7 @@
               lib,
               pkgs,
               ...
-          }:
+            }: {
-
-          {
               imports = [
                 # Hardware support
                 inputs.nixos-hardware.nixosModules.microsoft-surface-common
@@ -40,7 +45,6 @@
                 "nix-command"
                 "flakes"
               ];
-
             }
           )
         ];

nixos/machines/installer/configuration.nix

@@ -1,9 +1,16 @@
-{ withSystem, inputs, ... }:
 {
+  withSystem,
+  inputs,
+  ...
+}: {
   # perSystem = { ... }: { config.packages.hello = ...; };
 
   flake.nixosConfigurations.inst = withSystem "x86_64-linux" (
-    ctx@{ config, inputs', ... }:
+    ctx @ {
+      config,
+      inputs',
+      ...
+    }:
       inputs.nixpkgs.lib.nixosSystem {
         # Expose `packages`, `inputs` and `inputs'` as module arguments.
         # Use specialArgs permits use in `imports`.
@@ -20,15 +27,12 @@
           (
             # NixOS-WSL specific options are documented on the NixOS-WSL repository:
             # https://github.com/nix-community/NixOS-WSL
-
             {
               config,
               lib,
               pkgs,
               ...
-          }:
+            }: {
-
-          {
               imports = [
               ];
               nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

nixos/machines/wsl/configuration.nix

@@ -1,9 +1,16 @@
-{ withSystem, inputs, ... }:
 {
+  withSystem,
+  inputs,
+  ...
+}: {
   # perSystem = { ... }: { config.packages.hello = ...; };
 
   flake.nixosConfigurations.wsl = withSystem "x86_64-linux" (
-    ctx@{ config, inputs', ... }:
+    ctx @ {
+      config,
+      inputs',
+      ...
+    }:
       inputs.nixpkgs.lib.nixosSystem {
         # Expose `packages`, `inputs` and `inputs'` as module arguments.
         # Use specialArgs permits use in `imports`.
@@ -17,15 +24,12 @@
           (
             # NixOS-WSL specific options are documented on the NixOS-WSL repository:
             # https://github.com/nix-community/NixOS-WSL
-
             {
               config,
               lib,
               pkgs,
               ...
-          }:
+            }: {
-
-          {
               imports = [
                 # WSL support
                 inputs.nixos-wsl.nixosModules.default

nixos/modules/base.nix

@@ -1,12 +1,9 @@
-{ inputs }:
+{inputs}: {
-{
   config,
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   imports = [
     inputs.lix-module.nixosModules.default
   ];
@@ -20,7 +17,7 @@
     neovim
     git
     tmux
-    nixfmt-rfc-style
+    alejandra
     nix-index
   ];
 

nixos/modules/user.nix

@@ -3,15 +3,12 @@
   mutableUsers ? false,
   username ? "nathan",
   homedir ? "/home/nathan",
-}:
+}: {
-{
   config,
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   security.polkit = {
     enable = true;
   };
@@ -30,6 +27,5 @@
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos"
       ];
     };
-
   };
 }