Merge remote-tracking branch 'origin/main'

This commit is contained in:
Daniel Flanagan 2023-08-23 10:49:23 -05:00
commit c2d2d77252
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
3 changed files with 11 additions and 9 deletions

View file

@ -1,5 +1,6 @@
[[language]] [[language]]
name = "elixir" name = "elixir"
language-server = { command = "lexical", args = ["start"] }
auto-format = true auto-format = true
[[language]] [[language]]

View file

@ -6,7 +6,7 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.direnv.enable = true; programs.direnv.enable = true;
programs.nix-direnv.enable = true; # programs.nix-direnv.enable = true;
programs.fish.enable = true; programs.fish.enable = true;

View file

@ -5,6 +5,7 @@
{ pkgs, nixpkgs, ... }: { pkgs, nixpkgs, ... }:
let let
# this is unused because it's referenced by my sway config
dbus-sway-environment = pkgs.writeTextFile { dbus-sway-environment = pkgs.writeTextFile {
name = "dbus-sway-environment"; name = "dbus-sway-environment";
destination = "/bin/dbus-sway-environment"; destination = "/bin/dbus-sway-environment";
@ -17,10 +18,7 @@ let
''; '';
}; };
# TODO: hibernation? # this is unused because it's referenced by my sway config
# TODO: fonts? right now, I'm just installing to ~/.local/share/fonts
configure-gtk = pkgs.writeTextFile { configure-gtk = pkgs.writeTextFile {
name = "configure-gtk"; name = "configure-gtk";
destination = "/bin/configure-gtk"; destination = "/bin/configure-gtk";
@ -44,6 +42,12 @@ in
./thinker-hardware.nix ./thinker-hardware.nix
]; ];
# TODO: hibernation? I've been using [deep] in /sys/power/mem_sleep alright
# with this machine so it may not be necessary?
# need to measure percentage lost per day, but I think it's around 10%/day
# TODO: fonts? right now, I'm just installing to ~/.local/share/fonts
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -149,9 +153,6 @@ in
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
# TODO: my font?
# TODO: wayland screensharing
# TODO: wireplumber?
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
age age
bat bat
@ -208,7 +209,6 @@ in
restic restic
ripgrep ripgrep
rsync rsync
rtx
sd sd
skim skim
slurp slurp
@ -234,6 +234,7 @@ in
]; ];
services.pcscd.enable = true; services.pcscd.enable = true;
services.flatpak.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;