amadaluzia/alqueva
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: move to tokyo tokyo night

Browse source 
this isn't fully complete but it will be soon

still have river
This commit is contained in:
Artur Manuel 2024-11-28 16:23:15 +00:00
commit df2064b116
9 changed files with 86 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

91
computers/python/configs/alacritty/alacritty.toml
View file

@ -9,73 +9,38 @@ y = 8
size = 14 size = 14
[colors.primary] [colors.primary]
foreground = "#e0def4" background = '#1a1b26'
background = "#191724" foreground = '#c0caf5'
dim_foreground = "#908caa"
bright_foreground = "#e0def4"
[colors.cursor] [colors.cursor]
text = "#e0def4" cursor = '#c0caf5'
cursor = "#524f67" text = '#1a1b26'
[colors.vi_mode_cursor]
text = "#e0def4"
cursor = "#524f67"
[colors.search.matches]
foreground = "#908caa"
background = "#26233a"
[colors.search.focused_match]
foreground = "#191724"
background = "#ebbcba"
[colors.hints.start]
foreground = "#908caa"
background = "#1f1d2e"
[colors.hints.end]
foreground = "#6e6a86"
background = "#1f1d2e"
[colors.line_indicator]
foreground = "None"
background = "None"
[colors.footer_bar]
foreground = "#e0def4"
background = "#1f1d2e"
[colors.selection]
text = "#e0def4"
background = "#403d52"
[colors.normal] [colors.normal]
black = "#26233a" black = '#15161e'
red = "#eb6f92" red = '#f7768e'
green = "#31748f" green = '#9ece6a'
yellow = "#f6c177" yellow = '#e0af68'
blue = "#9ccfd8" blue = '#7aa2f7'
magenta = "#c4a7e7" magenta = '#bb9af7'
cyan = "#ebbcba" cyan = '#7dcfff'
white = "#e0def4" white = '#a9b1d6'
[colors.bright] [colors.bright]
black = "#6e6a86" black = '#414868'
red = "#eb6f92" red = '#f7768e'
green = "#31748f" green = '#9ece6a'
yellow = "#f6c177" yellow = '#e0af68'
blue = "#9ccfd8" blue = '#7aa2f7'
magenta = "#c4a7e7" magenta = '#bb9af7'
cyan = "#ebbcba" cyan = '#7dcfff'
white = "#e0def4" white = '#c0caf5'
[[colors.indexed_colors]]
index = 16
color = '#ff9e64'
[[colors.indexed_colors]]
index = 17
color = '#db4b4b'
[colors.dim]
black = "#6e6a86"
red = "#eb6f92"
green = "#31748f"
yellow = "#f6c177"
blue = "#9ccfd8"
magenta = "#c4a7e7"
cyan = "#ebbcba"
white = "#e0def4"

18
computers/python/configs/fuzzel/fuzzel.ini
View file

@ -9,19 +9,17 @@ horizontal-pad=15
vertical-pad=15 vertical-pad=15
[colors] [colors]
background=191724ff background=16161eff
text=e0def4ff text=c0caf5ff
match=ebbcbaff match=2ac3deff
selection=403d52ff selection=343a55ff
selection-text=e0def4ff selection-match=2ac3deff
selection-match=ebbcbaff selection-text=c0caf5ff
border=524f67ff border=27a1b9ff
prompt=6e6a86ff
placeholder=6e6a86ff
input=e0def4ff
[border] [border]
width=2 width=2
radius=0
[key-bindings] [key-bindings]
cancel=Control+[ cancel=Control+[

3
computers/python/configs/qutebrowser/config.py
View file

@ -1,5 +1,2 @@
import rosepine
config.load_autoconfig() config.load_autoconfig()
rosepine.setup(c, 'rose-pine', True)
config.set('colors.webpage.preferred_color_scheme', 'dark') config.set('colors.webpage.preferred_color_scheme', 'dark')

2
computers/python/configs/river/init
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
riverctl spawn kanshi riverctl spawn kanshi
riverctl spawn "swaybg -i ~/.local/share/wallpapers/02.jpg -m fill" riverctl spawn "swaybg -i ~/.local/share/wallpapers/01.png -m fill"
riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"

23
computers/python/theme.nix
View file

@ -10,9 +10,9 @@
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
color-scheme = "prefer-dark"; color-scheme = "prefer-dark";
cursor-size = lib.gvariant.mkUint32 24; cursor-size = lib.gvariant.mkUint32 24;
cursor-theme = "BreezeX-RosePine-Linux"; cursor-theme = "Simp1e-Tokyo-Night";
icon-theme = "rose-pine"; icon-theme = "Tela-circle-purple-dark";
gtk-theme = "rose-pine"; gtk-theme = "Tokyonight-dark";
}; };
}; };
} }
@ -26,17 +26,16 @@
}; };
environment.systemPackages = builtins.attrValues { environment.systemPackages = builtins.attrValues {
inherit gtk-theme = pkgs.tokyonight-gtk-theme;
(pkgs) icon-theme = pkgs.tela-circle-icon-theme.override {
rose-pine-gtk-theme colorVariants = ["purple"];
rose-pine-cursor circularFolder = true;
rose-pine-icon-theme };
libadwaita # workaround for PyGObject to give apps libadwaita cursor-theme = pkgs.simp1e-cursors;
;
}; };
systemd.user.tmpfiles.rules = [ systemd.user.tmpfiles.rules = [
"L+ %h/.config/gtk-4.0/gtk.css - - - - ${pkgs.rose-pine-gtk-theme}/share/themes/rose-pine/gtk-4.0/gtk.css" "L+ %h/.config/gtk-4.0/gtk.css - - - - ${pkgs.tokyonight-gtk-theme}/share/themes/Tokyonight-Dark/gtk-4.0/gtk.css"
"L+ %h/.config/gtk-4.0/gtk-dark.css - - - - ${pkgs.rose-pine-gtk-theme}/share/themes/rose-pine/gtk-4.0/gtk.css" "L+ %h/.config/gtk-4.0/gtk-dark.css - - - - ${pkgs.tokyonight-gtk-theme}/share/themes/Tokyonight-Dark/gtk-4.0/gtk-dark.css"
]; ];
} }

2
computers/python/users.nix
View file

@ -11,7 +11,7 @@
".config/fuzzel/" = ./configs/fuzzel; ".config/fuzzel/" = ./configs/fuzzel;
".config/river/" = ./configs/river; ".config/river/" = ./configs/river;
".config/alacritty" = ./configs/alacritty; ".config/alacritty" = ./configs/alacritty;
".local/share/wallpapers" = "${inputs.wallpkgs.packages.${pkgs.system}.rose_pine}/share/wallpapers/rose_pine"; ".local/share/wallpapers" = "${inputs.wallpkgs.packages.${pkgs.system}.tokyo_night}/share/wallpapers/tokyo_night";
}; };
packages = builtins.attrValues { packages = builtins.attrValues {
inherit inherit

56
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1732482708, "lastModified": 1732742778,
"narHash": "sha256-B1MQLiWi4bbeNiRXKxEkpztnKyWae4x0LyK32v3DjLk=", "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "47bc8dfb6f48d5f66a3cb3a4cece83d8ace1f61a", "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,11 +24,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1732414494, "lastModified": 1732759838,
"narHash": "sha256-P54268psO+ZNEi1jVkqZmLsWLTYXgDsdJnUBb9mtz3w=", "narHash": "sha256-bBghlNpHztnrUb1o7BAinp+rrWZMpaVNPrxnefhk1LY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a0935df2077f0a9b227a38f08600d17d0029feed", "rev": "f704f6f113bef121c7e38f807e3397f7dbe1aee0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -279,11 +279,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731890469, "lastModified": 1732238832,
"narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5083ec887760adfe12af64830a66807423a859a7", "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +301,11 @@
"parts": "parts" "parts": "parts"
}, },
"locked": { "locked": {
"lastModified": 1732417399, "lastModified": 1732762929,
"narHash": "sha256-Nt77rs3AHrlUpRZGEAkhIU8BtD8h7CTyEdbncECSh5w=", "narHash": "sha256-yBDsONLtGIgZBHR0wz/oIcw8J+6gHFwJ8dN892UU3ks=",
"owner": "moni-dz", "owner": "moni-dz",
"repo": "nixpkgs-f2k", "repo": "nixpkgs-f2k",
"rev": "7090597b21e39927c4ac9988a71139e4a6d63467", "rev": "3bafc3c1780940112b56c5f1cbeaa7f6c2f08c44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +379,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1731797254, "lastModified": 1732632634,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +443,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732521221,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -459,11 +459,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732521221,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,11 +475,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1732417335, "lastModified": 1732760247,
"narHash": "sha256-Kyi5BHzRrphR0WpKyFFblaDgJ1WIS8UaberaIvEK3KY=", "narHash": "sha256-jK0m/p3Xrl2byR0+Wlj/q0H3+9yojSfX0syeqkzXNBI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00452c8bbe1d4a2eb250cace934530df44a9306b", "rev": "2d9cb77fbc1914a895740a266c3f12fc41de0314",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -716,11 +716,11 @@
"nvf": "nvf" "nvf": "nvf"
}, },
"locked": { "locked": {
"lastModified": 1732553985, "lastModified": 1732810796,
"narHash": "sha256-PD/27RcXdnvZ5sbLVQe1mVq+VLifgpCjFfpZUPYetYU=", "narHash": "sha256-LUmD3MgZojFmWbZzr2V+enuVmsBdZ7yyEyynvq/snNY=",
"ref": "master", "ref": "master",
"rev": "452858543ffa7fa68265fb64c48cd7404602a478", "rev": "a8e8db709bf2f6189b573bc3966ca0c3322483c6",
"revCount": 2, "revCount": 5,
"type": "git", "type": "git",
"url": "https://codeberg.org/amadaluzia/painless-neovim.git" "url": "https://codeberg.org/amadaluzia/painless-neovim.git"
}, },

