From 5ac7e5e08d0ffa2b55dba8ed84a858f2d1af168e Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 14 Mar 2025 15:58:47 +1000 Subject: [PATCH] updated `packages.nix` & related --- core/modules/gaming.nix | 3 +-- core/modules/packages.nix | 43 +++++++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/core/modules/gaming.nix b/core/modules/gaming.nix index 0833eb5..ec8f5f5 100755 --- a/core/modules/gaming.nix +++ b/core/modules/gaming.nix @@ -16,8 +16,7 @@ }; services = { - ## Enabling flatpak in case i need it - #flatpak.enable = true; + ## ratbagd for gaming mouse config ratbagd.enable = true; }; diff --git a/core/modules/packages.nix b/core/modules/packages.nix index 7a340cc..3932a86 100755 --- a/core/modules/packages.nix +++ b/core/modules/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, flakeDir, ... }: { @@ -7,22 +7,25 @@ ## Activation Scripts ## - these run after using `sudo nixos-rebuild switch` system.activationScripts.diff = { - supportsDryActivation = true; # prints diff of the store + supportsDryActivation = true; + ## Prints diff of the nix store and a cute message if rebuild successful text = '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff \ /run/current-system "$systemConfig" echo "Rebuild completed successfully <3" - ''; # also prints a cute message + ''; }; ## Nixpkgs Settings nixpkgs = { config = { allowUnfree = true; + ## Place insecure packages here permittedInsecurePackages = [ "olm-3.2.16" ]; }; + ## Overlays - BROKEN FOR NOW overlays = [ ## to use overlays exported from other flakes: @@ -39,20 +42,34 @@ ## System-level Programs programs = { - neovim = { enable = true; }; # Neovim declared here too, just in case - fish = { enable = true; }; # A catgirl's favourite shell - NEEDS OWN NIX MODULE - git = { enable = true; }; # version control - nh = { # NixOS CLI helper + + git = { enable = true; }; # Mandatory version control + fish = { enable = true; }; # A catgirls favourite shell + neovim = { enable = true; }; # Neovim declared here too, just in case + + ## NixOS CLI helper + nh = { enable = true; - flake = "/home/serenity/flakes/nixdots"; + flake = "${flakeDir}"; }; - gnupg.agent = { # For handling encryption keys + + ## For handling encryption keys + gnupg.agent = { enable = true; enableSSHSupport = true; #pinentryPackage = [ ]; }; + + ## For running unpackaged binaries + nix-ld = { + enable = true; + #libraries = with pkgs; [ ]; + }; }; + ## Flatpak, just in case + services = { flatpak.enable = true; }; + environment = { ## Environment Variables @@ -61,9 +78,10 @@ VISUAL = "nvim"; SYSTEMD_EDITOR = "nvim"; }; - # Install a stub ELF loader to print an informative - # error message in the event that a user attempts - # to run an ELF binary not compiled for NixOS. + + ## Install a stub ELF loader to print an informative + ## error message in the event that a user attempts + ## to run an ELF binary not compiled for NixOS. stub-ld.enable = true; ## System-level Packages @@ -81,7 +99,6 @@ exfatprogs # ExFAT filesystem btrfs-progs # BTRFS filesystem ntfs3g # NTFS filesystem - #scrounge-ntfs # NTFS data recovery ## CLI tools & utilities fd # Find, but faster