This commit is contained in:
sadan 2024-05-27 14:09:56 -04:00
parent dcd354ca61
commit 7afd6626c4
No known key found for this signature in database
11 changed files with 85 additions and 4252 deletions

View file

@ -6,10 +6,32 @@
{ config, lib, pkgs, inputs, ... }:
{
imports = [
inputs.sops-nix.nixosModules.sops
];
sops.defaultSopsFile = ../../secrets.yaml;
sops.defaultSopsFormat = "yaml";
sops.age.keyFile = "/home/meyer/.config/sops/age/keys.txt";
sops.secrets.password.neededForUsers = true;
wsl.enable = true;
wsl.defaultUser = "meyer";
# Use the systemd-boot EFI boot loader.
users.users.meyer = {
isNormalUser = true;
hashedPasswordFile = config.sops.secrets.password.path;
extraGroups = [
"wheel" # Enable sudo for the user.
"input"
"tty"
];
shell = pkgs.zsh;
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"meyer" = import ./home.nix;
};
};
boot.kernelPackages = pkgs.linuxPackages_zen;
hardware.i2c.enable = true;
networking.hostName = "nix-wsl"; # Define your hostname.
@ -43,15 +65,6 @@
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.meyer = {
isNormalUser = true;
extraGroups = [
"wheel" # Enable sudo for the user.
"input"
"tty"
];
shell = pkgs.zsh;
};
@ -60,12 +73,6 @@
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"meyer" = import ./home.nix;
};
};
# networking.nameservers = ["10.0.0.97" "1.1.1.1"];
networking.nameservers = [ "10.0.0.97" ];
# List packages installed in system profile. To search, run:

View file

@ -1,7 +1,10 @@
{ config, lib, pkgs, inputs, ... }:
let
cpkg = import ../../customPackages { inherit pkgs; };
files = import ../../common/files.nix { inherit config; };
shell = import ../../common/shell.nix { inherit config pkgs; };
p = import ../../common/pkgs.nix { inherit pkgs config; };
_p1 = p.dev ++ p.general ++ p.scripts;
zshInitArgs = [
"source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"
"source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
@ -9,6 +12,7 @@ let
"setopt globstarshort"
];
_z1 = lib.concatMapStrings (x: x + "\n") zshInitArgs;
in
{
programs.zsh.enable = true;
@ -18,7 +22,21 @@ in
programs.java.package = pkgs.temurin-bin-17;
programs.zoxide.enable = true;
programs.zoxide.enableZshIntegration = true;
programs.git.enable = true;
programs.git.userName = "sadan";
programs.git.userEmail = "117494111+sadan4@users.noreply.github.com";
programs.git.extraConfig = {
gpg.format = "ssh";
user = {
signingkey = "~/.ssh/id_ed25519";
};
commit.gpgsign = true;
core.autocrlf = "input";
pull.rebase = true;
push.autoSetupRemote = true;
init.defaultBranch = "main";
rerere.enabled = true;
};
nixpkgs.config.allowUnfreePredicate = (pkg: true);
# Home Manager needs a bit of information about you and the paths it should
@ -28,6 +46,15 @@ in
home.homeDirectory = "/home/meyer";
services = {
flameshot = {
enable = true;
settings.General.showDesktopNotification = false;
settings.General.startupLaunch = false;
# settings.Shortcuts.TYPE_IMAGEUPLOADER = "";
# settings.Shortcuts.TYPE_COPY = "Return";
};
};
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
@ -38,127 +65,10 @@ in
home.stateVersion = "23.11"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = with pkgs;[
tailscale
clang
gnumake
jq
gradle
lazygit
linuxHeaders
#NODE
nodePackages.nodemon
nodePackages.ts-node
nodePackages.pnpm
nodePackages.prisma
prisma-engines
nodePackages.live-server
#ENDNODE
zsh-powerlevel10k
zsh-syntax-highlighting
gh
fzf
#C AND CXX START
glib
glibc
#C AND CXX END
#PYTHONSTART
(python39.withPackages (ps: with ps;[
evdev
setuptools
]))
# python311Packages.evdev
# python311Packages.xlib
#PYTHONEND
#JAVASTART
#JAVAEND
eslint_d
go
php
nodejs_21
# pkgs.temurin-jre-bin-8
cargo
nerdfonts
lua
btop
unzip
typescript
#MASON
nodePackages_latest.typescript-language-server
#ENDMASON
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
(pkgs.writeShellScriptBin "git_fetchAll" ''
git branch -r | grep -v '\->' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | while read remote; do git branch --track "''${remote#origin/}" "$remote"; done
git fetch --all
git pull --all
'')
(pkgs.writeShellScriptBin "install_eslint" ''
set -x
cp /home/${config.home.username}/.config/.eslintrc.json .
pkgs=("@stylistic/eslint-plugin" "@typescript-eslint/eslint-plugin")
if [[ -z $1 ]]; then
echo please specify npm, pnpm, or yarn
exit 1
fi
for i in "''${pkgs[@]}"; do
`$1 i -D $i`
done
'')
(pkgs.writeShellScriptBin "math" ''
set -e
python3 -c "print($*)"
'')
];
home.packages = _p1;
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
kitty = {
recursive = true;
source = ../../dotfiles/kitty;
target = "./.config/kitty";
};
eslint_d_config = {
source = ../../dotfiles/eslintrc.json;
target = "./.config/.eslintrc.json";
};
gh = {
recursive = true;
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/dotfiles/gh";
target = "./.config/gh";
};
btop = {
recursive = true;
source = ../../dotfiles/btop;
target = "./.config/btop";
};
nvim = {
recursive = true;
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/dotfiles/nvim";
target = "./.config/nvim";
};
# "testconfigfile".source = ../../dotfiles/testconfigfile;
# ".gitconfig".source = ../../dotfiles/.gitconfig;
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
};
home.file = files;
# Home Manager can also manage your environment variables through
# 'home.sessionVariables'. If you don't want to manage your shell through Home
@ -175,24 +85,9 @@ in
#
# /etc/profiles/per-user/meyer/etc/profile.d/hm-session-vars.sh
#
home.shellAliases = {
paste = "xsel -ob";
lg = "lazygit";
copy = "xsel -ib";
b = "/home/${config.home.username}/nixos/build";
};
home.sessionPath = [
"$HOME/.local/bin"
];
home.sessionVariables = {
EDITOR = "nvim";
MANPAGER = "nvim +Man!";
MANWIDTH = "999";
SSH_ASKPASS_REQUIRE = "prefer";
PRISMA_QUERY_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/query-engine";
PRISMA_SCHEMA_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/schema-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node";
};
home.shellAliases = shell.dev.aliases;
home.sessionPath = shell.dev.path;
home.sessionVariables = shell.dev.env;
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