10
overlays/default.nix
View file

@ -1,7 +1,15 @@
{inputs, ...}: { {inputs, ...}: {
flake.overlays.default = final: prev: { flake.overlays.default = final: prev: {
fairfax = final.callPackage ./derivations/fairfax.nix {}; fairfax = final.callPackage ./derivations/fairfax.nix {};
nicotine-plus = final.callPackage ./derivations/nicotine-plus.nix {}; nicotine-plus = final.symlinkJoin {
name = "nicotine";
paths = [prev.nicotine-plus];
nativeBuildInputs = [prev.makeWrapper];
postBuild = ''
wrapProgram $out/bin/nicotine \
--set-default NICOTINE_LIBADWAITA 1
'';
};
rose-pine-gtk-theme = prev.rose-pine-gtk-theme.overrideAttrs (prevAttrs: { rose-pine-gtk-theme = prev.rose-pine-gtk-theme.overrideAttrs (prevAttrs: {
version = "master"; version = "master";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {

73
overlays/derivations/nicotine-plus.nix
View file

@ -1,73 +0,0 @@
{
lib,
fetchFromGitHub,
wrapGAppsHook4,
gdk-pixbuf,
gettext,
gobject-introspection,
gtk4,
glib,
python3Packages,
libadwaita,
makeWrapper,
}:
python3Packages.buildPythonApplication rec {
pname = "nicotine-plus";
version = "3.3.6";
pyproject = true;
src = fetchFromGitHub {
owner = "nicotine-plus";
repo = "nicotine-plus";
rev = "refs/tags/${version}";
hash = "sha256-je3hyxbF9wKW2gvHoDp712EJxBxooS2z0pQM57WDdOk=";
};
nativeBuildInputs = [
gettext
wrapGAppsHook4
gobject-introspection
glib
gdk-pixbuf
gtk4
];
buildInputs = [
libadwaita
makeWrapper
];
dependencies = [
python3Packages.pygobject3
];
build-system = [
python3Packages.setuptools
];
postInstall = ''
wrapProgram $out/bin/nicotine \
--set NICOTINE_LIBADWAITA 1
ln -s $out/bin/nicotine $out/bin/nicotine-plus
'';
dontWrapGAppsHook = true;
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
];
doCheck = false;
meta = with lib; {
description = "Graphical client for the SoulSeek peer-to-peer system";
longDescription = ''
Nicotine+ aims to be a pleasant, free and open source (FOSS) alternative
to the official Soulseek client, providing additional functionality while
keeping current with the Soulseek protocol.
'';
homepage = "https://www.nicotine-plus.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
klntsky
amadaluzia
];
};
}