From 4dd3b646f2df1db080df65d2e6d55ae40ccfc321 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 10:49:17 +0200 Subject: [PATCH 1/7] Kde: change task switcher to thumbnail grid --- roles/kde/plasma.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index f0ba955..d2e86dd 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -142,9 +142,12 @@ in }; }; configFile = { - "kwinrc"."Desktops" = { - "Number" = 2; - "Rows" = 1; + "kwinrc" = { + "Desktops" = { + "Number" = 2; + "Rows" = 1; + }; + "TabBox"."LayoutName" = "thumbnail_grid"; }; }; }; From 7e3dc3cb9755d18233adb08582ea0de58071903e Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 11:50:10 +0200 Subject: [PATCH 2/7] Intellij: use fetchurl from pkgs instead of builtins --- roles/school/programs/idea.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix index 2ee7f0c..6e06d17 100644 --- a/roles/school/programs/idea.nix +++ b/roles/school/programs/idea.nix @@ -1,13 +1,14 @@ { config, pkgs, ... }: +with pkgs; { - environment.systemPackages = with pkgs; with jetbrains; [ + environment.systemPackages = with jetbrains; [ idea-ultimate ]; home-manager.users.toast = { # Install plugins - home.file.".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = builtins.fetchurl { + home.file.".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = fetchurl { url = "https://github.com/catppuccin/jetbrains/releases/download/v2.2.0/Catppuccin.Theme-2.2.0.jar"; sha256 = "143jrhdfg7q24mnnzgqwgxq4glsxznxc6awcifpghr9q6nw1hfi0"; }; From 36928939d517e324036c0390eb1edb45d9ff9eb8 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 12:22:27 +0200 Subject: [PATCH 3/7] Intellij: add rainbox-plugins plugin --- roles/school/programs/idea.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix index 6e06d17..d46c236 100644 --- a/roles/school/programs/idea.nix +++ b/roles/school/programs/idea.nix @@ -8,9 +8,15 @@ with pkgs; home-manager.users.toast = { # Install plugins - home.file.".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = fetchurl { - url = "https://github.com/catppuccin/jetbrains/releases/download/v2.2.0/Catppuccin.Theme-2.2.0.jar"; - sha256 = "143jrhdfg7q24mnnzgqwgxq4glsxznxc6awcifpghr9q6nw1hfi0"; + home.file = { + ".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = fetchurl { + url = "https://github.com/catppuccin/jetbrains/releases/download/v2.2.0/Catppuccin.Theme-2.2.0.jar"; + hash = "sha256:143jrhdfg7q24mnnzgqwgxq4glsxznxc6awcifpghr9q6nw1hfi0"; + }; + ".local/share/JetBrains/IntelliJIdea2023.2/rainbow-brackets".source = fetchzip { + url = "https://github.com/izhangzhihao/intellij-rainbow-brackets/releases/download/2023.3.6/intellij-rainbow-brackets-2023.3.6.zip"; + hash = "sha256-ZoBVRPZZn8QjXSLtskRtSpGoadc8KNKxsKvdcyNXT74"; + }; }; /* From a4ecb63da6917a41986a8a50958f963f9c30a4ad Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 12:22:47 +0200 Subject: [PATCH 4/7] Intellij: remove leftover space --- roles/school/programs/idea.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix index d46c236..bc13645 100644 --- a/roles/school/programs/idea.nix +++ b/roles/school/programs/idea.nix @@ -1,4 +1,4 @@ - { config, pkgs, ... }: +{ config, pkgs, ... }: with pkgs; { From 10fc83b906347e1ebf0447ab34cd3e6211294938 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 12:42:58 +0200 Subject: [PATCH 5/7] Intellij: update catppuccin plugin --- roles/school/programs/idea.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/school/programs/idea.nix b/roles/school/programs/idea.nix index bc13645..8537e27 100644 --- a/roles/school/programs/idea.nix +++ b/roles/school/programs/idea.nix @@ -10,8 +10,8 @@ with pkgs; # Install plugins home.file = { ".local/share/JetBrains/IntelliJIdea2023.2/catppuccin.jar".source = fetchurl { - url = "https://github.com/catppuccin/jetbrains/releases/download/v2.2.0/Catppuccin.Theme-2.2.0.jar"; - hash = "sha256:143jrhdfg7q24mnnzgqwgxq4glsxznxc6awcifpghr9q6nw1hfi0"; + url = "https://github.com/catppuccin/jetbrains/releases/download/v3.0.0/Catppuccin.Theme-3.0.0.jar"; + hash = "sha256-tbcUtqA8wo9ZLjfkziRZiDTN748qWQ26A80pIJrTYuM"; }; ".local/share/JetBrains/IntelliJIdea2023.2/rainbow-brackets".source = fetchzip { url = "https://github.com/izhangzhihao/intellij-rainbow-brackets/releases/download/2023.3.6/intellij-rainbow-brackets-2023.3.6.zip"; From 4f5a944834fe42a1c03cecc2fd216431a17c951f Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 13:27:57 +0200 Subject: [PATCH 6/7] Bat: configure using home-manager --- roles/common/programs/bat.nix | 9 +++++++++ roles/common/programs/default.nix | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 roles/common/programs/bat.nix diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix new file mode 100644 index 0000000..dd8020b --- /dev/null +++ b/roles/common/programs/bat.nix @@ -0,0 +1,9 @@ +{ config, ... }: + +{ + home-manager = { + users.toast.programs.bat = { + enable = true; + }; + }; +} diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix index 53af6f3..0cf10fd 100755 --- a/roles/common/programs/default.nix +++ b/roles/common/programs/default.nix @@ -11,10 +11,12 @@ ./bash.nix ./git.nix ./starship.nix + ,/bat.nix ]; # Some programs dont have a programs.*.enable option, so I install their package here environment.systemPackages = with pkgs; [ speedtest-cli + # Bat has a home manager module, but I want it to be available system wide bat file nvd From 7505ddccb346951565698e88605801902754206f Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 23 Oct 2023 20:00:24 +0200 Subject: [PATCH 7/7] Bat: set catppuccin-mocha as the theme --- roles/common/programs/bat.nix | 16 +++++++++++++++- roles/common/programs/default.nix | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/roles/common/programs/bat.nix b/roles/common/programs/bat.nix index dd8020b..2075753 100644 --- a/roles/common/programs/bat.nix +++ b/roles/common/programs/bat.nix @@ -1,9 +1,23 @@ -{ config, ... }: +{ config, pkgs, ... }: { home-manager = { users.toast.programs.bat = { enable = true; + config = { + theme = "catppuccin-mocha"; + }; + themes = { + catppuccin-mocha = { + src = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "bat"; + rev = "master"; + hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + }; + file = "Catppuccin-mocha.tmTheme"; + }; + }; }; }; } diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix index 0cf10fd..c6ab698 100755 --- a/roles/common/programs/default.nix +++ b/roles/common/programs/default.nix @@ -11,7 +11,7 @@ ./bash.nix ./git.nix ./starship.nix - ,/bat.nix + ./bat.nix ]; # Some programs dont have a programs.*.enable option, so I install their package here environment.systemPackages = with pkgs; [