diff --git a/configuration/fonts.nix b/configuration/fonts.nix index 4b7db81..b9c4286 100644 --- a/configuration/fonts.nix +++ b/configuration/fonts.nix @@ -22,6 +22,7 @@ fcitx5 = { waylandFrontend = true; addons = with pkgs; [ fcitx5-mozc ]; + plasma6Support = true; }; }; }; diff --git a/home-manager/dotfiles/gitconfig b/home-manager/dotfiles/gitconfig deleted file mode 100644 index 46bc0e9..0000000 --- a/home-manager/dotfiles/gitconfig +++ /dev/null @@ -1,7 +0,0 @@ -[credential] - helper = /home/worble/.nix-profile/bin/git-credential-manager - credentialStore = secretservice -[credential "https://dev.azure.com"] - useHttpPath = true -[credential "https://git.worble.xyz"] - provider = generic diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index f528f55..41d3eff 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -4,8 +4,6 @@ home.packages = with pkgs;[ steamguard-cli bottles - protontricks - gamescope inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev ]; } diff --git a/home-manager/terminal.nix b/home-manager/terminal.nix index 41857f8..0ef2001 100644 --- a/home-manager/terminal.nix +++ b/home-manager/terminal.nix @@ -30,7 +30,7 @@ with lib; # org.gradle.daemon.idletimeout=3600000 # ''; - ".gitconfig".source = ./dotfiles/gitconfig; + #".gitconfig".source = ./dotfiles/gitconfig; }; programs = { @@ -42,6 +42,28 @@ with lib; ''; }; + git = { + enable = true; + delta.enable = true; + extraConfig = { + credential = { + helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" ]; + credentialStore = "secretservice"; + }; + "credential \"https://dev.azure.com\"" = { + useHttpPath = true; + }; + }; + }; + + git-credential-oauth = { + enable = true; + }; + + gitui = { + enable = true; + }; + starship.enable = true; atuin.enable = true; @@ -60,15 +82,6 @@ with lib; nix-direnv.enable = true; }; - git = { - enable = true; - delta.enable = true; - }; - - gitui = { - enable = true; - }; - helix = { enable = true; defaultEditor = true; diff --git a/modules/gaming.nix b/modules/gaming.nix index fec94c3..8cf0b2f 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -9,8 +9,10 @@ remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server #gamescopeSession.enable = true; + protontricks.enable = true; }; programs.gamemode.enable = true; + programs.gamescope.enable = true; # ensure users who need access to this have `cdrom` as `extraGroups` programs.cdemu.enable = true; diff --git a/update.sh b/update.sh index 795cc96..a84efc8 100755 --- a/update.sh +++ b/update.sh @@ -1,3 +1,2 @@ #!/usr/bin/env bash -FLAKE=${1:?"missing arg 1 for flake target"} -sudo nixos-rebuild switch --flake "/home/worble/Projects/nixos#$FLAKE" +sudo nixos-rebuild switch --flake "/home/worble/Projects/nixos#$(hostname)"