jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update module and minor cleanup

main
jolheiser 2025-03-23 19:30:11 -05:00
parent 65c51b1416
commit a643e424eb
No known key found for this signature in database
4 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/nogui/nushell.nix
View File

@ -11,7 +11,6 @@
du = "dust -b -d 1"; du = "dust -b -d 1";
ll = "ls -al"; ll = "ls -al";
nix-shell = "nix-shell --run nu"; nix-shell = "nix-shell --run nu";
cachix-build = "cachix watch-exec jolheiser -- nix build --rebuild --max-jobs 4";
}; };
extraConfig = with pkgs; '' extraConfig = with pkgs; ''
use ${nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu * use ${nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *

45
flake.nix
View File

@ -35,32 +35,31 @@
... ...
}@inputs: }@inputs:
let let
overlays = [ overlay = _: prev: {
(_: prev: { nur = import inputs.nur {
nur = import inputs.nur { nurpkgs = prev;
nurpkgs = prev; pkgs = prev;
pkgs = prev; };
}; jolheiser = {
jolheiser = { helix = inputs.helix.packages.${prev.system}.default;
helix = inputs.helix.packages.${prev.system}.default; gomodinit = inputs.gomodinit.packages.${prev.system}.default;
gomodinit = inputs.gomodinit.packages.${prev.system}.default; cfg = inputs.cfg.packages.${prev.system}.default;
cfg = inputs.cfg.packages.${prev.system}.default; spectre = inputs.spectre.packages.${prev.system}.default;
spectre = inputs.spectre.packages.${prev.system}.default; pokego = inputs.pokego.packages.${prev.system}.default;
pokego = inputs.pokego.packages.${prev.system}.default; };
}; tclip = inputs.tclip.packages.${prev.system}.tclip;
tclip = inputs.tclip.packages.${prev.system}.tclip; ghostty = inputs.ghostty.packages.${prev.system}.ghostty;
ghostty = inputs.ghostty.packages.${prev.system}.ghostty; };
})
];
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit overlays system; inherit system;
overlays = [ overlay ];
config.allowUnfree = true; config.allowUnfree = true;
}; };
commonConfig = commonConfig =
{ config, ... }: { config, ... }:
{ {
config = { config = {
nixpkgs.overlays = overlays; nixpkgs.overlays = [ overlay ];
}; };
}; };
username = "jolheiser"; username = "jolheiser";
@ -101,6 +100,8 @@
in in
{ {
inherit homeManagerModules; inherit homeManagerModules;
overlays.jolheiser = overlay;
overlays.default = overlay;
homeConfigurations = { homeConfigurations = {
"jolheiser" = home-manager.lib.homeManagerConfiguration { "jolheiser" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
@ -124,12 +125,6 @@
]; ];
}; };
}; };
nixConfig = {
extra-substitutors = [ "https://jolheiser.cachix.org" ];
extra-trusted-public-keys = [
"jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="
];
};
devShells.${system}.default = pkgs.mkShell { devShells.${system}.default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
agenix.packages.${system}.agenix agenix.packages.${system}.agenix

2
machines/common/gui/default.nix
View File

@ -2,7 +2,6 @@
{ {
imports = [ ../nogui ]; imports = [ ../nogui ];
hardware.pulseaudio.enable = false;
security = { security = {
rtkit.enable = true; rtkit.enable = true;
}; };
@ -12,6 +11,7 @@
pulse.enable = true; pulse.enable = true;
alsa.enable = true; alsa.enable = true;
}; };
pulseaudio.enable = false;
xserver = { xserver = {
enable = true; enable = true;
displayManager.lightdm.enable = true; displayManager.lightdm.enable = true;

2
machines/common/nogui/default.nix
View File

@ -46,7 +46,7 @@
gc = { gc = {
automatic = true; automatic = true;
randomizedDelaySec = "15m"; randomizedDelaySec = "15m";
options = [ "--delete-older-than 14d" ]; options = "--delete-older-than 14d";
}; };
optimise.automatic = true; optimise.automatic = true;
package = pkgs.nixVersions.stable; package = pkgs.nixVersions.stable;