From 794cdc1699ffbe43ea8a6c735d9bee5bb994e980 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 10 Aug 2023 20:22:42 -0500 Subject: [PATCH 1/2] Updates to thinker --- common/bin/steam | 17 ----------------- common/helix/languages.toml | 1 + os/linux/nix/daniel.nix | 2 +- os/linux/nix/machines/thinker.nix | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 100755 common/bin/steam diff --git a/common/bin/steam b/common/bin/steam deleted file mode 100755 index e5c4785..0000000 --- a/common/bin/steam +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -if [ ! -f /bin/steam ] && [ ! -f /usr/bin/steam ] && [ ! -f /usr/local/bin/steam ]; then - echo "Steam not installed (/bin/steam, /usr/bin/steam, and /usr/local/bin/steam not found)" - exit 1 -fi - -mkdir -p ~/.steam/steam/package -echo "steampal_stable_9a24a2bf68596b860cb6710d9ea307a76c29a04d" > ~/.steam/steam/package/beta - -if [ -f /bin/steam ]; then - exec /bin/steam -gamepadui -elif [ -f /usr/bin/steam ]; then - exec /usr/bin/steam -gamepadui -elif [ -f /usr/local/bin/steam ]; then - exec /usr/local/bin/steam -gamepadui -fi \ No newline at end of file diff --git a/common/helix/languages.toml b/common/helix/languages.toml index 72ff30e..9b10e4b 100644 --- a/common/helix/languages.toml +++ b/common/helix/languages.toml @@ -1,5 +1,6 @@ [[language]] name = "elixir" +language-server = { command = "lexical", args = ["start"] } auto-format = true [[language]] diff --git a/os/linux/nix/daniel.nix b/os/linux/nix/daniel.nix index 905d8f2..a717597 100644 --- a/os/linux/nix/daniel.nix +++ b/os/linux/nix/daniel.nix @@ -6,7 +6,7 @@ programs.home-manager.enable = true; programs.direnv.enable = true; - programs.nix-direnv.enable = true; + # programs.nix-direnv.enable = true; programs.fish.enable = true; diff --git a/os/linux/nix/machines/thinker.nix b/os/linux/nix/machines/thinker.nix index bf4e6ee..6f4f93d 100644 --- a/os/linux/nix/machines/thinker.nix +++ b/os/linux/nix/machines/thinker.nix @@ -208,7 +208,6 @@ in restic ripgrep rsync - rtx sd skim slurp @@ -234,6 +233,7 @@ in ]; services.pcscd.enable = true; + services.flatpak.enable = true; services.gnome.gnome-keyring.enable = true; programs.gnupg.agent = { enable = true; From 93914765218550b693578e707ef92e18f91b7031 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 10 Aug 2023 20:25:07 -0500 Subject: [PATCH 2/2] Add flatpak, rmeove some TODOs --- os/linux/nix/machines/thinker.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/os/linux/nix/machines/thinker.nix b/os/linux/nix/machines/thinker.nix index 6f4f93d..8149621 100644 --- a/os/linux/nix/machines/thinker.nix +++ b/os/linux/nix/machines/thinker.nix @@ -5,6 +5,7 @@ { pkgs, nixpkgs, ... }: let + # this is unused because it's referenced by my sway config dbus-sway-environment = pkgs.writeTextFile { name = "dbus-sway-environment"; destination = "/bin/dbus-sway-environment"; @@ -17,10 +18,7 @@ let ''; }; - # TODO: hibernation? - - # TODO: fonts? right now, I'm just installing to ~/.local/share/fonts - + # this is unused because it's referenced by my sway config configure-gtk = pkgs.writeTextFile { name = "configure-gtk"; destination = "/bin/configure-gtk"; @@ -44,6 +42,12 @@ in ./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" ]; # Use the systemd-boot EFI boot loader. @@ -149,9 +153,6 @@ in # List packages installed in system profile. To search, run: # $ nix search wget - # TODO: my font? - # TODO: wayland screensharing - # TODO: wireplumber? environment.systemPackages = with pkgs; [ age bat