From 9b9ec35ba36802c366dcd63472db98696832d45a Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 4 Nov 2024 11:13:56 -0500 Subject: [PATCH] tweaks after gnome 47 update --- .../dot_config/fish/functions/nixgcboot.fish | 5 +++ flake.lock | 36 +++++++++---------- home/home.nix | 17 ++++++--- system/eddie/configuration.nix | 2 ++ 4 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 dotfiles/dot_config/fish/functions/nixgcboot.fish diff --git a/dotfiles/dot_config/fish/functions/nixgcboot.fish b/dotfiles/dot_config/fish/functions/nixgcboot.fish new file mode 100644 index 0000000..bf706ba --- /dev/null +++ b/dotfiles/dot_config/fish/functions/nixgcboot.fish @@ -0,0 +1,5 @@ +#!/usr/bin/env fish + +function nixgcboot --description 'fix full boot' + sudo nixos-rebuild boot --flake ~/source/nixos-config/#eddie $argv +end diff --git a/flake.lock b/flake.lock index ddf0e86..b174929 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730031145, - "narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=", + "lastModified": 1730635946, + "narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad", + "rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1729534638, - "narHash": "sha256-hsiKQjrbUQuKewNSV4REcQ56rANrVywUFdA15W60Rvg=", + "lastModified": 1730699102, + "narHash": "sha256-xkplzGzjywMPOpfTOw5oXbwuH4X14VfXEa3m10aHqrY=", "owner": "musnix", "repo": "musnix", - "rev": "d6f155afb13711faca548a9047e88e1e37b9766c", + "rev": "3feabdc65fb3466f07f306fa5f4e9c43234186e6", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1729990941, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1730595754, + "narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7d68864343650322045894951602d6e82b5296d7", + "rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1730425081, - "narHash": "sha256-c8JK1Zuc9QjfLfbnAEtB3uHz5pd+RMgMiR263TEtwAs=", + "lastModified": 1730638537, + "narHash": "sha256-2HOixA1kKx0gmPFWlg6lYlQ452rvt9Ims2+/wk+nsQM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "968d7a95604a2ec252ce9912199dfa9ec6410ff0", + "rev": "2920f4cc370aedb9043644343ac7fc0251f2cde8", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 9f335a8..bd6557b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -154,7 +154,6 @@ gnomeExtensions.dash-to-dock gnomeExtensions.solaar-extension gnomeExtensions.paperwm - gnomeExtensions.another-window-session-manager gnomeExtensions.media-controls gnomeExtensions.looking-glass-button gnome-software @@ -208,11 +207,11 @@ audacity supercollider-with-plugins bitwig-studio - blender + pkgs-stable.blender davinci-resolve-studio steam zotero_7 - handbrake + pkgs-stable.handbrake renoise yabridge yabridgectl @@ -360,6 +359,11 @@ } ]; }; + retention = { + keepDaily = 3; + keepHourly = 3; + keepMonthly = 2; + }; }; }; }; @@ -465,12 +469,15 @@ "com.github.tchx84.Flatseal" "com.github.johnfactotum.QuickLookup" "com.heroicgameslauncher.hgl" - "io.github.dyegoaurelio.simple-wireplumber-gui" "io.github.dgsasha.Remembrance" "nl.hjdskes.gcolor3" ]; systemd.user.enable = true; + systemd.user.sessionVariables = { + GSK_RENDERER = "ngl"; + MOZ_ENABLE_WAYLAND = 1; + }; systemd.user.services.ulauncher = { Unit = { Description = "Start Ulauncher"; @@ -478,7 +485,7 @@ Install = { WantedBy = [ "graphical-session.target" ]; - After = ["graphical-session.target"]; + # After = ["graphical-session.target"]; }; Service = { diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index c28cd81..b7bd205 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -293,6 +293,8 @@ enable = true; }; + services.power-profiles-daemon.enable = true; + # enable the OpenSSH daemon. services.openssh.enable = true;