2
build
View file

@ -3,7 +3,7 @@
set -e
#Change to change box setup
BOX="desktop"
BOX="wsl"
pushd ~/nixos/
notify(){

View file

@ -31,6 +31,7 @@ in
setuptools
xlib
]))
nodejs_22
];
gui = with pkgs;[
pkgs.discord
@ -63,7 +64,6 @@ in
jq
unzip
btop
nodejs_21
];
gaming = with pkgs; [
(prismlauncher.override {

0
common/programs/git.nix Normal file
View file

0
common/programs/java.nix Normal file
View file

View file

0
common/programs/zsh.nix Normal file
View file

4069
error.log

File diff suppressed because it is too large Load diff

View file

@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1713713092,
"narHash": "sha256-rvyr6BBtn3cq5B/48rhJlbIOpxprwlO/71663sd9Gik=",
"lastModified": 1716736760,
"narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2846d5230a3c3923618eabb367deaf8885df580f",
"rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
"type": "github"
},
"original": {
@ -90,29 +90,13 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1716702362,
"narHash": "sha256-1iExBg0gqYHqSEwALu4LYPOKlJMbUUbsfhsGZf2mi0M=",
"lastModified": 1716655032,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8ed72179617b1b4dbd15134371daf4e9c4c039ee",
"rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f",
"type": "github"
},
"original": {
@ -123,6 +107,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716509168,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bfb7a882678e518398ce9a31a881538679f6f092",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1716651315,
"narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=",
@ -141,13 +141,14 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
@ -161,8 +162,7 @@
"original": {
"owner": "Mic92",
"repo": "sops-nix",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2"
"type": "github"
}
},
"systems": {