why cant git pull just pull

This commit is contained in:
waveringana 2025-06-16 00:33:29 -04:00
parent 8f7da696e5
commit 397d3b06f1
6 changed files with 26 additions and 39 deletions

View file

@ -10,6 +10,7 @@
hyfetch hyfetch
sway-contrib.grimshot sway-contrib.grimshot
discord discord
pamixer
]; ];
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

View file

@ -20,7 +20,6 @@ in
programs.sway = { programs.sway = {
enable = true; enable = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
package = pkgs.swayfx;
}; };
environment.sessionVariables = { environment.sessionVariables = {

View file

@ -13,6 +13,8 @@
};*/ };*/
ghostty.enable = true; ghostty.enable = true;
ghostty.flavor = "mocha"; ghostty.flavor = "mocha";
nvim.enable = true;
nvim.flavor = "mocha";
}; };
programs.ghostty.enable = true; programs.ghostty.enable = true;
@ -21,6 +23,20 @@
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
}; };
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
plugins = with pkgs.vimPlugins; [
nvim-lspconfig
nvim-treesitter.withAllGrammars
plenary-nvim
mini-nvim
];
};
home.pointerCursor = { home.pointerCursor = {
gtk.enable = true; gtk.enable = true;
package = pkgs.phinger-cursors; package = pkgs.phinger-cursors;
@ -71,7 +87,7 @@ window#waybar {
margin: 0px; margin: 0px;
border: 0px; border: 0px;
/*background-color:rgb(0, 0, 0);*/ /*background-color:rgb(0, 0, 0);*/
background-color: rgba(0, 0, 0, 0.9); background-color: rgba(0, 0, 0, 0.8);
color: @text; color: @text;
} }
@ -130,7 +146,7 @@ window#waybar {
height = 34; height = 34;
output = [ output = [
"HDMI-A-1" "HDMI-A-1"
"DP-2" "DP-1"
]; ];
modules-left = [ "sway/workspaces" ]; modules-left = [ "sway/workspaces" ];
modules-center = [ "sway/window" ]; modules-center = [ "sway/window" ];

View file

@ -36,6 +36,11 @@
networking.hostName = "focalor"; networking.hostName = "focalor";
networking.hostId = "84bdc587"; networking.hostId = "84bdc587";
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
programs.appimage.enable = true;
programs.appimage.binfmt = true;
systemd.network = { systemd.network = {
enable = true; enable = true;
netdevs."br0" = { netdevs."br0" = {
@ -64,16 +69,6 @@
}; };
}; };
/*networking = {
firewall.enable = false;
firewall.trustedInterfaces = [
"tailscale0"
];
nameservers = [ "10.0.0.210" "1.1.1.1" ];
useDHCP = true;
firewall.allowedTCPPorts = [22 80 443 2456 2457 9000 9001 9002];
};*/
services.resolved = { services.resolved = {
enable = true; enable = true;
dnssec = "true"; dnssec = "true";
@ -82,12 +77,6 @@
dnsovertls = "true"; dnsovertls = "true";
}; };
#boot.supportedFilesystems = [ "zfs" ];
#boot.kernelModules = [ "nct6775" "coretemp" ];
#services.zfs.autoScrub.enable = true;
#services.zfs.trim.enable = true;
services.vscode-server.enable = true; services.vscode-server.enable = true;
services.vscode-server.nodejsPackage = pkgs.nodejs_20; services.vscode-server.nodejsPackage = pkgs.nodejs_20;

View file

@ -55,7 +55,7 @@ if [[ "$GUEST_NAME" != "win11" ]]; then
fi fi
if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then
start_hook echo "do nothing"
elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then
revert_hook revert_hook
fi fi

View file

@ -37,24 +37,6 @@
}; };
in in
[ env ]; [ env ];
/*preStart =
''
mkdir -p /var/lib/libvirt/hooks
mkdir -p /var/lib/libvirt/hooks/qemu.d/win10/prepare/begin
mkdir -p /var/lib/libvirt/hooks/qemu.d/win10/release/end
mkdir -p /var/lib/libvirt/vgabios
ln -sf /home/regent/symlinks/qemu /var/lib/libvirt/hooks/qemu
ln -sf /home/regent/symlinks/kvm.conf /var/lib/libvirt/hooks/kvm.conf
ln -sf /home/regent/symlinks/start.sh /var/lib/libvirt/hooks/qemu.d/win11/prepare/begin/start.sh
ln -sf /home/regent/symlinks/stop.sh /var/lib/libvirt/hooks/qemu.d/win11/release/end/stop.sh
chmod +x /var/lib/libvirt/hooks/qemu
chmod +x /var/lib/libvirt/hooks/kvm.conf
chmod +x /var/lib/libvirt/hooks/qemu.d/win11/prepare/begin/start.sh
chmod +x /var/lib/libvirt/hooks/qemu.d/win11/release/end/stop.sh
'';*/
}; };
users.extraUsers.regent.extraGroups = [ "libvirtd" ]; users.extraUsers.regent.extraGroups = [ "libvirtd" ];