Nix/System
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reformat

Browse source
This commit is contained in:
Nathan McCarty 2025-01-13 14:53:42 -05:00
parent ac3825e6f9
commit 29fd118635
22 changed files with 424 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

106
home-manager/machines/crash/home.nix
View file

@ -1,61 +1,67 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.homeConfigurations.crash = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = {
inherit inputs inputs';
packages = config.packages;
};
modules = [
(
{
config,
lib,
pkgs,
...
}:
{
imports = [
../../modules/programs/shell.nix
../../modules/programs/neovim.nix
(import ../../modules/programs/git.nix { })
../../modules/programs/core.nix
../../modules/programs/devel.nix
../../modules/programs/ssh.nix
(import ../../modules/programs/emacs.nix { })
../../modules/programs/fonts.nix
../../modules/programs/desktop.nix
];
home.username = "nathan";
home.homeDirectory = "/home/nathan/";
programs.command-not-found.enable = true;
home.stateVersion = "24.11";
programs.home-manager.enable = true;
ctx @ {
config,
inputs',
...
}:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = {
inherit inputs inputs';
packages = config.packages;
};
modules = [
(
{
config,
lib,
pkgs,
...
}: {
imports = [
../../modules/programs/shell.nix
../../modules/programs/neovim.nix
(import ../../modules/programs/git.nix {})
../../modules/programs/core.nix
../../modules/programs/devel.nix
../../modules/programs/ssh.nix
(import ../../modules/programs/emacs.nix {})
../../modules/programs/fonts.nix
../../modules/programs/desktop.nix
];
home.username = "nathan";
home.homeDirectory = "/home/nathan/";
programs.command-not-found.enable = true;
home.stateVersion = "24.11";
programs.home-manager.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Machine specific configuration
services.emacs.defaultEditor = true;
# Machine specific configuration
services.emacs.defaultEditor = true;
systemd.user = {
targets.tray = {
Unit = {
Description = "Home Manager System Tray";
Requires = [ "graphical-session.target" ];
systemd.user = {
targets.tray = {
Unit = {
Description = "Home Manager System Tray";
Requires = ["graphical-session.target"];
};
};
services.syncthingtray = {
Service.ExecStart = lib.mkForce "${pkgs.syncthingtray}/bin/syncthingtray --wait";
};
};
services.syncthingtray = {
Service.ExecStart = lib.mkForce "${pkgs.syncthingtray}/bin/syncthingtray --wait";
};
};
}
)
];
}
}
)
];
}
);
}

92
home-manager/machines/wsl/home.nix
View file

@ -1,51 +1,57 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.homeConfigurations.wsl = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = {
inherit inputs inputs';
packages = config.packages;
};
modules = [
(
{
config,
lib,
pkgs,
...
}:
{
imports = [
../../modules/programs/shell.nix
../../modules/programs/neovim.nix
(import ../../modules/programs/git.nix { })
../../modules/programs/core.nix
../../modules/programs/devel.nix
../../modules/programs/ssh.nix
(import ../../modules/programs/emacs.nix { })
../../modules/programs/fonts.nix
];
home.username = "nathan";
home.homeDirectory = "/home/nathan/";
programs.command-not-found.enable = true;
home.stateVersion = "24.11";
programs.home-manager.enable = true;
ctx @ {
config,
inputs',
...
}:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = {
inherit inputs inputs';
packages = config.packages;
};
modules = [
(
{
config,
lib,
pkgs,
...
}: {
imports = [
../../modules/programs/shell.nix
../../modules/programs/neovim.nix
(import ../../modules/programs/git.nix {})
../../modules/programs/core.nix
../../modules/programs/devel.nix
../../modules/programs/ssh.nix
(import ../../modules/programs/emacs.nix {})
../../modules/programs/fonts.nix
];
home.username = "nathan";
home.homeDirectory = "/home/nathan/";
programs.command-not-found.enable = true;
home.stateVersion = "24.11";
programs.home-manager.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Machine specific configuration
programs.nushell.environmentVariables = {
VISUAL = "nvim";
EDITOR = "nvim";
};
}
)
];
}
# Machine specific configuration
programs.nushell.environmentVariables = {
VISUAL = "nvim";
EDITOR = "nvim";
};
}
)
];
}
);
}

10
home-manager/modules/programs/core.nix
View file

@ -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;
}

5
home-manager/modules/programs/desktop.nix
View file

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

4
home-manager/modules/programs/devel.nix
View file

@ -4,9 +4,7 @@
pkgs,
inputs',
...
}:
{
}: {
home.packages = with pkgs; [
# Git addons
git-secret

33
home-manager/modules/programs/emacs.nix
View file

@ -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;
in
{
emacsPackage' =
if emacsPackage == null
then pkgs.emacs29-pgtk
else emacsPackage;
in {
home.packages = with pkgs; [
# For markdown rendering
python312Packages.grip
@ -48,7 +46,7 @@ in
comment = "Org protocol";
desktopName = "org-protocol";
type = "Application";
mimeTypes = [ "x-scheme-handler/org-protocol" ];
mimeTypes = ["x-scheme-handler/org-protocol"];
})
# For format output
# wkhtmltopdf
@ -56,19 +54,20 @@ in
programs.emacs = {
enable = true;
package = emacsPackage';
extraPackages =
epkgs: with pkgs; [
extraPackages = epkgs:
with pkgs; [
epkgs.mu4e
epkgs.vterm
epkgs.pdf-tools
epkgs.emacsql
epkgs.emacsql-sqlite
(tree-sitter.withPlugins (
grammars: with grammars; [
tree-sitter-nix
tree-sitter-rust
tree-sitter-toml
]
grammars:
with grammars; [
tree-sitter-nix
tree-sitter-rust
tree-sitter-toml
]
))
];
};

8
home-manager/modules/programs/fonts.nix
View file

@ -3,9 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
fonts.fontconfig = {
enable = true;
defaultFonts = {
@ -13,8 +11,8 @@
"Noto Emoji"
"Noto Color Emoji"
];
monospace = [ "JetBrainsMono-NF-Regular" ];
sansSerif = [ "Roboto" ];
monospace = ["JetBrainsMono-NF-Regular"];
sansSerif = ["Roboto"];
};
};

7
home-manager/modules/programs/git.nix
View file

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

4
home-manager/modules/programs/neovim.nix
View file

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

5
home-manager/modules/programs/shell.nix
View file

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

4
home-manager/modules/programs/ssh.nix
View file

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