Compare commits

..

3 commits

6 changed files with 28 additions and 20 deletions

View file

@ -4,11 +4,9 @@ local function visual_stage()
local first_line = vim.fn.line('v') local first_line = vim.fn.line('v')
local last_line = vim.fn.getpos('.')[2] local last_line = vim.fn.getpos('.')[2]
gitsigns.stage_hunk({ first_line, last_line }) gitsigns.stage_hunk({ first_line, last_line })
-- Switch back to normal mode, there may be a cleaner way to do this
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<Esc>', true, false, true), 't', false)
end end
vim.keymap.set("v", "gbhs", function() vim.keymap.set("v", "gs", function()
visual_stage() visual_stage()
end) end)

View file

@ -62,7 +62,7 @@
}; };
# Set your time zone. # Set your time zone.
time.timeZone = "America/Toronto"; time.timeZone = "America/Montreal";
# No touchy # No touchy
system.stateVersion = "23.11"; system.stateVersion = "23.11";

View file

@ -6,8 +6,8 @@
gsr = pkgs.gpu-screen-recorder.overrideAttrs (o: { gsr = pkgs.gpu-screen-recorder.overrideAttrs (o: {
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://repo.dec05eba.com/gpu-screen-recorder"; url = "https://repo.dec05eba.com/gpu-screen-recorder";
rev = "1ac862d155e10f050e6f6cca5381f9f5a3528d98"; rev = "2f60f4c109f1bcc748d5f0d937476e8708a4073b";
hash = "sha256-wLiBn4VIi+IWY4qVkdFzkHhECTFH97snogVTEwM5yx8="; hash = "sha256-pdyKspXx6ozXLgfLHAyRrPVJ2kzllHQDhPu1QQwpQjU=";
}; };
buildInputs = buildInputs =
@ -29,7 +29,7 @@
install -Dm755 "gsr-kms-server" "$out/bin/gsr-kms-server" install -Dm755 "gsr-kms-server" "$out/bin/gsr-kms-server"
install -Dm755 "gpu-screen-recorder" "$out/bin/gpu-screen-recorder" install -Dm755 "gpu-screen-recorder" "$out/bin/gpu-screen-recorder"
install -Dm644 "extra/gpu-screen-recorder.service" "$out/lib/systemd/user/gpu-screen-recorder.service" #install -Dm644 "extra/gpu-screen-recorder.service" "$out/lib/systemd/user/gpu-screen-recorder.service"
wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
pkgs.addOpenGLRunpath.driverLink pkgs.addOpenGLRunpath.driverLink
@ -45,11 +45,6 @@ in {
(writeShellScriptBin "gpu-save-replay" '' (writeShellScriptBin "gpu-save-replay" ''
exec ${pkgs.procps}/bin/pkill --signal SIGUSR1 -f gpu-screen-recorder exec ${pkgs.procps}/bin/pkill --signal SIGUSR1 -f gpu-screen-recorder
'') '')
# Run this after login to make sure it works
(writeShellScriptBin "gpu-restart-replay" ''
exec systemctl --user restart gpu-screen-recorder.service
'')
]; ];
security.wrappers = { security.wrappers = {

View file

@ -7,12 +7,13 @@
nix-gaming.nixosModules.steamCompat nix-gaming.nixosModules.steamCompat
]; ];
programs.steam = { programs = {
enable = true; steam = {
enable = true;
extraCompatPackages = [ extraCompatPackages = [
# pkgs.luxtorpeda nix-gaming.packages.${pkgs.system}.proton-ge
nix-gaming.packages.${pkgs.system}.proton-ge ];
]; };
}; };
} }

View file

@ -5,6 +5,20 @@
hyprland, hyprland,
... ...
}: let }: let
nvidia =
if config.hardware.nvidia.modesetting.enable
then {
env = ''
env = LIBVA_DRIVER_NAME,nvidia
env = XDG_SESSION_TYPE,wayland
env = GBM_BACKEND,nvidia-drm
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
env = WLR_NO_HARDWARE_CURSORS,1
'';
}
else {
env = "";
};
regreetBin = "${lib.getExe config.programs.regreet.package}"; regreetBin = "${lib.getExe config.programs.regreet.package}";
hyprBin = "${hyprland.packages.x86_64-linux.default}/bin"; hyprBin = "${hyprland.packages.x86_64-linux.default}/bin";
gset = pkgs.gsettings-desktop-schemas; gset = pkgs.gsettings-desktop-schemas;
@ -16,6 +30,8 @@
${builtins.readFile ./hyprland.conf} ${builtins.readFile ./hyprland.conf}
${nvidia.env}
# FIXME: kb doesn't work # FIXME: kb doesn't work
env = XDG_DATA_DIRS, ${gset}/share/gsettings-schemas/${gset.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS env = XDG_DATA_DIRS, ${gset}/share/gsettings-schemas/${gset.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS
exec-once = squeekboard exec-once = squeekboard

View file

@ -32,5 +32,3 @@ decoration {
} }
drop_shadow = false drop_shadow = false
} }