Skip to content

Commit

Permalink
simultaneous cock and balls
Browse files Browse the repository at this point in the history
  • Loading branch information
Octelly committed Dec 22, 2024
1 parent b7dd262 commit 6355ddf
Show file tree
Hide file tree
Showing 17 changed files with 498 additions and 132 deletions.
237 changes: 168 additions & 69 deletions flake.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
"freeimage-unstable-2021-11-01" # for EmulationStation DE (desktop edition)

"fluffychat-linux-1.22.1" # isn't really insecure
"cinny-unwrapped-4.2.3"
"cinny-4.2.3"
"olm-3.2.16" # this is what marks fluffy and many other matrix things as insecure
];
};
Expand Down
40 changes: 38 additions & 2 deletions hosts/ocean-desktop/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
steam.enable = true;
olympus.enable = false;
minecraft.enable = true;
sunshine.enable = true;
};
awesome = {
enable = true;
Expand All @@ -18,7 +19,42 @@
enable = true;
};
};
hardware.bluetooth.enable = true;
hardware.bluetooth.enable = true;
};
#networking.firewall.allowedTCPPorts = [ 25565 ];

virtualisation.vmware.host = {
enable = true;
extraConfig = ''
# Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU
mks.gl.allowUnsupportedDrivers = "TRUE"
mks.vk.allowUnsupportedDevices = "TRUE"
'';
};

#services.davfs2 = {
# enable = true;
# settings.sections = {
# "/home/octelly/nextcloud" = {
# use_locks = false;
# gui_optimize = true;
# cache_size = 1024 * 8;
# table_size = 32768;
# };
# };
#};

#fileSystems."/home/octelly/nextcloud" = {
# device = "https://cloud.owo.digital/remote.php/dav/files/octelly/";
# fsType = "davfs";
# options = [
# #"x-systemd.automount" # mount on access
# "noauto" # do not mount on boot
# "user" # let's ordinary user to unmount
# "uid=octelly"
# "rw" # read write
# #"async" # ??
# ];
#};
networking.firewall.allowedTCPPorts = [ 3216 ]; # EA App
networking.firewall.allowedUDPPorts = [ 3216 ]; # EA App
}
2 changes: 1 addition & 1 deletion hosts/ocean-desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ lib.nixosSystem {
}

inputs.home.nixosModules.home-manager
inputs.flatpaks.nixosModules.default
inputs.flatpaks.nixosModules.declarative-flatpak
inputs.nixos-cosmic.nixosModules.default

# hardware modules
Expand Down
2 changes: 1 addition & 1 deletion hosts/ocean-t460/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ lib.nixosSystem {

inputs.home.nixosModules.home-manager
inputs.nixHW.nixosModules.lenovo-thinkpad-t460
inputs.flatpaks.nixosModules.default
inputs.flatpaks.nixosModules.declarative-flatpak
inputs.nixos-cosmic.nixosModules.default

../shared/configuration.nix
Expand Down
Binary file added hosts/shared/boot_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 17 additions & 3 deletions hosts/shared/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
"ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
];
trusted-users = [
"nixremote"
];
};

