diff --git a/assets/minecraft/skins/a_madotsuki.png b/assets/minecraft/skins/a_madotsuki.png new file mode 100755 index 0000000..712db28 Binary files /dev/null and b/assets/minecraft/skins/a_madotsuki.png differ diff --git a/assets/minecraft/skins/a_niko.png b/assets/minecraft/skins/a_niko.png new file mode 100755 index 0000000..912bafd Binary files /dev/null and b/assets/minecraft/skins/a_niko.png differ diff --git a/assets/minecraft/skins/a_orange_knight.png b/assets/minecraft/skins/a_orange_knight.png new file mode 100755 index 0000000..fc13f83 Binary files /dev/null and b/assets/minecraft/skins/a_orange_knight.png differ diff --git a/assets/minecraft/skins/s_cool_zombie.png b/assets/minecraft/skins/s_cool_zombie.png new file mode 100755 index 0000000..d806991 Binary files /dev/null and b/assets/minecraft/skins/s_cool_zombie.png differ diff --git a/assets/minecraft/skins/s_madotsuki_detailed.png b/assets/minecraft/skins/s_madotsuki_detailed.png new file mode 100755 index 0000000..9140ce2 Binary files /dev/null and b/assets/minecraft/skins/s_madotsuki_detailed.png differ diff --git a/assets/minecraft/skins/s_niko_bellic.png b/assets/minecraft/skins/s_niko_bellic.png new file mode 100755 index 0000000..a3efa9a Binary files /dev/null and b/assets/minecraft/skins/s_niko_bellic.png differ diff --git a/nixos/home/mozilla.nix b/nixos/home/mozilla.nix index f38cb7b..a0925c5 100644 --- a/nixos/home/mozilla.nix +++ b/nixos/home/mozilla.nix @@ -62,6 +62,8 @@ "browser.tabs.closeWindowWithLastTab" = false; "browser.tabs.insertAfterCurrent" = true; "datareporting.healthreport.uploadEnabled" = false; + "extensions.pocket.enabled" = false; + "extensions.pocket.showHome" = false; "extensions.webextensions.restrictedDomains" = ""; "font.name.monospace.x-western" = "Fira Code"; "general.autoScroll" = true; diff --git a/nixos/hosts/base.nix b/nixos/hosts/base.nix index 980e103..7bb0fd5 100644 --- a/nixos/hosts/base.nix +++ b/nixos/hosts/base.nix @@ -11,7 +11,10 @@ ]; }; nixpkgs = { - config.allowUnfree = true; + config = { + allowUnfree = true; + nvidia.acceptLicense = true; + }; overlays = import ../overlays.nix inputs; }; @@ -48,4 +51,4 @@ font = "gr928-8x16-thin"; # https://adeverteuil.github.io/linux-console-fonts-screenshots/ keyMap = "us"; }; -} \ No newline at end of file +} diff --git a/nixos/hosts/ioides/configuration.nix b/nixos/hosts/ioides/configuration.nix index b6fdb4d..534462d 100644 --- a/nixos/hosts/ioides/configuration.nix +++ b/nixos/hosts/ioides/configuration.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, pkgs, ... }: { +{ inputs, config, pkgs, ... }: { imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ./hardware-configuration.nix @@ -27,21 +27,21 @@ supportedFilesystems = [ "ntfs" ]; }; - # Music pendrive - fileSystems."/mnt/world" = { - device = "/dev/disk/by-uuid/639bae80-0f5d-481c-ae4e-d2c70f754a1c"; - fsType = "ext4"; - neededForBoot = false; - }; - # Big fucking thing - fileSystems."/mnt/rae2" = { - device = "/dev/disk/by-uuid/fbbcc72f-34af-425c-9151-ef8919a6ae07"; - fsType = "ext4"; - neededForBoot = false; - }; +# # Music pendrive +# fileSystems."/mnt/world" = { +# device = "/dev/disk/by-uuid/639bae80-0f5d-481c-ae4e-d2c70f754a1c"; +# fsType = "ext4"; +# neededForBoot = false; +# }; +# # Big fucking thing +# fileSystems."/mnt/rae2" = { +# device = "/dev/disk/by-uuid/fbbcc72f-34af-425c-9151-ef8919a6ae07"; +# fsType = "ext4"; +# neededForBoot = false; +# }; networking = { - firewall.allowedTCPPorts = [ 80 443 8080 ]; + firewall.allowedTCPPorts = [ 80 443 8080 19132 25565 ]; hosts = { "10.0.0.2" = [ "near" "near.local" ]; }; @@ -53,22 +53,24 @@ enable = true; powerOnBoot = true; }; - graphics = { - enable = true; - extraPackages = with pkgs; [ - intel-media-sdk - ]; - }; - nvidia = { - modesetting.enable = true; - powerManagement = { - enable = false; - finegrained = false; - }; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; +# graphics = { +# enable = true; +# extraPackages = with pkgs; [ +# intel-media-sdk +# ]; +# }; +# nvidia = { +# modesetting.enable = true; +# powerManagement = { +# enable = false; +# finegrained = false; +# }; +# open = false; +# nvidiaSettings = true; +# package = config.boot.kernelPackages.nvidiaPackages.stable; +# # temp +# package = config.boot.kernelPackages.nvidiaPackages.legacy_390; +# }; opentabletdriver.enable = true; }; @@ -119,7 +121,7 @@ enable = true; xkb.layout = "us"; #?TODO maybe put all nvidia settings into its own module (i.e. r5e.hardware.nvidia.enable) + x11 with xdg config - videoDrivers = [ "nvidia" ]; +# videoDrivers = [ "nvidia" ]; windowManager = { cwm.enable = true; openbox.enable = true; diff --git a/nixos/hosts/marquet/configuration.nix b/nixos/hosts/marquet/configuration.nix new file mode 100644 index 0000000..241650a --- /dev/null +++ b/nixos/hosts/marquet/configuration.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + ../base.nix + ../../modules/system + ]; + + r5e.system = { + graphics = { + display.x11 = { + enable = true; + windowManagers = { + twm.enable = true; + }; + displayManager.autologin = { + enable = false; + session = "none+twm"; + }; + }; + hardwareAcceleration = { + enable = true; + intel.videoPlayback = { + enable = true; + package = pkgs.intel-vaapi-driver; + }; + }; + }; + }; +} + diff --git a/nixos/modules/system/default.nix b/nixos/modules/system/default.nix new file mode 100644 index 0000000..32f9a1f --- /dev/null +++ b/nixos/modules/system/default.nix @@ -0,0 +1,118 @@ +{ pkgs, lib, config, ... }: let + cfg = config.r5e.system; +in with lib; { + options.r5e.system = { + graphics = { + display.x11 = { + enable = mkEnableOption "X11"; + windowManagers = { + twm.enable = mkEnableOption "twm"; + }; + displayManager = { + # enable = mkEnableOption "SDDM"; + autologin = { + enable = mkEnableOption "SDDM autologin"; + user = mkOption { + type = types.str; + default = "rae"; + }; + session = mkOption { + type = types.str; + default = "none+twm"; + }; + }; + }; + }; + + hardwareAcceleration = { + enable = mkEnableOption "graphics acceleration"; + intel = { + videoPlayback = { + # TODO wiki.nixos.org/wiki/Intel_Graphics + enable = mkEnableOption "accelerated video playback"; + package = mkPackageOption pkgs "intel-media-driver"; + }; + qsv = { + enable = mkEnableOption "Intel Quick Sync Video"; + package = mkPackageOption pkgs "vpl-gpu-rt"; + }; + }; + nvidia = { + enable = mkEnableOption "NVIDIA drivers"; + package = mkPackageOption config.boot.kernelPackages.nvidiaPackages "stable"; + }; + }; + }; + + programs = { + steam = { + enable = mkEnableOption "Steam"; + openFirewall = mkOption { + type = types.bool; + default = false; + }; + }; + thunderbird = { + enable = mkEnableOption "Mozilla Thunderbird"; + }; + }; + }; + + config = { + environment = { + sessionVariables = { + LIBVA_DRIVER_NAME = mkIf cfg.graphics.hardwareAcceleration.intel.videoPlayback.enable + (if cfg.graphics.hardwareAcceleration.intel.videoPlayback.package == pkgs.intel-vaapi-driver then "i965" else "iHD"); + }; + }; + + hardware = { + graphics = { + enable = cfg.graphics.hardwareAcceleration.enable; + extraPackages = + optional cfg.graphics.hardwareAcceleration.intel.videoPlayback.enable cfg.graphics.hardwareAcceleration.intel.videoPlayback.package + ++ optional cfg.graphics.hardwareAcceleration.intel.qsv.enable cfg.graphics.hardwareAcceleration.intel.qsv.package; + }; + nvidia = mkIf cfg.graphics.hardwareAcceleration.nvidia.enable { + modesetting.enable = true; + powerManagement = { + enable = false; + finegrained = false; + }; + open = false; + nvidiaSettings = true; + package = cfg.graphics.hardwareAcceleration.nvidia.package; + }; + }; + + services = { + xserver = { + enable = cfg.graphics.display.x11.enable; + xkb.layout = "us"; + windowManager = cfg.graphics.display.x11.windowManagers; + videoDrivers = optional cfg.graphics.hardwareAcceleration.nvidia.enable "nvidia"; + }; + displayManager.sddm = { + enable = cfg.graphics.display.x11.enable; + settings.Autologin = mkIf cfg.graphics.display.x11.displayManager.autologin.enable { + User = cfg.graphics.display.x11.displayManager.autologin.user; + Session = cfg.graphics.display.x11.displayManager.autologin.session; + }; + }; + }; + + programs = { + steam = { + enable = cfg.programs.steam.enable; + remotePlay.openFirewall = cfg.programs.steam.openFirewall; + dedicatedServer.openFirewall = cfg.programs.steam.openFirewall; + localNetworkGameTransfers.openFirewall = cfg.programs.steam.openFirewall; + }; + thunderbird = { + enable = cfg.programs.thunderbird.enable; + policies.DisableTelemetry = true; + }; + }; + }; +} + diff --git a/secrets/minecraft_wiki.gpg b/secrets/minecraft_wiki.gpg new file mode 100644 index 0000000..3d4265f --- /dev/null +++ b/secrets/minecraft_wiki.gpg @@ -0,0 +1,2 @@ +^>=̢ @ +6]5EJ;% Rg\:D0C3yP2gaL _O0SJ)4{b U Jbj1ѼYȒik''G=dn ѣA7C2.a5:B1CQw{y \ No newline at end of file diff --git a/secrets/openstreetmap.gpg b/secrets/openstreetmap.gpg new file mode 100644 index 0000000..2bc6feb --- /dev/null +++ b/secrets/openstreetmap.gpg @@ -0,0 +1 @@ +^>=̢ @2`k,~ӷ͍MMݖ;0OP)v%/ M/ꅦy hMLUK%#U *K-`j}Ⓛˀ7 ~D{ "" E&s=k&^ \ No newline at end of file