From 678bdb8e739ee3e38e7d411ecb79402ae2faeb3d Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Sun, 12 Feb 2023 08:36:00 -0800 Subject: [PATCH 1/4] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index afa6365..ed9b7e6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675637696, - "narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=", + "lastModified": 1675935446, + "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b", + "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675545634, - "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", + "lastModified": 1676110339, + "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", + "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8", "type": "github" }, "original": { From c816f4babf08aee9155e435a5ac8b5df35d1b8e1 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Thu, 16 Feb 2023 19:28:25 -0800 Subject: [PATCH 2/4] Plamsa --- flake.lock | 12 ++++++------ flake.nix | 2 +- modules/gnome.nix | 1 + modules/plasma.nix | 21 +++++++++++++++++++++ users/jsutter.nix | 24 ++++++++++++------------ 5 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 modules/plasma.nix diff --git a/flake.lock b/flake.lock index ed9b7e6..a81dbd7 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1676367705, + "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676110339, - "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=", + "lastModified": 1676481215, + "narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8", + "rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 811f68c..2b0e885 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ ./systems/common.nix ./systems/framework.nix ./users/jsutter.nix - ./modules/gnome.nix + ./modules/plasma.nix ./modules/nushell ]; }; diff --git a/modules/gnome.nix b/modules/gnome.nix index 024c6e2..cc50741 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -100,6 +100,7 @@ home-manager.users.jsutter = { gnomeExtensions.user-themes gnomeExtensions.tray-icons-reloaded gnomeExtensions.dash-to-panel + gnomeExtensions.cpufreq ]; home.sessionVariables.GTK_THEME = "palenight"; home.file."firefox-gnome-theme" = { diff --git a/modules/plasma.nix b/modules/plasma.nix new file mode 100644 index 0000000..95bdc6b --- /dev/null +++ b/modules/plasma.nix @@ -0,0 +1,21 @@ +{ config, pkgs, home-manager, ... }: + +{ + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + services.xserver.desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [ + elisa + gwenview + okular + oxygen + khelpcenter + konsole + plasma-browser-integration + print-manager + ]; + + programs.dconf.enable = true; + +} \ No newline at end of file diff --git a/users/jsutter.nix b/users/jsutter.nix index 1faf4ee..b46b5ee 100644 --- a/users/jsutter.nix +++ b/users/jsutter.nix @@ -105,17 +105,6 @@ in }; }; }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - ublock-origin - privacy-badger - bitwarden - clearurls - decentraleyes - ghostery - privacy-redirect - privacy-badger - disconnect - ]; profiles = { jsutter = { id = 0; @@ -129,7 +118,18 @@ in user_pref("media.ffmpeg.vaapi.enabled", true); user_pref("media.rdd-vpx.enabled", true); ''; - userChrome = '' + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + privacy-badger + bitwarden + clearurls + decentraleyes + ghostery + privacy-redirect + privacy-badger + disconnect + ]; + userChrome = '' @import "firefox-gnome-theme/userChrome.css"; @import "firefox-gnome-theme/theme/colors/dark.css"; ''; From 14ccc012b283f966aad31440f897d9f36caf45ac Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Thu, 16 Feb 2023 19:30:42 -0800 Subject: [PATCH 3/4] Plamsa --- modules/plasma.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/plasma.nix b/modules/plasma.nix index 95bdc6b..f4feecc 100644 --- a/modules/plasma.nix +++ b/modules/plasma.nix @@ -6,14 +6,7 @@ services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [ - elisa - gwenview - okular - oxygen khelpcenter - konsole - plasma-browser-integration - print-manager ]; programs.dconf.enable = true; From ffa3dce6c49b258525132abaaf330a7a4f68e6b6 Mon Sep 17 00:00:00 2001 From: Julian Sutter Date: Fri, 17 Feb 2023 00:25:03 -0800 Subject: [PATCH 4/4] i like plasma --- modules/plasma.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/plasma.nix b/modules/plasma.nix index f4feecc..6dd3aad 100644 --- a/modules/plasma.nix +++ b/modules/plasma.nix @@ -11,4 +11,6 @@ programs.dconf.enable = true; + hardware.bluetooth.enable = true; + } \ No newline at end of file