From 45488dd25c61faa8d92a4036b08cd4562ae8be27 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 18 Sep 2024 12:20:06 +0200 Subject: [PATCH 1/6] Run formatter --- roles/gnome/programs/blackbox.nix | 18 +++++++++--------- roles/gnome/programs/default.nix | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/gnome/programs/blackbox.nix b/roles/gnome/programs/blackbox.nix index 4f23c10..2b18dc3 100644 --- a/roles/gnome/programs/blackbox.nix +++ b/roles/gnome/programs/blackbox.nix @@ -1,18 +1,18 @@ {pkgs, ...}: { - programs.gnome-terminal.enable = false; + programs.gnome-terminal.enable = false; environment.systemPackages = with pkgs; [ blackbox-terminal ]; - + home-manager.users.toast = {lib, ...}: { dconf.settings = with lib.hm.gvariant; { - "com/raggesilver/BlackBox" = { - # Dark mode - style-preference = mkUint32 2; - # Default working directory is home folder - working-directory-mode = mkUint32 1; - custom-font = "JetBrainsMono Nerd Font Mono 12"; - }; + "com/raggesilver/BlackBox" = { + # Dark mode + style-preference = mkUint32 2; + # Default working directory is home folder + working-directory-mode = mkUint32 1; + custom-font = "JetBrainsMono Nerd Font Mono 12"; + }; }; }; } diff --git a/roles/gnome/programs/default.nix b/roles/gnome/programs/default.nix index 9f7a57e..03b33d3 100644 --- a/roles/gnome/programs/default.nix +++ b/roles/gnome/programs/default.nix @@ -1,5 +1,5 @@ {...}: { - imports = [ - ./blackbox.nix - ]; + imports = [ + ./blackbox.nix + ]; } From 3730c8f01c4ecefd492e63bc50829c9ffbf72086 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 18 Sep 2024 12:31:07 +0200 Subject: [PATCH 2/6] Gnome: change settings --- roles/gnome/gnome.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix index a84ff77..56b9596 100644 --- a/roles/gnome/gnome.nix +++ b/roles/gnome/gnome.nix @@ -21,8 +21,16 @@ "dash-to-dock@micxgx.gmail.com" "panel-workspace-scroll@polymeilex.github.io" ]; - "org/gnome/desktop/interface".color-scheme = "prefer-dark"; - "org/gnome/mutter".dynamic-workspaces = true; + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; + "org/gnome/desktop/wm/preferences" = { + resize-with-right-button = true; + }; + "org/gnome/mutter" = { + dynamic-workspaces = true; + edge-tiling = true; + }; }; }; } From f71901fc082373377949e9dba93f4feb2aaa479e Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 18 Sep 2024 12:32:33 +0200 Subject: [PATCH 3/6] School: move android studio into it's own file --- roles/school/default.nix | 3 +-- roles/school/programs/android-studio.nix | 7 +++++++ roles/school/programs/default.nix | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 roles/school/programs/android-studio.nix create mode 100644 roles/school/programs/default.nix diff --git a/roles/school/default.nix b/roles/school/default.nix index 82a522f..9c84cca 100644 --- a/roles/school/default.nix +++ b/roles/school/default.nix @@ -1,11 +1,10 @@ {pkgs, ...}: { imports = [ - # ./programs + ./programs ./services ]; home-manager.users.toast.home.packages = with pkgs; [ jetbrains.idea-ultimate - android-studio jetbrains.webstorm nodejs ]; diff --git a/roles/school/programs/android-studio.nix b/roles/school/programs/android-studio.nix new file mode 100644 index 0000000..b2b0c5f --- /dev/null +++ b/roles/school/programs/android-studio.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + programs.adb.enable = true; + users.users.toast.extraGroups = ["adbusers"]; + home-manager.users.toast.home.packages = with pkgs; [ + android-studio + ]; +} diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix new file mode 100644 index 0000000..13edfdf --- /dev/null +++ b/roles/school/programs/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./android-studio.nix + ]; +} From 4872cdfb98ee9580fc6683fa63843f3d9a425913 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 18 Sep 2024 13:18:35 +0200 Subject: [PATCH 4/6] Gnome: enable and set up QT --- roles/gnome/gnome.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix index 56b9596..112fdc1 100644 --- a/roles/gnome/gnome.nix +++ b/roles/gnome/gnome.nix @@ -7,6 +7,12 @@ gnome.gnome-browser-connector.enable = true; }; + qt = { + enable = true; + platformTheme = "gnome"; + style = "adwaita-dark"; + }; + # Extensions environment.systemPackages = with pkgs.gnomeExtensions; [ appindicator From f551e271279bf107c87a9b7946c9a55ebb7e5a78 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 18 Sep 2024 14:01:02 +0200 Subject: [PATCH 5/6] Flake: package kasane teto cursor theme --- flake.nix | 1 + pkgs/kasane-teto-cursor | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/kasane-teto-cursor diff --git a/flake.nix b/flake.nix index 15c5343..f6accae 100644 --- a/flake.nix +++ b/flake.nix @@ -132,6 +132,7 @@ x86_64-linux = with import nixpkgs-unstable-raw {system = "x86_64-linux";}; { anything-sync-daemon = callPackage ./pkgs/anything-sync-daemon {}; discord-krisp-fixer = callPackage ./pkgs/discord-krisp-fixer {}; + kasane-teto-cursor = callPackage ./pkgs/kasane-teto-cursor {}; }; }; nixosConfigurations = let diff --git a/pkgs/kasane-teto-cursor b/pkgs/kasane-teto-cursor new file mode 100644 index 0000000..af93194 --- /dev/null +++ b/pkgs/kasane-teto-cursor @@ -0,0 +1,18 @@ +{ + stdenvNoCC, + fetchzip, +}: +stdenvNoCC.mkDerivation { + name = "kasane-teto-cursors"; + + src = fetchzip { + url = "http://dl.everest.tailscale/Kasane%20Teto%20Cursor%20-%20by%20wobb.zip"; + hash = "sha256-4neZqApkK6hwufLTilUtPmgzyBih7onSdSZ9lezQbIU="; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/icons + cp -dr --no-preserve='ownership' $src/Linux/Kasane\ Teto $out/share/icons + ''; +} From 1f6c51441a8a332d30b5d8ce67eb822a13a56f96 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 18 Sep 2024 14:09:12 +0200 Subject: [PATCH 6/6] Gnome: set up gtk --- roles/gnome/gnome.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/roles/gnome/gnome.nix b/roles/gnome/gnome.nix index 112fdc1..5f2b7f0 100644 --- a/roles/gnome/gnome.nix +++ b/roles/gnome/gnome.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, flakeSelf, ...}: { services = { xserver = { displayManager.gdm.enable = true; @@ -21,6 +21,17 @@ ]; home-manager.users.toast = { + gtk = { + enable = true; + theme = { + name = "adw-gtk3-dark"; + package = pkgs.adw-gtk3; + }; + cursorTheme = { + name = "Kasane Teto"; + package = flakeSelf.outputs.packages.x86_64-linux.kasane-teto-cursor; + }; + }; dconf.settings = { "org/gnome/shell".enabled-extensions = [ "appindicatorsupport@rgcjonas.gmail.com"