From 5d6114ac242da691ff0a963a9a0b19d9831345cf Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:16:39 -0800 Subject: [PATCH] backout of commit b0385e19f7c83bb918fef67dccf8d1b3f755e9a7 --- extras/cosmic.nix | 4 ++-- extras/dev.nix | 10 +++++----- extras/gaming.nix | 2 +- systems/BASED.nix | 8 +++++--- systems/NOcomputer.nix | 2 +- users/tao/wezterm.lua | 2 -- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extras/cosmic.nix b/extras/cosmic.nix index b7bb805..7809d4f 100644 --- a/extras/cosmic.nix +++ b/extras/cosmic.nix @@ -23,7 +23,7 @@ # xdg-desktop-portal-cosmic # ]; services.xserver.displayManager.cosmic-greeter.enable = true; - services.xserver.displayManager.sddm.enable = false; - services.xserver.desktopManager.cosmic.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.cosmic.enable = false; # services.xserver.desktopManager.plasma5.enable = true; } diff --git a/extras/dev.nix b/extras/dev.nix index b52fb4a..eba345a 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -6,7 +6,7 @@ environment.systemPackages = with pkgs; [ # freecad # vulkan-loader - # etcher + etcher hyperfine inputs.helix.packages.${pkgs.system}.default jq @@ -57,10 +57,10 @@ trunk ]; - # nixpkgs.config.permittedInsecurePackages = [ - # # probably etcher - # "electron-19.1.9" - # ]; + nixpkgs.config.permittedInsecurePackages = [ + # probably etcher + "electron-19.1.9" + ]; services.udev.extraRules = '' SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" diff --git a/extras/gaming.nix b/extras/gaming.nix index ba8b106..7494584 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -23,7 +23,7 @@ programs.steam = { enable = true; remotePlay.openFirewall = true; - gamescopeSession.enable = true; + gamescopeSession.enable = false; }; # programs.gamemode.enable = true; programs.gamescope.enable = true; diff --git a/systems/BASED.nix b/systems/BASED.nix index 6773c46..3ade04a 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -16,7 +16,7 @@ firefox git inputs.helix.packages.${pkgs.system}.default - libthai + # libthai localsend macchina mesa @@ -28,7 +28,7 @@ skim tree wezterm - wget + # wget yt-dlp zellij zstd @@ -71,14 +71,16 @@ networking.networkmanager = { enable = true; }; + # TODO check why this??? networking.firewall.enable = false; services.xserver.enable = lib.mkDefault true; services.xserver.xkb.layout = "us"; systemd.services.display-manager.restartIfChanged = false; - services.xserver.displayManager.sddm.enable = lib.mkDefault true; + services.xserver.displayManager.gdm.enable = lib.mkDefault true; # services.xserver.desktopManager.plasma5.enable = lib.mkDefault true; services.xserver.desktopManager.plasma6.enable = lib.mkDefault true; + # TODO plasma6 environment.plasma5.excludePackages = with pkgs.libsForQt5; [ elisa konsole diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 035297d..9bad8bd 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -100,7 +100,7 @@ modesetting.enable = true; powerManagement.enable = true; # options: production, beta, vulkan_beta, latest - package = pkgs.linuxPackages_zen.nvidiaPackages.production; + package = pkgs.linuxPackages_zen.nvidiaPackages.latest; }; # enable core and mem freq sliders for nvidia services.xserver.deviceSection = '' diff --git a/users/tao/wezterm.lua b/users/tao/wezterm.lua index 8fe40b6..a3ce5cb 100644 --- a/users/tao/wezterm.lua +++ b/users/tao/wezterm.lua @@ -5,6 +5,4 @@ return { check_for_updates = false, hide_tab_bar_if_only_one_tab = true, - - -- front_end = 'WebGpu', }