hyl.st / helm
nix config
fork atom

more fix

Anish Lakhwara cf992439 a8c3f278

+1 -12
-7
home/profiles/cli/default.nix
··· 37 37 iftop 38 38 wget 39 39 curl 40 - <<<<<<< HEAD 41 - eza 42 - bat 43 - fd 44 - # ncdu 45 - ======= 46 40 eza 47 41 bat 48 42 fd 49 43 ncdu 50 44 du-dust 51 45 # dia-cli 52 - >>>>>>> nvim-rewrite 53 46 duf 54 47 trash-cli 55 48 nix-index
+1 -5
hosts/deck/default.nix
··· 35 35 jovian.devices.steamdeck.enable = true; 36 36 jovian.steam.user = "anish"; 37 37 jovian.steam.autoStart = true; 38 - <<<<<<< Updated upstream 39 38 jovian.steam.desktopSession = "gnome"; 40 - jovian.decky-loader.enable = true; 41 - ======= 42 - jovian.steam.desktopSession = "none+bspwm"; 39 + # jovian.steam.desktopSession = "none+bspwm"; 43 40 44 41 # Install XR drivers 45 42 environment.systemPackages = with pkgs; [ ··· 51 48 xrlinuxdriver 52 49 ]; 53 50 54 - >>>>>>> Stashed changes 55 51 }