Refactor nh and just

This commit is contained in:
SebastianStork 2024-08-05 23:31:56 +02:00
parent 32dc565a35
commit f4a6faf1d3
8 changed files with 13 additions and 20 deletions

View file

@ -52,7 +52,10 @@
vimAlias = true; vimAlias = true;
}; };
environment.systemPackages = [ pkgs.git ]; environment.systemPackages = [
pkgs.git
pkgs.just
];
nixpkgs.config.allowUnfreePredicate = nixpkgs.config.allowUnfreePredicate =
pkg: pkg:

View file

@ -24,7 +24,6 @@
sops.enable = true; sops.enable = true;
printing.enable = true; printing.enable = true;
syncthing.enable = true; syncthing.enable = true;
nix-helper.enable = true;
auto-gc.enable = true; auto-gc.enable = true;
geoclue.enable = true; geoclue.enable = true;
tailscale = { tailscale = {
@ -33,5 +32,5 @@
}; };
}; };
services.auto-cpufreq.enable = true; programs.nh.enable = true;
} }

View file

@ -9,15 +9,16 @@
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.initrd.kernelModules = [ "usb_storage" ]; boot.initrd.kernelModules = [ "usb_storage" ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"nvme" "nvme"
"xhci_pci" "xhci_pci"
"ahci" "ahci"
"sd_mod" "sd_mod"
]; ];
zramSwap.enable = true; zramSwap.enable = true;
services.fstrim.enable = true; services.fstrim.enable = true;
services.fwupd.enable = true; services.fwupd.enable = true;
services.auto-cpufreq.enable = true;
} }

View file

@ -21,7 +21,6 @@
sops.enable = true; sops.enable = true;
printing.enable = true; printing.enable = true;
syncthing.enable = true; syncthing.enable = true;
nix-helper.enable = true;
auto-gc.enable = true; auto-gc.enable = true;
geoclue.enable = true; geoclue.enable = true;
tailscale = { tailscale = {
@ -30,5 +29,6 @@
}; };
}; };
programs.nh.enable = true;
programs.steam.enable = true; programs.steam.enable = true;
} }

View file

@ -6,13 +6,13 @@ default:
just --list --unsorted just --list --unsorted
switch: switch:
{{ rebuild }} switch {{ rebuild }} switch .
test: test:
{{ rebuild }} test {{ rebuild }} test .
boot: boot:
{{ rebuild }} boot {{ rebuild }} boot .
reboot: boot reboot: boot
reboot reboot

View file

@ -129,7 +129,7 @@
bind = SUPER, D, togglespecialworkspace, chat bind = SUPER, D, togglespecialworkspace, chat
# Flake workspace # Flake workspace
workspace = special:flake, border:false, gapsout:30, on-created-empty:kitty --directory $FLAKE --override background_opacity=0.7 workspace = special:flake, border:false, gapsout:30, on-created-empty:kitty --directory ~/Projects/nixos/my-config --override background_opacity=0.7
windowrulev2 = noblur, class:(kitty), onworkspace:special:flake windowrulev2 = noblur, class:(kitty), onworkspace:special:flake
bind = SUPER, Q, togglespecialworkspace, flake bind = SUPER, Q, togglespecialworkspace, flake
''; '';

View file

@ -1,9 +0,0 @@
{ config, lib, ... }:
{
options.myConfig.nix-helper.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.nix-helper.enable {
environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config";
programs.nh.enable = true;
};
}

View file

@ -18,7 +18,6 @@
home.packages = [ home.packages = [
pkgs.fastfetch pkgs.fastfetch
pkgs.just
(wrappers.kitty { inherit (config.myConfig) theme; }) (wrappers.kitty { inherit (config.myConfig) theme; })
wrappers.firefox wrappers.firefox