fix sopp
This commit is contained in:
parent
809e0d5b75
commit
61ea6fc08c
14
flake.nix
14
flake.nix
@ -85,7 +85,7 @@
|
||||
modules = modules ++ [ ./base.nix "${self}/hosts/${hostname}" tmpConfig ({
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
packages = self.packages.${system};
|
||||
flakes = flake inputs system;
|
||||
};
|
||||
# still needed even if using networkd
|
||||
networking.hostName = hostname;
|
||||
@ -100,12 +100,12 @@
|
||||
# This makes commandline tools like 'nix run nixpkgs#hello'
|
||||
# and 'nix-shell -p hello' use the same channel as system was built with
|
||||
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
||||
#nix.registry.nixpkgs-unstable.flake = inputs.unstable;
|
||||
nix.registry.nixpkgs-unstable.flake = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nix.registry.nixpkgs-unstable.flake = inputs.unstable;
|
||||
#nix.registry.nixpkgs-unstable.flake.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nix.nixPath = [
|
||||
"nixpkgs=${inputs.nixpkgs}"
|
||||
#"nixpkgs-unstable=${inputs.unstable}"
|
||||
"nixpkgs-unstable=github:NixOS/nixpkgs/nixos-unstable"
|
||||
"nixpkgs-unstable=${inputs.unstable}"
|
||||
#"nixpkgs-unstable=github:NixOS/nixpkgs/nixos-unstable"
|
||||
];
|
||||
})];
|
||||
};
|
||||
@ -133,14 +133,14 @@
|
||||
sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]);
|
||||
};
|
||||
|
||||
homeConfigurations = forAllSystems ({ pkgs, system, ... }: let
|
||||
homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let
|
||||
mkHome = user: home: modules: home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = modules ++ [{
|
||||
home.username = user;
|
||||
home.homeDirectory = home;
|
||||
}];
|
||||
extraSpecialArgs.packages = self.packages.${system};
|
||||
extraSpecialArgs.flakes = flakes;
|
||||
};
|
||||
in {
|
||||
pbsds = mkHome "pbsds" "/home/pbsds" [ ./users/pbsds/home ];
|
||||
|
@ -10,7 +10,6 @@
|
||||
../../hardware/opengl-intel.nix
|
||||
../../profiles/auto-upgrade.nix
|
||||
../../profiles/sshd.nix
|
||||
../../profiles/podman.nix
|
||||
|
||||
../../users # home-manager
|
||||
../../users/pbsds
|
||||
|
@ -26,6 +26,7 @@
|
||||
../../profiles/auto-upgrade.nix
|
||||
../../profiles/sshd.nix
|
||||
../../profiles/no-suspend.nix
|
||||
../../profiles/podman.nix
|
||||
|
||||
../../users # home-manager
|
||||
../../users/pbsds
|
||||
|
@ -4,5 +4,5 @@
|
||||
systemd.targets.hibernate.enable = false;
|
||||
systemd.targets.hybrid-sleep.enable = false;
|
||||
|
||||
services.xserver.displayManager.gdm.autoSuspend = true;
|
||||
services.xserver.displayManager.gdm.autoSuspend = false;
|
||||
}
|
||||
|
@ -1,8 +1,15 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation.podman.enable = true;
|
||||
virtualisation.podman.dockerCompat = true; # alias docker to podman
|
||||
virtualisation.oci-containers.backend = "podman"; # default
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
#podman-compose
|
||||
podman-tui
|
||||
];
|
||||
|
||||
|
||||
# Required for containers under podman-compose to be able to talk to each other.
|
||||
#virtualisation.defaultNetwork.settings.dns_enabled = true;
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
#thumbnail # TOO SLOW
|
||||
#mpris
|
||||
# TODO: thumbfast
|
||||
flakes.self.pkg.mpv-webm # activate with SHIFT+w
|
||||
flakes.self.pkgs.mpv-webm # activate with SHIFT+W
|
||||
# from https://github.com/mpv-player/mpv/issues/9767#issuecomment-1024831645
|
||||
({ scriptName = "dynamic-subs.lua"; } // (pkgs.writeTextDir "share/mpv/scripts/dynamic-subs.lua" ''
|
||||
mp.add_hook('on_load', 10, function()
|
||||
|
Loading…
Reference in New Issue
Block a user