From 3ad89e10d2462b360047e15c9c6e22d9df299ee3 Mon Sep 17 00:00:00 2001 From: doloro Date: Tue, 23 Sep 2025 11:52:13 +0000 Subject: [PATCH] config changes (not working) --- nix/configuration.nix | 23 ++++++---- nix/modules/steam/default.nix | 0 nix/modules/steam/nixos.nix | 44 +++++++++++++++++++ nix/modules/stylix/home.nix | 2 +- nix/modules/stylix/nixos.nix | 5 +-- quickshell/bar/widgets/Audio.qml | 4 +- .../bar/widgets/workspace/WorkspaceWidget.qml | 2 +- 7 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 nix/modules/steam/default.nix create mode 100644 nix/modules/steam/nixos.nix diff --git a/nix/configuration.nix b/nix/configuration.nix index 78e6c1f..d7b594f 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -10,6 +10,7 @@ ./hardware-configuration.nix ./modules/greetd/nixos.nix ./modules/stylix/nixos.nix + ./modules/steam/nixos.nix ./disks.nix ]; @@ -25,7 +26,7 @@ nix.settings.experimental-features = ["flakes" "nix-command"]; - # networking.hostName = "nixos"; # Define your hostname. + networking.hostName = "doloroo-main"; # Define your hostname. nixpkgs.config.allowUnfree = true; @@ -45,7 +46,7 @@ }; # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; + time.timeZone = "Europe/London"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -103,6 +104,17 @@ package = config.boot.kernelPackages.nvidiaPackages.latest; }; + fonts = { + enableDefaultPackages = true; + packages = with pkgs; [ + jetbrains-mono + material-design-icons + material-symbols + nerd-fonts.caskaydia-cove + ]; + fontDir.enable = true; + }; + # Configure keymap in X11 # services.xserver.xkb.layout = "us"; # services.xserver.xkb.options = "eurosign:e,caps:escape"; @@ -141,13 +153,6 @@ wget ]; - 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 - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers - }; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/nix/modules/steam/default.nix b/nix/modules/steam/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/nix/modules/steam/nixos.nix b/nix/modules/steam/nixos.nix new file mode 100644 index 0000000..41b20e2 --- /dev/null +++ b/nix/modules/steam/nixos.nix @@ -0,0 +1,44 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.modules.steam; +in +{ + options = { + modules.steam.enable = lib.mkEnableOption "Steam configuration module"; + }; + config = lib.mkIf cfg.enable { + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + # Ensure gamescope is inside the steam "fhs" + package = pkgs.steam.override { + extraLibraries = pkgs: [ pkgs.xorg.libxcb ]; + extraPkgs = + pkgs: with pkgs; [ + attr + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + mangohud + gamemode + (gamescope.overrideAttrs { enableWsi = true; }) + + ]; + }; + }; + }; +} diff --git a/nix/modules/stylix/home.nix b/nix/modules/stylix/home.nix index 5ac35dd..0de7a81 100644 --- a/nix/modules/stylix/home.nix +++ b/nix/modules/stylix/home.nix @@ -11,7 +11,7 @@ in { imports = [ - ./shared.nix + #./shared.nix inputs.stylix.homeModules.stylix ]; config = { diff --git a/nix/modules/stylix/nixos.nix b/nix/modules/stylix/nixos.nix index 84b4fb7..5f7852b 100644 --- a/nix/modules/stylix/nixos.nix +++ b/nix/modules/stylix/nixos.nix @@ -14,10 +14,7 @@ in ./shared.nix inputs.stylix.nixosModules.stylix ]; - options = { - modules.stylix.enable = lib.mkEnableOption "Steam configuration module"; - }; - config = lib.mkIf cfg.enable { + config = { stylix.enable = true; }; diff --git a/quickshell/bar/widgets/Audio.qml b/quickshell/bar/widgets/Audio.qml index d09cb4f..f12e85d 100755 --- a/quickshell/bar/widgets/Audio.qml +++ b/quickshell/bar/widgets/Audio.qml @@ -34,7 +34,7 @@ Item { // implicitSize: 25 font.pixelSize: 28 color: root.speakerNode.audio.muted ? "#FF474C" : "white" - font.family: "JetBrainsMono Nerd Font Mono" + font.family: "CaskaydiaCove Nerd Font Mono" text: root.speakerNode.audio.muted ? Common.Icons.audioIcons.speakerMuted : Common.Icons.audioIcons.speaker } } @@ -52,7 +52,7 @@ Item { // implicitSize: 25 font.pixelSize: 34 color: root.microphoneNode.audio.muted ? "#FF474C" : "white" - font.family: "JetBrainsMono Nerd Font Mono" + font.family: "CaskaydiaCove Nerd Font Mono" text: root.microphoneNode.audio.muted ? Common.Icons.audioIcons.microphoneMuted : Common.Icons.audioIcons.microphone } } diff --git a/quickshell/bar/widgets/workspace/WorkspaceWidget.qml b/quickshell/bar/widgets/workspace/WorkspaceWidget.qml index 994ed41..ea03f0a 100755 --- a/quickshell/bar/widgets/workspace/WorkspaceWidget.qml +++ b/quickshell/bar/widgets/workspace/WorkspaceWidget.qml @@ -46,7 +46,7 @@ RowLayout { Text { id: icon color: "white" - font.family: "NotoSans Nerd Font:style=Regular" // https://www.reddit.com/r/Polybar/comments/sh8krs/comment/hv3lykm/ + font.family: "CaskaydiaCove Nerd Font Mono" // https://www.reddit.com/r/Polybar/comments/sh8krs/comment/hv3lykm/ font.pointSize: 13 // long-ass oneliner for "if there is no class icon, go to fallback" text: (Common.Icons.appIcons[(modelData.lastIpcObject.class)] != undefined ) ? Common.Icons.appIcons[(modelData.lastIpcObject.class)] : Common.Icons.appIcons["fallback"]