pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

fix sopp

This commit is contained in:
Peder Bergebakken Sundt 2023-07-05 00:40:34 +02:00
parent 809e0d5b75
commit 61ea6fc08c
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.nix
View File

@ -85,7 +85,7 @@
modules = modules ++ [ ./base.nix "${self}/hosts/${hostname}" tmpConfig ({ modules = modules ++ [ ./base.nix "${self}/hosts/${hostname}" tmpConfig ({
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit inputs; inherit inputs;
packages = self.packages.${system}; flakes = flake inputs system;
}; };
# still needed even if using networkd # still needed even if using networkd
networking.hostName = hostname; networking.hostName = hostname;
@ -100,12 +100,12 @@
# This makes commandline tools like 'nix run nixpkgs#hello' # This makes commandline tools like 'nix run nixpkgs#hello'
# and 'nix-shell -p hello' use the same channel as system was built with # and 'nix-shell -p hello' use the same channel as system was built with
nix.registry.nixpkgs.flake = inputs.nixpkgs; nix.registry.nixpkgs.flake = inputs.nixpkgs;
#nix.registry.nixpkgs-unstable.flake = inputs.unstable; nix.registry.nixpkgs-unstable.flake = inputs.unstable;
nix.registry.nixpkgs-unstable.flake = "github:NixOS/nixpkgs/nixos-unstable"; #nix.registry.nixpkgs-unstable.flake.url = "github:NixOS/nixpkgs/nixos-unstable";
nix.nixPath = [ nix.nixPath = [
"nixpkgs=${inputs.nixpkgs}" "nixpkgs=${inputs.nixpkgs}"
#"nixpkgs-unstable=${inputs.unstable}" "nixpkgs-unstable=${inputs.unstable}"
"nixpkgs-unstable=github:NixOS/nixpkgs/nixos-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 ]); 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 { mkHome = user: home: modules: home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = modules ++ [{ modules = modules ++ [{
home.username = user; home.username = user;
home.homeDirectory = home; home.homeDirectory = home;
}]; }];
extraSpecialArgs.packages = self.packages.${system}; extraSpecialArgs.flakes = flakes;
}; };
in { in {
pbsds = mkHome "pbsds" "/home/pbsds" [ ./users/pbsds/home ]; pbsds = mkHome "pbsds" "/home/pbsds" [ ./users/pbsds/home ];

1
hosts/bolle/default.nix
View File

@ -10,7 +10,6 @@
../../hardware/opengl-intel.nix ../../hardware/opengl-intel.nix
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/sshd.nix ../../profiles/sshd.nix
../../profiles/podman.nix
../../users # home-manager ../../users # home-manager
../../users/pbsds ../../users/pbsds

1
hosts/sopp/default.nix
View File

@ -26,6 +26,7 @@
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/sshd.nix ../../profiles/sshd.nix
../../profiles/no-suspend.nix ../../profiles/no-suspend.nix
../../profiles/podman.nix
../../users # home-manager ../../users # home-manager
../../users/pbsds ../../users/pbsds

2
profiles/no-suspend.nix
View File

@ -4,5 +4,5 @@
systemd.targets.hibernate.enable = false; systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false; systemd.targets.hybrid-sleep.enable = false;
services.xserver.displayManager.gdm.autoSuspend = true; services.xserver.displayManager.gdm.autoSuspend = false;
} }

7
profiles/podman.nix
View File

@ -1,8 +1,15 @@
{ pkgs, ... }:
{ {
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
virtualisation.podman.dockerCompat = true; # alias docker to podman virtualisation.podman.dockerCompat = true; # alias docker to podman
virtualisation.oci-containers.backend = "podman"; # default 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. # Required for containers under podman-compose to be able to talk to each other.
#virtualisation.defaultNetwork.settings.dns_enabled = true; #virtualisation.defaultNetwork.settings.dns_enabled = true;

2
users/pbsds/home/profiles/mpv.nix
View File

@ -11,7 +11,7 @@
#thumbnail # TOO SLOW #thumbnail # TOO SLOW
#mpris #mpris
# TODO: thumbfast # 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 # from https://github.com/mpv-player/mpv/issues/9767#issuecomment-1024831645
({ scriptName = "dynamic-subs.lua"; } // (pkgs.writeTextDir "share/mpv/scripts/dynamic-subs.lua" '' ({ scriptName = "dynamic-subs.lua"; } // (pkgs.writeTextDir "share/mpv/scripts/dynamic-subs.lua" ''
mp.add_hook('on_load', 10, function() mp.add_hook('on_load', 10, function()