boot = {
Expand All @@ -26,6 +29,11 @@
grub = {
enable = true;

#theming
splashImage = ./boot_logo.png;
splashMode = "normal";
backgroundColor = "#000000";

# install to EFI only
efiSupport = true;
device = "nodev";
Expand Down Expand Up @@ -137,7 +145,8 @@
wireguard-tools
];

shells = with pkgs; [ zsh bash ];
# WARN: polkit will error out with shells not listed here
shells = with pkgs; [ zsh bash nushell elvish ];
binsh = "${pkgs.bash}/bin/bash";

variables = {
Expand All @@ -148,8 +157,9 @@
plasma6.excludePackages = with pkgs.kdePackages; [
elisa
kate
kmenuedit
plasma-systemmonitor
konsole
khelpcenter
krdp
];
};

Expand All @@ -169,6 +179,10 @@

security.pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock";

security.polkit = {
enable = true;
};

services = {
dbus.enable = true;
fwupd.enable = true; # Required for "Firmware Security" page of KDE's Info Center
Expand Down
3 changes: 0 additions & 3 deletions hosts/twinkpad/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{ config, pkgs, ... }: {

virtualisation.docker.enable = true;

modules = {
desktop = {
gaming = {
Expand Down
2 changes: 1 addition & 1 deletion hosts/twinkpad/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ lib.nixosSystem {

inputs.home.nixosModules.home-manager
inputs.nixHW.nixosModules.lenovo-thinkpad-t460s
inputs.flatpaks.nixosModules.default
inputs.flatpaks.nixosModules.declarative-flatpak
inputs.nixos-cosmic.nixosModules.default

../shared/configuration.nix
Expand Down
13 changes: 12 additions & 1 deletion modules/desktop/gaming/steam.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ in {
config = mkIf cfg.enable {
programs.steam = {
enable = true;

remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;

# wayland thing
extest.enable = true;

protontricks.enable = true;
gamescopeSession.enable = true;
};

Expand All @@ -26,7 +32,12 @@ in {

systemPackages = with pkgs; [
protonup-qt

# helpful overlays and such
mangohud
vkbasalt
# a configurator for them
goverlay
];
};
};
Expand Down
24 changes: 24 additions & 0 deletions modules/desktop/gaming/sunshine.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ config, pkgs, lib, inputs, system, ... }:

with builtins;
with lib;
let cfg = config.modules.desktop.gaming.sunshine;
in {
options.modules.desktop.gaming.sunshine = {
enable = mkEnableOption "Sunshine (Moonlight) game streaming server";
};

config = {
services.sunshine = mkIf cfg.enable {
enable = true;
autoStart = mkDefault true;

# potential security vulnerability
capSysAdmin = mkDefault true;

openFirewall = mkDefault true;

settings.sunshine_name = mkDefault config.networking.hostName;
};
};
}
21 changes: 11 additions & 10 deletions modules/system/fonts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
with builtins;
with lib;
let
fontList = unique (flatten
(mapAttrsToList
(n: v: v.fc.fonts)
config.modules.users));
fontList = unique (flatten
(mapAttrsToList
(n: v: v.fc.fonts)
config.modules.users));

nerdFontList = unique (flatten
(mapAttrsToList
(n: v: v.fc.nerd-fonts)
config.modules.users));
in {
config.fonts.packages = fontList ++ [ (pkgs.nerdfonts.override { fonts = nerdFontList; }) ];
nerdFontList = unique (flatten
(mapAttrsToList
(n: v: v.fc.nerd-fonts)
config.modules.users));
in
{
config.fonts.packages = fontList ++ (attrsets.attrVals nerdFontList pkgs.nerd-fonts);
}
12 changes: 8 additions & 4 deletions modules/users.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ with lib; let
(n: v: {
description = v.desc;
isNormalUser = true;
extraGroups = [ "networkmanager" "wheel" "input" "video" "audio" ];
extraGroups = [ "networkmanager" "wheel" "input" "video" "audio" ]
# WebDAV mounts for regular users
++ lib.optional config.services.davfs2.enable config.services.davfs2.davGroup;
homeMode = "755";
initialPassword = "gay";
shell = v.shell or null;
})
cfg;

Expand Down Expand Up @@ -87,8 +90,8 @@ in
fc = {
# `fonts` takes a list of packages
fonts = with pkgs; [ maple-mono roboto cozette twemoji-color-font noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji-blob-bin material-design-icons ];
# `nerd-fonts.override` takes a list of strings
nerd-fonts = [ "Iosevka" "JetBrainsMono" ];
# list of pkgs.nerd-fonts attributes
nerd-fonts = [ "iosevka" "jetbrains-mono" ];
defaultFonts = {
monospace = [ "Iosevka Nerd Font" "Cozette" ];
sansSerif =
Expand All @@ -113,7 +116,7 @@ in
noto-fonts-cjk-sans
maple-mono-NF
];
# `nerd-fonts.override` takes a list of strings
# list of pkgs.nerd-fonts attributes
nerd-fonts = [ ];
defaultFonts = {
monospace = [ "Maple Mono NF" ];
Expand All @@ -122,6 +125,7 @@ in
emoji = [ "Twitter Color Emoji" ];
};
};
shell = pkgs.nushell;
};
};
};
Expand Down
Loading

0 comments on commit 6355ddf

Please sign in to comment.