revisions
This commit is contained in:
parent
005950d9ea
commit
08417f2299
21 changed files with 474 additions and 177 deletions
|
|
@ -4,6 +4,7 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
../settings.nix
|
||||
./hardware-configuration.nix
|
||||
./system-packages.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,12 +8,20 @@
|
|||
efi.canTouchEfiVariables = true;
|
||||
timeout = 5;
|
||||
};
|
||||
tmp = {
|
||||
cleanOnBoot = true;
|
||||
};
|
||||
tmp.cleanOnBoot = true;
|
||||
kernelPackages = pkgs.linuxPackages;
|
||||
consoleLogLevel = 3;
|
||||
initrd.verbose = false;
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
"boot.shell_on_fail"
|
||||
"udev.log_priority=3"
|
||||
"rd.systemd.show_status=auto"
|
||||
];
|
||||
};
|
||||
|
||||
# some people really like putting #/bin/sh or #/bin/bash
|
||||
system.activationScripts.binbash = {
|
||||
deps = [];
|
||||
text = ''
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
tree
|
||||
busybox # in case im missing something random
|
||||
fd
|
||||
jq
|
||||
gawk
|
||||
psmisc
|
||||
unzip
|
||||
wrk
|
||||
bitwarden
|
||||
hashcat
|
||||
|
|
@ -27,7 +24,6 @@
|
|||
argc
|
||||
appimage-run
|
||||
clang
|
||||
rsync
|
||||
openssl
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
go
|
||||
go-tools
|
||||
gopls
|
||||
];
|
||||
}
|
||||
|
|
@ -28,14 +28,12 @@
|
|||
hyprland.default = ["hyprland" "gtk"];
|
||||
};
|
||||
};
|
||||
systemd.user.services.xdg-desktop-portal-hyprland.unitConfig.ConditionPathExists = "%t/wayland-0";
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
qt5.qtwayland
|
||||
qt6.qtwayland
|
||||
polkit_gnome
|
||||
candy-icons
|
||||
hu-tao-animated-cursor
|
||||
tokyonight-gtk-theme
|
||||
|
|
@ -46,12 +44,18 @@
|
|||
wofi
|
||||
hyprshot
|
||||
hypridle
|
||||
polkit_gnome
|
||||
grim
|
||||
hyprpolkitagent
|
||||
grim-hyprland
|
||||
slurp
|
||||
swappy
|
||||
satty
|
||||
imv
|
||||
syshud
|
||||
hyprpaper
|
||||
hyprpicker
|
||||
nwg-look
|
||||
gsimplecal
|
||||
hyprspace
|
||||
kdePackages.xwaylandvideobridge
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
jdk17
|
||||
maven
|
||||
gradle
|
||||
visualvm
|
||||
];
|
||||
}
|
||||
|
|
@ -5,14 +5,24 @@
|
|||
|
||||
nix.settings = {
|
||||
auto-optimise-store = true;
|
||||
max-jobs = "auto";
|
||||
cores = 0;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
substituters = [
|
||||
"https://cache.nixos.org"
|
||||
"https://nix-gaming.cachix.org"
|
||||
"https://anyrun.cachix.org"
|
||||
"https://ghostty.cachix.org"
|
||||
"https://hyprland.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
|
||||
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
|
||||
"ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
options.npm.enable = lib.mkEnableOption "npm setup";
|
||||
|
||||
config = lib.mkIf config.npm.enable {
|
||||
|
|
@ -10,46 +14,5 @@
|
|||
bun
|
||||
nodePackages.typescript
|
||||
];
|
||||
|
||||
systemd.user.services."npm-init" = {
|
||||
wantedBy = [ "default.target" ];
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
set -eu
|
||||
H="$HOME"
|
||||
mkdir -p "$H/.npm-global/bin" "$H/.npm"
|
||||
tmp="$(mktemp)"
|
||||
cat > "$tmp" <<EOF
|
||||
prefix=$H/.npm-global
|
||||
cache=$H/.npm
|
||||
init-module=$H/.npm-init.js
|
||||
EOF
|
||||
if [ ! -f "$H/.npmrc" ] || ! cmp -s "$tmp" "$H/.npmrc"; then
|
||||
mv "$tmp" "$H/.npmrc"
|
||||
chmod 600 "$H/.npmrc"
|
||||
else
|
||||
rm -f "$tmp"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
environment.etc."profile.d/50-npm-global.sh".text = ''
|
||||
case ":$PATH:" in
|
||||
*:"$HOME/.npm-global/bin":*) ;;
|
||||
*) if [ -d "$HOME/.npm-global/bin" ]; then
|
||||
PATH="$HOME/.npm-global/bin:$PATH"
|
||||
export PATH
|
||||
fi ;;
|
||||
esac
|
||||
'';
|
||||
|
||||
environment.etc."fish/conf.d/50-npm-global.fish".text = ''
|
||||
if test -d "$HOME/.npm-global/bin"
|
||||
if not contains -- "$HOME/.npm-global/bin" $PATH
|
||||
set -gx PATH "$HOME/.npm-global/bin" $PATH
|
||||
end
|
||||
end
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
# used to seed my config
|
||||
{lib, ...}:
|
||||
with lib; {
|
||||
options.theme = {
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "cobray";
|
||||
};
|
||||
cursorName = mkOption {
|
||||
type = types.str;
|
||||
default = "Hu-Tao-Animated-Cursor";
|
||||
};
|
||||
cursorSize = mkOption {
|
||||
type = types.int;
|
||||
default = 24;
|
||||
};
|
||||
gtkTheme = mkOption {
|
||||
type = types.str;
|
||||
default = "Tokyonight-Dark";
|
||||
};
|
||||
gtkThemeMode = mkOption {
|
||||
type = types.str;
|
||||
# light or dark mode
|
||||
default = "dark";
|
||||
};
|
||||
qtTheme = mkOption {
|
||||
type = types.str;
|
||||
# qt5 or 6 it seems
|
||||
default = "qt6ct";
|
||||
};
|
||||
qtOverride = mkOption {
|
||||
type = types.str;
|
||||
default = "Fusion";
|
||||
};
|
||||
iconTheme = mkOption {
|
||||
type = types.str;
|
||||
default = "candy-icons";
|
||||
};
|
||||
font = mkOption {
|
||||
type = types.str;
|
||||
default = "Clear Sans 10";
|
||||
};
|
||||
Terminal = mkOption {
|
||||
type = types.str;
|
||||
default = "ghostty";
|
||||
};
|
||||
TerminalFont = mkOption {
|
||||
type = types.str;
|
||||
default = "0xProto Nerd Font";
|
||||
};
|
||||
Browser = mkOption {
|
||||
type = types.str;
|
||||
default = "thorium";
|
||||
};
|
||||
Editor = mkOption {
|
||||
type = types.str;
|
||||
default = "nvim";
|
||||
};
|
||||
Shell = mkOption {
|
||||
type = types.str;
|
||||
default = "fish";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./settings.nix
|
||||
../settings.nix
|
||||
./cachix.nix
|
||||
./modules/gtk.nix
|
||||
./modules/audio.nix
|
||||
|
|
@ -22,8 +22,6 @@
|
|||
./modules/ollama.nix
|
||||
./modules/cups.nix
|
||||
./modules/rust.nix
|
||||
./modules/java.nix
|
||||
./modules/go.nix
|
||||
./modules/core.nix
|
||||
./modules/libs.nix
|
||||
./modules/rgb.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue