From 5661a2c030db6ed1cc2bb94bed75a91c71c7f04c Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sun, 3 Mar 2024 16:40:58 -0800 Subject: [PATCH] owdio --- extras/cosmic.nix | 30 +++--------------------------- extras/gaming.nix | 41 ++--------------------------------------- flake.lock | 24 ++++++++++++------------ systems/BASED.nix | 11 ++++------- systems/NOcomputer.nix | 8 ++++---- 5 files changed, 25 insertions(+), 89 deletions(-) diff --git a/extras/cosmic.nix b/extras/cosmic.nix index 7809d4f..c61c5ab 100644 --- a/extras/cosmic.nix +++ b/extras/cosmic.nix @@ -1,29 +1,5 @@ -{pkgs, ...}: { - # environment.systemPackages = with pkgs; [ - # cosmic-bg - # cosmic-applets - # cosmic-applibrary - # cosmic-comp - # cosmic-edit - # cosmic-files - # cosmic-greeter - # cosmic-icons - # cosmic-launcher - # cosmic-notifications - # cosmic-osd - # cosmic-panel - # cosmic-protocols - # cosmic-randr - # cosmic-screenshot - # cosmic-session - # cosmic-settings - # cosmic-settings-daemon - # cosmic-term - # cosmic-workspaces-epoch - # xdg-desktop-portal-cosmic - # ]; - services.xserver.displayManager.cosmic-greeter.enable = true; +{...}: { services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.cosmic.enable = false; - # services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.cosmic-greeter.enable = false; + services.xserver.desktopManager.cosmic.enable = true; } diff --git a/extras/gaming.nix b/extras/gaming.nix index d8287da..2f7d09e 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -19,17 +19,14 @@ yuzu ]; - # programs.steam.enable = true; - # programs.steam.gamescopeSession.enable = true; programs.steam = { enable = true; remotePlay.openFirewall = true; gamescopeSession.enable = false; }; - # programs.gamemode.enable = true; + programs.gamemode.enable = true; programs.gamescope.enable = true; - users = {groups.game = {};}; security.pam.loginLimits = [ { domain = "@game"; @@ -39,40 +36,6 @@ } ]; - # services.pipewire = { - # enable = true; - # }; - # environment.etc = let - # json = pkgs.formats.json {}; - # in { - # "pipewire/pipewire.conf.d/92-low-latency.conf".source = json.generate "92-low-latency.conf" { - # context.properties = { - # # default.allowed-rates = [] - # default.clock.rate = 192000; - # default.clock.quantum = 32; - # default.clock.min-quantum = 32; - # default.clock.max-quantum = 32; - # }; - # }; - # "pipewire/pipewire-pulse.d/92-low-latency.conf".source = json.generate "92-low-latency.conf" { - # context.modules = [ - # { - # name = "libpipewire-module-protocol-pulse"; - # args = { - # pulse.min.req = "32/44100"; - # pulse.default.req = "32/192000"; - # pulse.max.req = "32/192000"; - # pulse.min.quantum = "32/192000"; - # pulse.max.quantum = "32/192000"; - # }; - # } - # ]; - # stream.properties = { - # node.latency = "32/192000"; - # resample.quality = 1; - # }; - # }; - # }; # services.pipewire.enable = false; services.pipewire.extraConfig = { pipewire."99-low-latency" = { @@ -89,7 +52,7 @@ { name = "libpipewire-module-protocol-pulse"; args = { - pulse.min.req = "32/44100"; + pulse.min.req = "32/192000"; pulse.default.req = "32/192000"; pulse.max.req = "32/192000"; pulse.min.quantum = "32/192000"; diff --git a/flake.lock b/flake.lock index 8b51689..5f560c4 100644 --- a/flake.lock +++ b/flake.lock @@ -301,11 +301,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709388358, - "narHash": "sha256-qZy8Kb/9SYzKd8QLvioaOymDgsvH71/Z9Y57DiWzvfU=", + "lastModified": 1709488578, + "narHash": "sha256-ZcugEh4qENd0hZUtgBn8wS32ajXRw+HH96nv+3nohRk=", "owner": "helix-editor", "repo": "helix", - "rev": "5bd007266a962a534bd722619821e998735b71e2", + "rev": "cc43e3521ed94e9d6e77c719c14073d3e7217c97", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "lastModified": 1709485962, + "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=", "owner": "nix-community", "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "rev": "d579633ff9915a8f4058d5c439281097e92380a8", "type": "github" }, "original": { @@ -364,11 +364,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1709458510, - "narHash": "sha256-n3nHnrf7SuX/7CY03+a0Ucd4XoMAwLI+3siKTcWOLtM=", + "lastModified": 1709486703, + "narHash": "sha256-AIDAnQja0/2YsZb6Rxa//gH9uV0QmVs/vsVXj2DAd7s=", "owner": "martinvonz", "repo": "jj", - "rev": "24868e519289d5d1862dff1d63eb25d1eb5fdba1", + "rev": "415ae5c0f9ed4d45df564a4aca6d327485a445bf", "type": "github" }, "original": { @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1709431929, - "narHash": "sha256-BTB0Cj3epV1jQzyHgnHqHVB4hVGLX8I1P5q1jX2Yk+c=", + "lastModified": 1709510396, + "narHash": "sha256-9+AJCOpEK2Ep/oVr5MJrIOUxIhqfvbJDJLMhY4VsjUc=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "cf541e75fffa32eff4eb22f93dad9de4e72e968e", + "rev": "85c24bf513fbe31a2bdeaabaf2b18cc0ab3d5e35", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index fb1dede..781a645 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -68,20 +68,17 @@ boot.loader.timeout = 1; boot.supportedFilesystems = ["ntfs"]; - networking.networkmanager = { - enable = true; - }; + networking.networkmanager.enable = true; + # TODO check why this??? - networking.firewall.enable = false; + networking.firewall.enable = true; 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.desktopManager.plasma5.enable = lib.mkDefault true; services.xserver.desktopManager.plasma6.enable = lib.mkDefault true; - # TODO plasma6 - environment.plasma5.excludePackages = with pkgs.libsForQt5; [ + environment.plasma6.excludePackages = with pkgs.libsForQt6; [ elisa konsole gwenview diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 9bad8bd..5da2559 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - # services.xserver.displayManager = { - # autoLogin.enable = true; - # autoLogin.user = "tao"; - # }; + services.xserver.displayManager = { + autoLogin.enable = true; + autoLogin.user = "tao"; + }; environment.systemPackages = with pkgs; [ # egl-wayland