From 2da8170c98adfb22be43943be779601fca5439a6 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 8 May 2025 20:30:50 +0200 Subject: [PATCH] fix: better style --- modules/pkg_mgrmnt/podman.nix | 5 ++--- modules/pkg_mgrmnt/store_pkg_file.nix | 1 + modules/sec_auth/ssh.nix | 7 ------- modules/software/browser/brave.nix | 4 +--- modules/software/fonts.nix | 5 ++++- overlays/default.nix | 1 + 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/pkg_mgrmnt/podman.nix b/modules/pkg_mgrmnt/podman.nix index ee82a11..96379cf 100644 --- a/modules/pkg_mgrmnt/podman.nix +++ b/modules/pkg_mgrmnt/podman.nix @@ -1,7 +1,8 @@ {pkgs, ...}: { # Enable common container config files in /etc/containers - virtualisation.containers.enable = true; virtualisation = { + containers.enable = true; + podman = { enable = true; @@ -15,8 +16,6 @@ }; }; - environment.sessionVariables = { - }; # Useful other development tools environment.systemPackages = with pkgs; [ dive # look into docker image layers diff --git a/modules/pkg_mgrmnt/store_pkg_file.nix b/modules/pkg_mgrmnt/store_pkg_file.nix index 1eb7d31..4f4e02b 100644 --- a/modules/pkg_mgrmnt/store_pkg_file.nix +++ b/modules/pkg_mgrmnt/store_pkg_file.nix @@ -10,4 +10,5 @@ formatted = builtins.concatStringsSep "\n" sortedUnique; in formatted; + # TODO: in the far future: add a little alias that greps throgh that file } diff --git a/modules/sec_auth/ssh.nix b/modules/sec_auth/ssh.nix index 6613cc3..5f8a774 100644 --- a/modules/sec_auth/ssh.nix +++ b/modules/sec_auth/ssh.nix @@ -6,17 +6,10 @@ askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass"; }; - # This is using a rec (recursive) expression to set and access XDG_BIN_HOME within the expression - # For more on rec expressions see https://nix.dev/tutorials/first-steps/nix-language#recursive-attribute-set-rec environment.sessionVariables = { SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent"; }; - environment.systemPackages = with pkgs; [ - #ssh-askpass-fullscreen - lxqt.lxqt-openssh-askpass - ]; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/modules/software/browser/brave.nix b/modules/software/browser/brave.nix index 04560ef..331b055 100644 --- a/modules/software/browser/brave.nix +++ b/modules/software/browser/brave.nix @@ -1,5 +1,3 @@ {pkgs, ...}: { - environment.systemPackages = with pkgs; [ - brave - ]; + environment.systemPackages = [ pkgs.brave ]; } diff --git a/modules/software/fonts.nix b/modules/software/fonts.nix index ed1f806..5b7fcad 100644 --- a/modules/software/fonts.nix +++ b/modules/software/fonts.nix @@ -13,7 +13,10 @@ fira-code-symbols #droid-sans-mono (nerdfonts.override { - fonts = ["FiraCode" "DroidSansMono" "JetBrainsMono"]; + fonts = [ + "FiraCode" + "DroidSansMono""JetBrainsMono" + ]; }) ]; } diff --git a/overlays/default.nix b/overlays/default.nix index b650538..1246d25 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,6 @@ # This file defines overlays {inArgs, ...}: { + # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs final.pkgs;