diff --git a/configuration.nix b/configuration.nix index d5cf60d..717b59e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,7 @@ { pkgs, settings, + lib, ... }: { system.stateVersion = settings.version; @@ -22,7 +23,8 @@ }; #sound settings security.rtkit.enable = true; - sound.enable = false; #disable alsa + sound.enable = lib.mkForce false; #disable alsa + hardware.pulseaudio.enable = lib.mkForce false; #disable pulseAudio services.pipewire = { enable = true; wireplumber.enable = true; diff --git a/flake.lock b/flake.lock index d456b8f..fcbc5d0 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675247113, - "narHash": "sha256-+YcXjfCP4hNu8A68b/UoXFCTDwKLuLV+x/7dQnM5U/o=", + "lastModified": 1675462931, + "narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=", "owner": "nix-community", "repo": "home-manager", - "rev": "782cb855b2f23c485011a196c593e2d7e4fce746", + "rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3", "type": "github" }, "original": { @@ -72,33 +72,13 @@ "type": "github" } }, - "nix-gaming": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675100158, - "narHash": "sha256-B8Nhm28gfhjKQQJC3Za34pNrrgG0wCdrSwMwXq4W95k=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "60c20c3c8682aaf55022e168b5b91f4dbd69849a", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "lastModified": 1675362331, + "narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "rev": "a100acd7bbf105915b0004427802286c37738fef", "type": "github" }, "original": { @@ -110,11 +90,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1675294487, - "narHash": "sha256-0fnsREH0Zw/t/jJ8ENPOyzwvlQ8qwTV1EpmpdIuz8go=", + "lastModified": 1675485332, + "narHash": "sha256-fFxXsBC+0wpxVzcUMDFsghG+oWrsf5/yCzusfDcRhqg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d5afe9120947d47a304990045f49b5ade7a7c9", + "rev": "ce310d1e4a614d7d0b24c9cc1ef172214a637d37", "type": "github" }, "original": { @@ -148,7 +128,6 @@ "inputs": { "fetch-rs": "fetch-rs", "home-manager": "home-manager", - "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", "nvim-config": "nvim-config", diff --git a/flake.nix b/flake.nix index c168d0f..2e2cfe1 100644 --- a/flake.nix +++ b/flake.nix @@ -26,10 +26,6 @@ url = github:ISnortPennies/fetch-rs; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-gaming = { - url = github:fufexan/nix-gaming; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, diff --git a/modules/xserver.nix b/modules/dwm.nix similarity index 100% rename from modules/xserver.nix rename to modules/dwm.nix diff --git a/modules/gaming.nix b/modules/gaming.nix index d877755..df64a33 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -8,38 +8,10 @@ heroic legendary-gl prismlauncher - ] - ++ builtins.attrValues (inputs.nix-gaming.lib.legendaryBuilder - { - inherit (pkgs) system; - - games = { - rocket-league = { - desktopName = "Rocket League"; - - tricks = ["dxvk" "win10"]; - - icon = builtins.fetchurl { - url = "https://user-images.githubusercontent.com/36706276/203341314-eaaa0659-9b79-4f40-8b4a-9bc1f2b17e45.png"; - name = "rocket-league.png"; - sha256 = "0a9ayr3vwsmljy7dpf8wgichsbj4i4wrmd8awv2hffab82fz4ykb"; - }; - - discordIntegration = false; - gamemodeIntegration = false; - - preCommands = '' - echo "the game will start!" - ''; - - postCommands = '' - echo "the game has stopped!" - ''; - }; - }; - - opts = { - wine = inputs.nix-gaming.packages.${pkgs.system}.wine-tkg; - }; - }); + ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server +}; } diff --git a/modules/gnome.nix b/modules/gnome.nix new file mode 100644 index 0000000..4025409 --- /dev/null +++ b/modules/gnome.nix @@ -0,0 +1,42 @@ + +{ + pkgs, + settings, + ... +}: { +environment.gnome.excludePackages = (with pkgs; [ + gnome-photos + gnome-tour +]) ++ (with pkgs.gnome; [ + cheese # webcam tool + gnome-music + gnome-terminal + gedit # text editor + epiphany # web browser + geary # email reader + evince # document viewer + gnome-characters + totem # video player + tali # poker game + iagno # go game + hitori # sudoku game + atomix # puzzle game +]); + + services.xserver = { + enable = true; + exportConfiguration = true; #make config debuggable + layout = "us"; + libinput.enable = true; + xautolock.enable = false; + desktopManager.xterm.enable = false; + excludePackages = [pkgs.xterm]; + desktopManager.gnome.enable = true; + displayManager = { + sessionCommands = '' + feh --bg-scale ${../images/recursion.png} + ''; + gdm.enable = true; +}; + }; +} diff --git a/systems/desktop.nix b/systems/desktop.nix index 16a293f..9a70280 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -17,7 +17,7 @@ "scripts" "sxhkd" "vfio" - "xserver" + "dwm" "shells" ]; in diff --git a/systems/laptop.nix b/systems/laptop.nix index 8335771..2a19de8 100644 --- a/systems/laptop.nix +++ b/systems/laptop.nix @@ -14,7 +14,7 @@ "prime" "scripts" "sxhkd" - "xserver" + "gnome" "shells" "gaming" ];