diff --git a/configuration.org b/configuration.org index bd87a19..8fae71f 100755 --- a/configuration.org +++ b/configuration.org @@ -49,11 +49,11 @@ let version = "23.05"; myEmail = "CaptainJawZ@outlook.com"; myName = "Danilo Reyes"; + home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${version}.tar.gz"; unstable = import (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") { config = config.nixpkgs.config; }; - home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${version}.tar.gz"; nixGaming = import (builtins.fetchTarball "https://github.com/fufexan/nix-gaming/archive/master.tar.gz"); jawzManageLibrary = pkgs.writeScriptBin @@ -72,11 +72,11 @@ cluttered, for example, I may create a module for systemd units. #+begin_src nix imports = [ ./hardware-configuration.nix - ./servers.nix + # ./servers.nix # ./openldap.nix - (import "${home-manager}/nixos") # - "${nixGaming}/modules/pipewireLowLatency.nix" + (import "${home-manager}/nixos") + nixGaming.nixosModules.pipewireLowLatency ]; #+end_src @@ -172,13 +172,6 @@ latency will require expanding these settings. #+begin_src nix hardware.pulseaudio.enable = false; sound.enable = false; -security = { - rtkit.enable = true; - acme = { - acceptTerms = true; - defaults.email = "${myEmail}"; - }; -}; services.pipewire = { enable = true; alsa.enable = true; @@ -193,11 +186,20 @@ services.pipewire = { #+end_src * SECURITY -Disabled password for commodity, but this is obviously not recommended. +Disabled password in sudo for commodity, but this is obviously not recommended, +regarding rkit, that setting enables pipewire to run with real-time +capabilities. And lastly, the acme settings are for signing certificates. #+begin_src nix -security.sudo = { - enable = true; - wheelNeedsPassword = false; +security = { + rtkit.enable = true; + sudo = { + enable = true; + wheelNeedsPassword = false; + }; + acme = { + acceptTerms = true; + defaults.email = "${myEmail}"; + }; }; #+end_src @@ -209,10 +211,6 @@ packages. #+begin_src nix nixpkgs.config = { allowUnfree = true; - permittedInsecurePackages = [ - "nodejs-14.21.3" - "openssl-1.1.1v" - ]; }; #+end_src @@ -627,16 +625,20 @@ nixos-reload () { #+begin_src nix programs = { + emacs = { + enable = true; + }; direnv = { enable = true; enableBashIntegration = true; nix-direnv.enable = true; }; bat = { - enable = true; - config = { - pager = "less -FR"; - theme = "base16"; }; + enable = true; + config = { + pager = "less -FR"; + theme = "base16"; + }; }; git = { enable = true; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index dbca09a..bd39a17 100755 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -163,13 +163,14 @@ in { # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; # }; - # virtualisation.docker.enableNvidia = true; - # services.xserver.videoDrivers = [ "nvidia" ]; + nixpkgs.config = { allowUnfree = true; }; + virtualisation.docker.enableNvidia = true; + services.xserver.videoDrivers = [ "nvidia" ]; hardware = { - # nvidia = { - # modesetting.enable = true; - # powerManagement.enable = true; - # }; + nvidia = { + modesetting.enable = true; + powerManagement.enable = true; + }; sane = { enable = true; extraBackends = [ pkgs.hplip pkgs.hplipWithPlugin ]; diff --git a/servers.nix b/servers.nix index 42f8f1e..96e9ca8 100644 --- a/servers.nix +++ b/servers.nix @@ -7,7 +7,11 @@ let config = config.nixpkgs.config; }; in { + imports = [ ./nginx.nix ]; + nixpkgs.config = { + permittedInsecurePackages = [ "nodejs-14.21.3" "openssl-1.1.1v" ]; + }; users.groups = { piracy.gid = 985; }; users.users = let base = { isSystemUser = true; }; in {