From 51996d37afa3e49b2a0b2643f27f9f24c7791e5c Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Thu, 23 May 2024 15:57:04 -0400 Subject: [PATCH] gnome --- flake.lock | 6 ++--- flake.nix | 5 ++-- home-manager/_mixins/users/gburd/default.nix | 27 +++++++++++++++++--- nixos/_mixins/desktop/gnome.nix | 15 +++++++++++ nixos/_mixins/hardware/rtx-3080ti.nix | 2 +- 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 932499f..cba8861 100644 --- a/flake.lock +++ b/flake.lock @@ -1081,11 +1081,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716218643, - "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2117086..49c77ce 100644 --- a/flake.nix +++ b/flake.nix @@ -63,6 +63,7 @@ { self , nix-formatter-pack , nixpkgs + , devshells , ... } @ inputs: let @@ -79,7 +80,7 @@ # .iso images # Workstations - "gburd@floki" = libx.mkHome { hostname = "floki"; username = "gburd"; desktop = "pantheon"; }; + "gburd@floki" = libx.mkHome { hostname = "floki"; username = "gburd"; desktop = "gnome"; }; # Servers }; @@ -99,7 +100,7 @@ # Workstations # Lenovo Carbon X1 Extreme Gen 5 - x86_64 - floki = libx.mkHost { systemType = "workstation"; hostname = "floki"; username = "gburd"; desktop = "pantheon"; }; + floki = libx.mkHost { systemType = "workstation"; hostname = "floki"; username = "gburd"; desktop = "gnome"; }; # Servers # Can be executed locally: diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix index fdfc08a..8e5523f 100644 --- a/home-manager/_mixins/users/gburd/default.nix +++ b/home-manager/_mixins/users/gburd/default.nix @@ -72,11 +72,11 @@ in shellAliases = let # determines directory path of symbolic link - sh = target: "nix develop $(readlink -f ~/ws/devshells)#${target} --command \$SHELL"; + devsh = target: "nix develop $(readlink -f ~/ws/devshells)#${target} --command \$SHELL"; in { - "sh:c" = sh "c"; - "sh:python" = sh "python"; + "devsh:c" = devsh "c"; + "devh:python" = devsh "python"; }; }; @@ -86,4 +86,25 @@ in }; }; + # To declaratively enable and configure, use of modules like home-manager you + # are required to configure dconf settings. (HINT: use `dconf watch /` to + # discover what to put here) + dconf = { + enable = true; + settings = { + "org/gnome/shell" = { + disabled-user-extensions = false; # enables user extensions (disabled by default) + enabled-extensions = [ + "blur-my-shell@aunetx" + ]; + }; + + # Configure individual extensions + "org/gnome/shell/extensions/blur-my-shell" = { + brightness = 0.75; + noise-amount = 0; + }; + }; + }; + } diff --git a/nixos/_mixins/desktop/gnome.nix b/nixos/_mixins/desktop/gnome.nix index 408964d..24e62e7 100644 --- a/nixos/_mixins/desktop/gnome.nix +++ b/nixos/_mixins/desktop/gnome.nix @@ -21,6 +21,21 @@ environment.systemPackages = with pkgs.unstable; [ gnomeExtensions.appindicator + gnomeExtensions.blur-my-shell + gnomeExtensions.pop-shell gnome3.gnome-tweaks ]; + + # Exclude packages + environment.gnome.excludePackages = (with pkgs; [ + # for packages that are pkgs.*** + gnome-tour + gnome-connections + ]) ++ (with pkgs.gnome; [ + # for packages that are pkgs.gnome.*** + epiphany # web browser + geary # email reader + evince # document viewer + ]); + } diff --git a/nixos/_mixins/hardware/rtx-3080ti.nix b/nixos/_mixins/hardware/rtx-3080ti.nix index d863949..401202c 100644 --- a/nixos/_mixins/hardware/rtx-3080ti.nix +++ b/nixos/_mixins/hardware/rtx-3080ti.nix @@ -18,7 +18,7 @@ in hardware = { nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; + package = config.boot.kernelPackages.nvidiaPackages.production; #vulkan_beta; modesetting.enable = true;