From b2bcd52da0ec77cca6de32cb36ae5c643417b89b Mon Sep 17 00:00:00 2001 From: Lilith Date: Tue, 11 Jun 2024 01:45:11 +0200 Subject: [PATCH] tb --- flake.lock | 109 +++++++++++++++++++++++++++++++++++++- flake.nix | 2 + home/default.nix | 1 + home/firefox.nix | 4 ++ home/hyprland/default.nix | 28 +++++----- home/thunderbird.nix | 8 +++ system/full.nix | 2 - system/stylix.nix | 12 ++--- system/wayland.nix | 1 + 9 files changed, 146 insertions(+), 21 deletions(-) create mode 100644 home/thunderbird.nix diff --git a/flake.lock b/flake.lock index 7fa6e0e4..35cf22c5 100644 --- a/flake.lock +++ b/flake.lock @@ -380,6 +380,28 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "rose-pine-hyprcursor", + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1717932370, @@ -476,6 +498,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -522,10 +560,31 @@ "impermanence": "impermanence", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", + "rose-pine-hyprcursor": "rose-pine-hyprcursor", "sops-nix": "sops-nix", "stylix": "stylix" } }, + "rose-pine-hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": "nixpkgs_4", + "utils": "utils" + }, + "locked": { + "lastModified": 1711302328, + "narHash": "sha256-wLuFLI6S5DOretqJN05+kvrs8cbnZKfVLXrJ4hvI/Tg=", + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "rev": "7e0473876f0e6d2308813a78fe84a6c6430b112b", + "type": "github" + }, + "original": { + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -586,7 +645,7 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1717866166, @@ -646,6 +705,54 @@ "repo": "default", "type": "github" } + }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index dfb50dc5..49bb7f43 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,8 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; + + rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; }; outputs = { diff --git a/home/default.nix b/home/default.nix index 88997e53..a9dbc684 100644 --- a/home/default.nix +++ b/home/default.nix @@ -16,6 +16,7 @@ ./rofi.nix ./sops.nix ./stylix.nix + ./thunderbird.nix ./zsh ]; } diff --git a/home/firefox.nix b/home/firefox.nix index 41a453f7..d5e61da0 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -120,6 +120,10 @@ profiles.ChatGPT = { name = "ChatGPT"; id = 1; + userChrome = '' + #TabsToolbar { visibility: collapse !important; } + #nav-bar { visibility: collapse !important; } + ''; }; }; } diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index a7be6d1a..b57cb150 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -19,6 +19,10 @@ "$terminal" = "alacritty"; "$fileManager" = "alacritty -e ranger"; + env = [ + "HYPRCURSOR_THEME,rose-pine-hyprcursor" + ]; + monitor = [ ",preferred,1" ]; @@ -111,24 +115,24 @@ "$mainMod, C, killactive," "$mainMod, backspace, exec, hyprlock" "$mainMod, E, exec, $fileManager" - "$mainMod, O, togglefloating," + "$mainMod, A, togglefloating," "$mainMod, R, exec, rofi -show drun" "$mainMod, P, pseudo," - "$mainMod, J, togglesplit," + "$mainMod, S, togglesplit," - "$mainMod, K, togglespecialworkspace, keepass" - "$mainMod, K, exec, if (( $(pgrep keepassxc -c) < 2 )); then keepassxc; fi" + "$mainMod, P, togglespecialworkspace, keepass" + "$mainMod, P, exec, if (( $(pgrep keepassxc -c) < 2 )); then keepassxc; fi" - "$mainMod, M, togglespecialworkspace, chatgpt" - "$mainMod, M, exec, [workspace special:chatgpt] pgrep firefox | xargs ps -fp | grep -- '-P ChatGPT --url chat.openai.com' || firefox -P ChatGPT --url chat.openai.com" + "$mainMod, O, togglespecialworkspace, chatgpt" + "$mainMod, O, exec, [workspace special:chatgpt] pgrep firefox | xargs ps -fp | grep -- '-P ChatGPT --url chat.openai.com' || firefox -P ChatGPT --url chat.openai.com" ", print, exec, hyprshot -m region -o /home/lilith/sync/screenshots -z" "CTRL, print, exec, hyprshot -m output -o /home/lilith/sync/screenshots -z" - "$mainMod, left, movefocus, l" - "$mainMod, right, movefocus, r" - "$mainMod, up, movefocus, u" - "$mainMod, down, movefocus, d" + "$mainMod, H, movefocus, l" + "$mainMod, L, movefocus, r" + "$mainMod, K, movefocus, u" + "$mainMod, J, movefocus, d" "$mainMod, 1, workspace, 1" "$mainMod, 2, workspace, 2" @@ -152,8 +156,8 @@ "$mainMod SHIFT, 9, movetoworkspace, 9" "$mainMod SHIFT, 0, movetoworkspace, 10" - "$mainMod, S, togglespecialworkspace, magic" - "$mainMod SHIFT, S, movetoworkspace, special:magic" + "$mainMod, I, togglespecialworkspace, magic" + "$mainMod SHIFT, I, movetoworkspace, special:magic" ]; bindm = [ diff --git a/home/thunderbird.nix b/home/thunderbird.nix new file mode 100644 index 00000000..b11b9a8a --- /dev/null +++ b/home/thunderbird.nix @@ -0,0 +1,8 @@ +{...}:{ + programs.thunderbird = { + enable = true; + settings = { + + }; + }; +} diff --git a/system/full.nix b/system/full.nix index 8d2fb779..e94577a6 100644 --- a/system/full.nix +++ b/system/full.nix @@ -17,7 +17,5 @@ ./syncthing.nix ./wayland.nix ./zsh.nix - ] ++ lib.optionals config.gaming.enable [ - ./vr.nix ]; } diff --git a/system/stylix.nix b/system/stylix.nix index 494365fc..a0648988 100644 --- a/system/stylix.nix +++ b/system/stylix.nix @@ -11,10 +11,10 @@ }; fonts = { - # monospace = { - # package = pkgs.jetbrains-mono; - # name = "JetBrainsMono"; - # }; + monospace = { + package = (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}); + name = "JetBrainsMono Nerd Font"; + }; emoji = { package = pkgs.twemoji-color-font; @@ -25,8 +25,8 @@ }; cursor = { - package = pkgs.bibata-cursors; - name = "Bibata theme"; + package = pkgs.rose-pine-cursor; + name = "Rosé Pine"; }; }; } diff --git a/system/wayland.nix b/system/wayland.nix index 96f2c47d..a66324b3 100644 --- a/system/wayland.nix +++ b/system/wayland.nix @@ -17,6 +17,7 @@ hyprlock hypridle hyprpaper + hyprcursor ]; xdg.portal = {