muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update flake

Browse source
This commit is contained in:
muon 2024-07-11 15:02:10 +00:00
parent 6bb34e1c51
commit c93f124c6f
9 changed files with 31 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -170,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718788307, "lastModified": 1720645875,
"narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "narHash": "sha256-9F8Vo6HTFAtRNodjmULVmjwb+qBr9TW+32Mxfer9r5s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "rev": "f79d950ac23a4c63e60bb71475d3321fbd9ace2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718714799, "lastModified": 1720418205,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "rev": "655a58a72a6601292512670343087c2d75d859c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1718789425, "lastModified": 1719525570,
"narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
hosts/muon/configuration.nix
View file

@ -32,7 +32,6 @@ in {
mods.theme.wallpaper = ./wallpaper.png; mods.theme.wallpaper = ./wallpaper.png;
mods.openvpn.enable = true; mods.openvpn.enable = true;
mods.containers.steam.enable = true; mods.containers.steam.enable = true;
mods.containers.steam-test.enable = true;
mods.server.media.enable = true; mods.server.media.enable = true;
services.xserver.windowManager.i3.enable = true; services.xserver.windowManager.i3.enable = true;

2
modules/home/desktop/development.nix
View file

@ -5,7 +5,7 @@
config = lib.mkIf config.mods.desktop.development.enable { config = lib.mkIf config.mods.desktop.development.enable {
# home.packages = with pkgs; []; # home.packages = with pkgs; [];
programs.qutebrowser = { programs.qutebrowser = {
enable = true; enable = false;
settings = { settings = {
content.cookies.accept = "no-3rdparty"; content.cookies.accept = "no-3rdparty";

2
modules/home/desktop/productivity.nix
View file

@ -15,6 +15,8 @@
chromium chromium
]; ];
services.syncthing.enable = true;
home.sessionVariables.BROWSER = "librewolf"; home.sessionVariables.BROWSER = "librewolf";
programs.zsh.sessionVariables.BROWSER = "librewolf"; programs.zsh.sessionVariables.BROWSER = "librewolf";

1
modules/nixos/server/containers/default.nix
View file

@ -8,7 +8,6 @@
imports = [ imports = [
./steam.nix ./steam.nix
./steam-test.nix
]; ];
config = lib.mkIf config.mods.containers.enable { config = lib.mkIf config.mods.containers.enable {

40
modules/nixos/server/containers/smoop.nix
View file

@ -1,40 +0,0 @@
{ lib, python3Packages, pkgs, config }:
with pkgs;
python3Packages.buildPythonApplication {
pname = "smoop";
version = "1.0";
propagatedBuildInputs = [
python3
python3Packages.pip
python3Packages.virtualenv
python3Packages.tkinter
python3Packages.xlib
python3Packages.pillow
python3Packages.python-dotenv
python3Packages.pyautogui
python3Packages.aiohttp
python3Packages.discordpy
python3Packages.opencv4
stdenv.cc.cc.lib
glib
libglvnd
];
nativeCheckInputs = [
xvfb-run
scrot
];
checkPhase = ''
xvfb-run python -c 'import smoop'
# The tests depend on some specific things that xvfb cant provide, like keyboard and mouse
# xvfb-run python -m unittest tests.test_pyautogui
'';
installCheckPhase = ''
xvfb-run python -c 'import smoop'
# The tests depend on some specific things that xvfb cant provide, like keyboard and mouse
# xvfb-run python -m unittest tests.test_pyautogui
'';
src = /home/muon/projects/smoop;
}

112
modules/nixos/server/containers/steam-test.nix
View file

@ -1,112 +0,0 @@
{ pkgs, lib, config, ... }: let
# steam-xinit = pkgs.writeShellScriptBin "steam-xinit" ''
# ${lib.getExe pkgs.steam}
# # exec ${lib.getExe pkgs.xterm}
# '';
stest = pkgs.writeShellScriptBin "stest" ''
socat -d TCP-LISTEN:6000,fork,bind=192.168.100.10 UNIX-CONNECT:/tmp/.X11-unix/X0 &
xhost +
ssh -X steam@192.168.100.12 steam-test-serve
'';
steam-test-serve = pkgs.writeShellScriptBin "steam-test-serve" ''
PULSE_SERVER=tcp:192.168.100.10:4713 XAUTHORITY="/home/steam/.Xauthority" DBUS_SESSION_BUS_ADDRESS="" DISPLAY=192.168.100.10:0.0 apulse steam $@
'';
in {
options.mods.containers.steam-test = {
enable = lib.mkEnableOption {
default = false;
description = "enables steam container";
};
};
config = lib.mkIf config.mods.containers.steam-test.enable {
mods.containers.enable = true;
# services.xserver.displayManager.xpra.enable = true;
environment.systemPackages = with pkgs; [
socat
stest
];
containers.stest = {
privateNetwork = true;
hostAddress = "192.168.100.10";
localAddress = "192.168.100.12";
bindMounts = {
# "/home/steam/.steam/steam/steamapps/common/SMITE" = {
# hostPath = "/mnt/bulk/SteamLibrary/steamapps/common/SMITE";
# isReadOnly = true;
# };
# "/home/steam/.steam/steam/steamapps/shadercache/386360" = {
# hostPath = "/mnt/bulk/SteamLibrary/steamapps/shadercache/386360";
# isReadOnly = true;
# };
# "/home/steam/.steam/steam/steamapps/appmanifest_386360.acf" = {
# hostPath = "/mnt/bulk/SteamLibrary/steamapps/appmanifest_386360.acf";
# isReadOnly = true;
# };
# "/home/steam/.steam/steam/steamapps/compatdata/386360/pfx/drive_c/users/steamuser/My Documents/My Games" = {
# hostPath = "/home/muon/documents/My Games";
# isReadOnly = false;
# };
# "/home/steam/.steam/steam/steamapps/appmanifest_386360.acf" = {
# hostPath = "/mnt/bulk/SteamLibrary/steamapps/appmanifest_386360.acf";
# isReadOnly = true;
# };
};
config = { config, pkgs, lib, ... }: {
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
];
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
};
environment.systemPackages = with pkgs; [
xterm
glxinfo
wget
bottles
apulse
steam-test-serve
# xpra
# steam-xinit
# xorg.xinit
];
# services.xserver.enable = true;
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};
# programs.ssh.forwardX11 = true;
services.openssh = {
enable = true;
# settings.X11Forwarding = true;
};
users.users.steam = {
isNormalUser = true;
extraGroups = [ "wheel" "audio" "video" ];
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEio+Y5wBVD1wILaH2R3wV10FvVjiqy/4gGBWHOITTB muon@muon" ];
initialPassword = "changeme";
};
system.stateVersion = "23.11";
};
};
};
}

39
modules/nixos/server/containers/steam.nix
View file

@ -75,27 +75,27 @@ in {
xorg.xinit xorg.xinit
python3 # python3
python3Packages.pip # python3Packages.pip
python3Packages.virtualenv # python3Packages.virtualenv
python3Packages.tkinter # python3Packages.tkinter
python3Packages.xlib # python3Packages.xlib
python3Packages.pillow # python3Packages.pillow
python3Packages.python-dotenv # python3Packages.python-dotenv
python3Packages.pyautogui # python3Packages.pyautogui
python3Packages.aiohttp # python3Packages.aiohttp
python3Packages.discordpy # python3Packages.discordpy
python3Packages.opencv4 # python3Packages.opencv4
stdenv.cc.cc.lib # stdenv.cc.cc.lib
glib # glib
libglvnd # libglvnd
]; ];
environment.sessionVariables = rec { # environment.sessionVariables = rec {
LD_LIBRARY_PATH = # LD_LIBRARY_PATH =
"${pkgs.lib.makeLibraryPath config.environment.systemPackages}:\ # "${pkgs.lib.makeLibraryPath config.environment.systemPackages}:\
${pkgs.stdenv.cc.cc.lib.outPath}/lib:$LD_LIBRARY_PATH"; # ${pkgs.stdenv.cc.cc.lib.outPath}/lib:$LD_LIBRARY_PATH";
}; # };
services.xserver.enable = true; services.xserver.enable = true;
@ -119,7 +119,6 @@ in {
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
}; };

1
modules/nixos/unfree/nvidia.nix
View file

@ -21,7 +21,6 @@ in {
# nixos.wiki/wiki/Nvidia # nixos.wiki/wiki/Nvidia
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
}; };