From e3b621e436eb139f86e2ba01186664f9d4835f14 Mon Sep 17 00:00:00 2001 From: zoe Date: Sat, 5 Nov 2022 12:15:01 +0100 Subject: [PATCH] eeeee --- configuration.nix | 12 ++++++++++++ programs.nix | 8 ++++++++ services.nix | 9 ++++++++- sync.sh | 2 +- systemd.nix | 18 ++++++++++++++++++ user.nix | 9 ++++++--- 6 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 programs.nix create mode 100644 systemd.nix diff --git a/configuration.nix b/configuration.nix index 8215d10..da47a60 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,6 +12,7 @@ ./home.nix ./user.nix ./services.nix + ./programs.nix ]; # Bootloader. @@ -19,6 +20,17 @@ boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; + hardware = { + opengl = { + extraPackages32 = [ + pkgs.driversi686Linux.amdvlk + ]; + extraPackages = [ + pkgs.amdvlk + ]; + }; + }; + # hostname networking.hostName = "cat"; # Define your hostname. diff --git a/programs.nix b/programs.nix new file mode 100644 index 0000000..8ecc8a5 --- /dev/null +++ b/programs.nix @@ -0,0 +1,8 @@ +{ pkgs, ...}: +{ + 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/services.nix b/services.nix index 5ca10f1..675af89 100644 --- a/services.nix +++ b/services.nix @@ -1,4 +1,11 @@ { pkgs, ... }: { - services = { }; + services = { + udisks2.enable = true; + xserver.desktopManager.xfce.thunarPlugins = with pkgs; [ + xfce.thunar-volman + xfce.thunar-archive-plugin + xfce.thunar-media-tags-plugin + ]; + }; } diff --git a/sync.sh b/sync.sh index dd77b01..de43543 100755 --- a/sync.sh +++ b/sync.sh @@ -7,7 +7,7 @@ git pull # cp -r /etc/nixos/ ./backup # copy over all the files to /etc/nixos/ -sudo cp -r ./configuration.nix ./wallpaper.png ./dunst ./rofi ./i3 ./fish ./kitty ./nvim/ ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/ +sudo cp -r ./configuration.nix ./wallpaper.png ./dunst ./rofi ./i3 ./fish ./kitty ./nvim/ ./programs.nix ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/ # build penrose and copy it to nixos folder # cd ./penrose diff --git a/systemd.nix b/systemd.nix new file mode 100644 index 0000000..e4fd878 --- /dev/null +++ b/systemd.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: +{ + systemd = { + user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wants = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + }; +} diff --git a/user.nix b/user.nix index 8fdbba0..5096cb9 100644 --- a/user.nix +++ b/user.nix @@ -14,13 +14,13 @@ git networkmanagerapplet thunderbird + tor-browser-bundle-bin + mullvad-vpn # files and partitions gnome.gnome-disk-utility xfce.thunar - xfce.thunar-volman - xfce.thunar-archive-plugin - xfce.thunar-media-tags-plugin + pcmanfm # music / sound cmus @@ -40,6 +40,9 @@ # games steam + lutris + wine + winetricks # x11 arandr