diff --git a/flake.lock b/flake.lock index 717eb64..20811f8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,14 +2,16 @@ "nodes": { "disko": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1732894783, - "narHash": "sha256-7hBU7L07hYPNjamlm/v5scUUwsHQJvyb1a4flozHNt0=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "a75ba3b87b7ff230ca8b3a1fbfd4ad907a1a5fa2", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -19,31 +21,12 @@ } }, "emacs": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1732845489, - "narHash": "sha256-7DKGn0D915PZUr/NklO41WsITUfLr+RM/RJqQezKjUI=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "6b78552e35d0a1b050091401ee9959070383ac36", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "emacs_2": { "inputs": { "nixpkgs": [ "pankomacs", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1732381887, @@ -59,29 +42,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs-f2k", - "nixpkgs-fmt", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1637475807, - "narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=", - "owner": "nix-community", - "repo": "fenix", - "rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -105,11 +65,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -120,7 +80,7 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1730504689, @@ -137,21 +97,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -173,15 +118,17 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", "type": "github" }, "original": { @@ -279,64 +226,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", - "owner": "NixOS", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-f2k": { - "inputs": { - "emacs": "emacs", - "nixpkgs": "nixpkgs_5", - "nixpkgs-fmt": "nixpkgs-fmt", - "parts": "parts" - }, - "locked": { - "lastModified": 1732849319, - "narHash": "sha256-GzPk7gDQyX6irVp5ZzEoj8zcpavZrjD+0QAyrdhPkK0=", - "owner": "moni-dz", - "repo": "nixpkgs-f2k", - "rev": "abb5ffb1f9e711c6989a7625175683290e249ca4", - "type": "github" - }, - "original": { - "owner": "moni-dz", - "repo": "nixpkgs-f2k", - "type": "github" - } - }, - "nixpkgs-fmt": { - "inputs": { - "fenix": "fenix", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs-f2k", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721822211, - "narHash": "sha256-zacOgNv3qM3AbSG3p5PT/Bfc4c7NoIqoLII8/jIUsOQ=", - "owner": "nix-community", - "repo": "nixpkgs-fmt", - "rev": "bdb15b4c7e0cb49ae091dd43113d0a938afae02c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs-fmt", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1730504152, @@ -349,18 +252,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -378,22 +269,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1731797254, "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", @@ -409,103 +284,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1732848913, - "narHash": "sha256-lut6G8zGfDvQ24iUq2BvHr7OUE9pNuEEnYgM0OcPytc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fec9222abfd8e466d8e4be306f79605e0a31d595", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1732617236, "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", @@ -521,7 +300,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_3": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -537,22 +316,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -572,10 +335,10 @@ "nvf": { "inputs": { "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_2", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-base16": "plugin-base16", @@ -712,15 +475,17 @@ }, "painless-neovim": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": [ + "nixpkgs" + ], "nvf": "nvf" }, "locked": { - "lastModified": 1732902058, - "narHash": "sha256-bAu/SqbzRVxOpeKbdI5Bp6GIdaVh72sc9jCdBlA4O0M=", + "lastModified": 1733074508, + "narHash": "sha256-fWI+3w4BpIkX9kfb9f1Ct6nkzoOS+5RUv8UUismxkF4=", "ref": "master", - "rev": "761f993054a81bf119b3e5e878ace6eaf7ad72e1", - "revCount": 6, + "rev": "8e869b366a35ade0195da25fa5a3b24f1409e731", + "revCount": 7, "type": "git", "url": "https://codeberg.org/amadaluzia/painless-neovim.git" }, @@ -732,9 +497,11 @@ }, "pankomacs": { "inputs": { - "emacs": "emacs_2", - "nixpkgs": "nixpkgs_9", - "parts": "parts_2" + "emacs": "emacs", + "nixpkgs": [ + "nixpkgs" + ], + "parts": "parts" }, "locked": { "lastModified": 1732482733, @@ -752,24 +519,6 @@ } }, "parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_2": { "inputs": { "nixpkgs-lib": [ "pankomacs", @@ -2635,7 +2384,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -2657,8 +2406,7 @@ "disko": "disko", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_3", - "nixpkgs-f2k": "nixpkgs-f2k", + "nixpkgs": "nixpkgs", "painless-neovim": "painless-neovim", "pankomacs": "pankomacs", "rosepine-qutebrowser": "rosepine-qutebrowser", @@ -2681,23 +2429,6 @@ "type": "github" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1637439871, - "narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "4566414789310acb2617543f4b50beab4bb48e06", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -2783,15 +2514,17 @@ }, "wallpkgs": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_3" }, "locked": { - "lastModified": 1732891015, - "narHash": "sha256-LHa140YaLwy+aTcQMxmYwLlf7F9VlCV/Lu8QPrzDbDk=", + "lastModified": 1733570646, + "narHash": "sha256-pZwvuOMtelkLmcG+dbedSlFaTomf3SNtYrPfZN41lXY=", "owner": "notashelf", "repo": "wallpkgs", - "rev": "5229eb2e8c3636590a74764f9edc1ea01cc01ae7", + "rev": "e5a34ff48313b6ae38ac72da02f889ed8985d76b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1561170..214ace7 100644 --- a/flake.nix +++ b/flake.nix @@ -17,26 +17,25 @@ type = "github"; owner = "cachix"; repo = "git-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; }; disko = { type = "github"; owner = "nix-community"; repo = "disko"; + inputs.nixpkgs.follows = "nixpkgs"; }; wallpkgs = { type = "github"; owner = "notashelf"; repo = "wallpkgs"; - }; - nixpkgs-f2k = { - type = "github"; - owner = "moni-dz"; - repo = "nixpkgs-f2k"; + inputs.nixpkgs.follows = "nixpkgs"; }; pankomacs = { type = "git"; url = "https://codeberg.org/amadaluzia/pankomacs.git"; ref = "main"; + inputs.nixpkgs.follows = "nixpkgs"; }; rosepine-qutebrowser = { type = "github"; @@ -48,6 +47,7 @@ type = "git"; url = "https://codeberg.org/amadaluzia/painless-neovim.git"; ref = "master"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = inputs @ { diff --git a/hosts/python/configs/fuzzel/fuzzel.ini b/hosts/python/configs/fuzzel/fuzzel.ini deleted file mode 100644 index 41bfd02..0000000 --- a/hosts/python/configs/fuzzel/fuzzel.ini +++ /dev/null @@ -1,26 +0,0 @@ -[main] -font=monospace:size=15 -use-bold=yes -icons-enabled=no -match-mode=fuzzy -anchor=center -lines=8 -horizontal-pad=15 -vertical-pad=15 - -[colors] -background=16161eff -text=c0caf5ff -match=2ac3deff -selection=343a55ff -selection-match=2ac3deff -selection-text=c0caf5ff -border=27a1b9ff - -[border] -width=2 -radius=0 - -[key-bindings] -cancel=Control+[ -execute=Control+m diff --git a/hosts/python/configs/kitty/current-theme.conf b/hosts/python/configs/kitty/current-theme.conf index f2d9728..369da8d 100644 --- a/hosts/python/configs/kitty/current-theme.conf +++ b/hosts/python/configs/kitty/current-theme.conf @@ -1,50 +1,49 @@ -# vim:ft=kitty +# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox +# This work is licensed under the terms of the MIT license. +# For a copy, see https://opensource.org/licenses/MIT. -## name: Tokyo Night -## license: MIT -## author: Folke Lemaitre -## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf +background #282828 +foreground #ebdbb2 +cursor #928374 -background #1a1b26 -foreground #c0caf5 -selection_background #283457 -selection_foreground #c0caf5 -url_color #73daca -cursor #c0caf5 -cursor_text_color #1a1b26 +selection_foreground #928374 +selection_background #3c3836 -# Tabs -active_tab_background #7aa2f7 -active_tab_foreground #16161e -inactive_tab_background #292e42 -inactive_tab_foreground #545c7e -#tab_bar_background #15161e +color0 #282828 +color8 #928374 -# Windows -active_border_color #7aa2f7 -inactive_border_color #292e42 +# red +color1 #cc241d +# light red +color9 #fb4934 -# normal -color0 #15161e -color1 #f7768e -color2 #9ece6a -color3 #e0af68 -color4 #7aa2f7 -color5 #bb9af7 -color6 #7dcfff -color7 #a9b1d6 +# green +color2 #98971a +# light green +color10 #b8bb26 -# bright -color8 #414868 -color9 #f7768e -color10 #9ece6a -color11 #e0af68 -color12 #7aa2f7 -color13 #bb9af7 -color14 #7dcfff -color15 #c0caf5 +# yellow +color3 #d79921 +# light yellow +color11 #fabd2d -# extended colors -color16 #ff9e64 -color17 #db4b4b +# blue +color4 #458588 +# light blue +color12 #83a598 + +# magenta +color5 #b16286 +# light magenta +color13 #d3869b + +# cyan +color6 #689d6a +# lighy cyan +color14 #8ec07c + +# light gray +color7 #a89984 +# dark gray +color15 #928374 diff --git a/hosts/python/configs/river/init b/hosts/python/configs/river/init index d2ecc3d..fc03211 100755 --- a/hosts/python/configs/river/init +++ b/hosts/python/configs/river/init @@ -1,13 +1,14 @@ #!/bin/sh riverctl spawn kanshi -riverctl spawn "wbg ~/.local/share/wallpapers/04.png" +riverctl spawn "wbg ~/.local/share/wallpapers/01.jpg" +riverctl spawn "waybar" 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 map normal Super+Shift Return spawn kitty -riverctl map normal Super P spawn fuzzel +riverctl map normal Super P spawn "rofi -show drun" riverctl map normal Super Q close riverctl map normal Super+Shift E exit riverctl map normal Super+Shift C spawn "~/.config/river/init" @@ -80,13 +81,13 @@ done riverctl rule-add ssd riverctl background-color 0x00000000 -riverctl border-color-focused 0x27a1b9ff +riverctl border-color-focused 0x8ec07cff riverctl border-color-unfocused 0x00000000 riverctl keyboard-layout "us" riverctl set-repeat 50 300 -riverctl xcursor-theme "Simp1e-Tokyo-Night" +riverctl xcursor-theme "Simp1e-Gruvbox-Dark" riverctl default-layout rivertile -rivertile -view-padding 10 -outer-padding 10 & +rivertile -view-padding 4 -outer-padding 4 & diff --git a/hosts/python/configs/rofi/config.rasi b/hosts/python/configs/rofi/config.rasi new file mode 100644 index 0000000..f27fd33 --- /dev/null +++ b/hosts/python/configs/rofi/config.rasi @@ -0,0 +1,22 @@ +@theme "~/.config/rofi/gruvbox-material.rasi" + +configuration { + font: "Monospace 10"; + + drun { + display-name: ""; + } + + run { + display-name: ""; + } + + window { + display-name: ""; + } + + timeout { + delay: 10; + action: "kb-cancel"; + } +} diff --git a/hosts/python/configs/rofi/gruvbox-material.rasi b/hosts/python/configs/rofi/gruvbox-material.rasi new file mode 100644 index 0000000..2175099 --- /dev/null +++ b/hosts/python/configs/rofi/gruvbox-material.rasi @@ -0,0 +1,108 @@ +/** + * Gruvbox Material Rofi theme + * Color palette copied from https://github.com/sainnhe/gruvbox-material + * https://github.com/hiimsergey/rofi-gruvbox-material + */ + +* { + // Taken from "Hard" variant + background: #282828; // bg_statusline1 + element: #32302f; // bg_statusline2 + selection: #a89984; // grey2 + text: #eee0b7; // bg4 (light mode) + + red: #ea6962; // red + yellow: #d8a657; // yellow + reddark: #c14a4a; // red (light mode) + yellowdark: #b47109; // yellow (light mode) + + background-color: transparent; +} + +window { + height: 600; + width: 600; + + border-radius: 10; +} + +mainbox { + spacing: 0; + children: [inputbar, message, listview]; +} + +inputbar { + color: @text; + padding: 14; + background-color: @background; +} + +message { + padding: 10; + background-color: @selection; +} + +listview { + padding: 8; + border-radius: 0 0 10 10; + border: 2 2 2 2; + border-color: @background; + background-color: @background; + dynamic: false; +} + +textbox { + text-color: @text; +} + +error-message { + border: 20 20 20 20; +} + +entry, prompt, case-indicator { + text-color: inherit; +} + +prompt { + margin: 0 10 0 0; +} + +element { + padding: 5; + vertical-align: 0.5; + border-radius: 10; + text-color: @text; + background-color: @element; +} + +element.selected.normal { + background-color: @selection; +} + +element.alternate.normal { + background-color: inherit; +} + +element.normal.active, element.alternate.active { + background-color: @yellow; +} + +element.selected.active { + background-color: @yellowdark; +} + +element.normal.urgent, element.alternate.urgent { + background-color: @red; +} + +element.selected.urgent { + background-color: @reddark; +} + +element-text, element-icon { + size: 40; + margin: 0 10 0 0; + vertical-align: 0.5; + background-color: inherit; + text-color: @text; +} diff --git a/hosts/python/configs/waybar/config.jsonc b/hosts/python/configs/waybar/config.jsonc new file mode 100644 index 0000000..fac8613 --- /dev/null +++ b/hosts/python/configs/waybar/config.jsonc @@ -0,0 +1,33 @@ +{ + "position": "top", + "height": 0, + "spacing": 16, + "modules-left": ["mpris"], + "modules-center": ["river/tags"], + "modules-right": ["wireplumber", "clock"], + "mpris": { + "format": "{player_icon} {dynamic}", + "format-paused": "{status_icon} {dynamic}", + "interval": 1, + "title-len": 30, + "album-len": 30, + "player-icons": { + "default": "▶", + "mpv": "🎵", + }, + "status-icons": { + "paused": "", + "paused": "⏸", + }, + }, + "clock": { + "format": " {:%H:%M}", + "tooltip-format": "{:%A, %B %d, %Y}", + }, + "wireplumber": { + "format": "{icon} {volume}%", + "format-muted": "", + "on-click": "helvum", + "format-icons": ["", "", ""], + }, +} diff --git a/hosts/python/configs/waybar/style.css b/hosts/python/configs/waybar/style.css new file mode 100644 index 0000000..b910860 --- /dev/null +++ b/hosts/python/configs/waybar/style.css @@ -0,0 +1,36 @@ +* { + all: unset; + font-size: 18px; + color: #ebdbb2; +} + +window#waybar { + background: #282828; +} + +tooltip { + background: #3c3836; +} + +.modules-left, +.modules-right { + background: #3c3836; + padding: 0px 12px; +} + +.modules-center { + background: #3c3836; +} + +#tags button { + padding: 8px 16px; + transition: 0.2s; +} + +#tags button:hover { + padding: 8px 28px; +} + +#tags button.focused { + background: #504945; +} diff --git a/hosts/python/fonts.nix b/hosts/python/fonts.nix index 0ef5a06..0fb9c5e 100644 --- a/hosts/python/fonts.nix +++ b/hosts/python/fonts.nix @@ -1,19 +1,19 @@ {pkgs, ...}: { alqueva.fonts = { names = { - sansSerif = ["Source Sans Pro"]; - monospace = ["Commit Mono"]; - serif = ["Source Serif Pro"]; + sansSerif = ["Inter"]; + monospace = ["Maple Mono"]; + serif = ["ETBembo"]; emoji = ["OpenMoji Color"]; }; packages = { - sansSerif = [pkgs.source-sans-pro]; - monospace = [pkgs.commit-mono]; - serif = [pkgs.source-serif-pro]; + sansSerif = [pkgs.inter]; + monospace = [pkgs.maple-mono]; + serif = [pkgs.source-serif-pro pkgs.etBook]; emoji = [pkgs.openmoji-color]; extra = [ pkgs.source-han-sans - (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + pkgs.nerd-fonts.symbols-only ]; }; enable = true; diff --git a/hosts/python/theme.nix b/hosts/python/theme.nix index 58ff634..9285583 100644 --- a/hosts/python/theme.nix +++ b/hosts/python/theme.nix @@ -2,7 +2,16 @@ pkgs, lib, ... -}: { +}: let + themes = { + gtk-theme = pkgs.gruvbox-material-gtk-theme; + kvantum-theme = pkgs.gruvbox-kvantum.override { + variant = "Gruvbox-Dark-Green"; + }; + icon-theme = pkgs.gruvbox-plus-icons; + cursor-theme = pkgs.simp1e-cursors; + }; +in { programs.dconf = { profiles.user.databases = [ { @@ -10,9 +19,9 @@ "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; cursor-size = lib.gvariant.mkUint32 24; - cursor-theme = "Simp1e-Tokyo-Night"; - icon-theme = "Tela-circle-purple-dark"; - gtk-theme = "Tokyonight-Dark"; + cursor-theme = "Simp1e-Gruvbox-Dark"; + icon-theme = "Gruvbox-Plus-Dark"; + gtk-theme = "Gruvbox-Material-Dark"; }; }; } @@ -22,20 +31,14 @@ qt = { enable = true; + platformTheme = "qt5ct"; style = "kvantum"; }; - environment.systemPackages = builtins.attrValues { - gtk-theme = pkgs.tokyonight-gtk-theme; - icon-theme = pkgs.tela-circle-icon-theme.override { - colorVariants = ["purple"]; - circularFolder = true; - }; - cursor-theme = pkgs.simp1e-cursors; - }; - + environment.systemPackages = builtins.attrValues themes; systemd.user.tmpfiles.rules = [ - "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.tokyonight-gtk-theme}/share/themes/Tokyonight-Dark/gtk-4.0/gtk-dark.css" + "L+ %h/.config/gtk-4.0/gtk.css - - - - ${themes.gtk-theme}/share/themes/Gruvbox-Material-Dark/gtk-4.0/gtk.css" + "L+ %h/.config/gtk-4.0/assets - - - - ${themes.gtk-theme}/share/themes/Gruvbox-Material-Dark/gtk-4.0/assets" + "L+ %h/.config/Kvantum/Gruvbox-Dark-Green - - - - ${themes.kvantum-theme}/share/Kvantum/Gruvbox-Dark-Green/" ]; } diff --git a/hosts/python/users.nix b/hosts/python/users.nix index b68e010..9229e76 100644 --- a/hosts/python/users.nix +++ b/hosts/python/users.nix @@ -7,10 +7,11 @@ tmpfiles = { ".config/qutebrowser/config.py" = ./configs/qutebrowser/config.py; ".config/kanshi/" = ./configs/kanshi; - ".config/fuzzel/" = ./configs/fuzzel; + ".config/rofi/" = ./configs/rofi; ".config/river/" = ./configs/river; ".config/kitty/" = ./configs/kitty; - ".local/share/wallpapers" = "${inputs.wallpkgs.packages.${pkgs.system}.tokyo_night}/share/wallpapers/tokyo_night"; + ".config/waybar/" = ./configs/waybar; + ".local/share/wallpapers" = "${inputs.wallpkgs.packages.${pkgs.system}.gruvbox}/share/wallpapers/gruvbox"; }; packages = builtins.attrValues { inherit @@ -24,6 +25,8 @@ nicotine-plus nautilus librewolf + playerctl + geary ; }; groups = [ diff --git a/hosts/shared/pipewire.nix b/hosts/shared/pipewire.nix index e4425f4..58ab110 100644 --- a/hosts/shared/pipewire.nix +++ b/hosts/shared/pipewire.nix @@ -11,6 +11,7 @@ in { }; config = lib.mkIf cfg.enable { + security.rtkit.enable = true; services.pipewire = { enable = true; alsa.enable = true; diff --git a/hosts/shared/support.nix b/hosts/shared/support.nix index 6eba50a..3157a39 100644 --- a/hosts/shared/support.nix +++ b/hosts/shared/support.nix @@ -32,7 +32,7 @@ in { slurp grim wf-recorder - fuzzel + rofi-wayland kitty wl-clipboard ; @@ -42,5 +42,6 @@ in { "QT_QPA_PLATFORM" = "wayland"; }; }; + programs.waybar.enable = true; }; } diff --git a/overlays/default.nix b/overlays/default.nix index aab5bd1..f6c2d41 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,8 @@ -{inputs, ...}: { - flake.overlays.default = final: prev: { - fairfax = final.callPackage ./derivations/fairfax.nix {}; - nicotine-plus = final.symlinkJoin { +{self, ...}: { + flake.overlays.default = _final: prev: { + fairfax = prev.callPackage ./derivations/fairfax.nix {}; + river-bedload = prev.callPackage ./derivations/river-bedload {}; + nicotine-plus = prev.symlinkJoin { name = "nicotine"; paths = [prev.nicotine-plus]; nativeBuildInputs = [prev.makeWrapper]; @@ -10,7 +11,7 @@ --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"; src = prev.fetchFromGitHub { owner = "rose-pine"; @@ -20,20 +21,7 @@ }; }); }; - perSystem = { - pkgs, - system, - ... - }: { - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ - inputs.self.overlays.default - ]; - }; - - packages = { - inherit (pkgs) fairfax nicotine-plus rose-pine-gtk-theme; - }; + perSystem = {pkgs, ...}: { + packages = self.overlays.default null pkgs; }; } diff --git a/overlays/derivations/river-bedload/build.zig.zon.nix b/overlays/derivations/river-bedload/build.zig.zon.nix new file mode 100644 index 0000000..6e8f2cf --- /dev/null +++ b/overlays/derivations/river-bedload/build.zig.zon.nix @@ -0,0 +1,14 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) +{ + linkFarm, + fetchzip, +}: +linkFarm "zig-packages" [ + { + name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; + hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE="; + }; + } +] diff --git a/overlays/derivations/river-bedload/default.nix b/overlays/derivations/river-bedload/default.nix new file mode 100644 index 0000000..cbe2964 --- /dev/null +++ b/overlays/derivations/river-bedload/default.nix @@ -0,0 +1,38 @@ +{ + stdenv, + fetchgit, + zig_0_13, + callPackage, + wayland-scanner, + wayland-protocols, + wayland, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "river-bedload"; + version = "0.1.1"; + + src = fetchgit { + url = "https://git.sr.ht/~novakane/${finalAttrs.pname}"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AMxFdKVy4E1xVdimqxm8KZW39krk/Mt27MWLxEiq1JA="; + }; + + deps = callPackage ./build.zig.zon.nix {}; + + zigBuildFlags = [ + "--system" + "${finalAttrs.deps}" + ]; + + nativeBuildInputs = [ + zig_0_13.hook + pkg-config + wayland-scanner + ]; + + buildInputs = [ + wayland + wayland-protocols + ]; +}) diff --git a/overlays/derivations/tabler-icons.nix b/overlays/derivations/tabler-icons.nix new file mode 100644 index 0000000..3596e53 --- /dev/null +++ b/overlays/derivations/tabler-icons.nix @@ -0,0 +1,52 @@ +{ + stdenv, + fetchFromGitHub, + fontforge, + nodejs, + pnpm, + lib, +}: let + pname = "tabler-icons"; + version = "v3.24.0"; +in + stdenv.mkDerivation (finalAttrs: { + inherit pname version; + + src = fetchFromGitHub { + owner = "tabler"; + repo = pname; + rev = version; + hash = "sha256-6v7strSKsxSmUGXRhapOlImsCj035AX1Td+IQHPs+7g="; + }; + + buildInputs = [fontforge]; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-/BB1FaMR06uwv3Za6+PWSWMPLtoRXRTqsZDV3DIgaxs="; + }; + + # buildPhase = '' + # runHook preBuild + # npm run build:webfont + # runHook postBuild + # ''; + + installPhase = '' + mkdir -p $out/useless_dir_just_check_contents + mv .* $out/useless_dir_just_check_contents + mv */ $out/useless_dir_just_check_contents + ''; + + meta = { + description = "A set of over 5700 free MIT-licensed high-quality SVG icons for you to use in your web projects."; + homepage = "https://tabler.io/icons"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [amadaluzia]; + }; + })