diff --git a/core/packages.nix b/core/packages.nix index 2b73359..6f6e186 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -2,6 +2,17 @@ { + programs = { + # hyprland.enable = true; + traceroute.enable = true; + starship.enable = true; + fish.enable = true; + git.enable = true; + + firefox.enable = true; + + }; + environment.systemPackages = with pkgs; [ ## nixos @@ -24,17 +35,30 @@ ## terminal kitty micro - - ## cli tools + pipes + cbonsai hyfetch + cmatrix + peaclock + + ## tools file + fd + bc + gcc zip + tldr + wget + curl unzip gnupg + blueman busybox + ripgrep killall usbutils pciutils + xdg_utils moreutils libsecret git-crypt @@ -44,25 +68,40 @@ # lagrange # firefox - ## misc, fonts, libraries, maybe more - (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) + ## misc, libraries, maybe more, # qt5-wayland # qt6-wayland glib ]; + fonts = { - programs = { - # hyprland.enable = true; - traceroute.enable = true; - starship.enable = true; - fish.enable = true; - git.enable = true; + packages = with pkgs; [ + spleen + terminus_font + terminus_font_ttf + (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) + ]; + + fontDir.enable = true; + + fontconfig = { + defaultFonts = { + + monospace = [ + "TerminusTTF" + ]; + serif = [ + "spleen-32x64" + ]; + sansSerif = [ + "spleen-32x64" + ]; + + }; + }; - firefox.enable = true; - }; - } diff --git a/flake.lock b/flake.lock index c41a39b..bd9fa75 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -20,6 +36,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "hardware": { "locked": { "lastModified": 1712324865, @@ -105,6 +137,31 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1712420644, + "narHash": "sha256-h2X8qhN5RKYQXzT1kxKgUz1u1QthqOrP9xk800mTM6E=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "5ec0140d4aeca42b8a33e7f335f979e376d1b549", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -178,6 +235,25 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1711523803, @@ -194,6 +270,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1712163089, @@ -210,13 +301,32 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "hardware": "hardware", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2" + "hyprland-plugins": "hyprland-plugins", + "nix-colors": "nix-colors", + "nixpkgs": "nixpkgs_2", + "waybar": "waybar" } }, "systems": { @@ -249,6 +359,25 @@ "type": "github" } }, + "waybar": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1712127529, + "narHash": "sha256-R3yPS5ktvzhUI+TeHTDkbKgiA8SDvozu33azFUeMVoo=", + "owner": "Alexays", + "repo": "Waybar", + "rev": "42dc9cb85f27e3db02da83cd13624cfc5a7191d3", + "type": "github" + }, + "original": { + "owner": "Alexays", + "repo": "Waybar", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 391e236..cd01b94 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "SerenityOS v0.3.2-1"; + description = "SerenityOS v0.3.6"; inputs = { @@ -21,10 +21,14 @@ # ricer friendly wayland compositor hyprland.url = "github:hyprwm/Hyprland"; - # hyprland-plugins = { - # url = "github:hyprwm/hyprland-plugins"; - # inputs.hyprland.follows = "hyprland"; - # }; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + # status/task bar + # Fix broken waybar on current nixpkgs-unstable + waybar.url = "github:Alexays/Waybar"; + nix-colors.url = "github:misterio77/nix-colors"; }; @@ -35,6 +39,8 @@ nixpkgs, home-manager, hyprland, + waybar, + nix-colors, ... } @ inputs: let inherit (self) outputs; diff --git a/home/fish.nix b/home/fish.nix new file mode 100644 index 0000000..d900b27 --- /dev/null +++ b/home/fish.nix @@ -0,0 +1,382 @@ +pkgs: { + enable = true; + loginShellInit = '' + set -x EDITOR lvim + set -x LIBVIRT_DEFAULT_URI "qemu:///system" + fish_add_path "~/.local/bin" + fish_add_path ~/.local/bin/scripts + fish_add_path /var/lib/flatpak/exports/bin + fish_add_path ~/.cargo/bin + fish_add_path ~/.local/share/npm-global/bin + ''; + + shellAbbrs = { + b = "bat"; + "1" = "prevd"; + "2" = "prevd 2"; + "3" = "prevd 3"; + "4" = "prevd 4"; + c = "cd"; + cg = "cargo"; + reload = "exec fish"; + nv = "lvim"; + sshfix = "kitty +kitten ssh"; + tree = "eza -TR --git-ignore"; + up = "topgrade"; + gay = "curl fetch.sashanoraa.gay"; + sc = "sudo systemctl"; + scs = "systemctl status"; + scst = "sudo systemctl start"; + scsp = "sudo systemctl stop"; + scr = "sudo systemctl restart"; + jr = "journalctl"; + jre = "journalctl -e -u"; + jrf = "journalctl -f -u"; + + nxp = "nix-shell --command fish -p"; + nxs = "nix search nixpkgs"; + # nxr = { + # expansion = "nix run nixpkgs#%"; + # setCursor = true; + # }; + # nxsh = { + # expansion = "nix shell nixpkgs#%"; + # setCursor = true; + # }; + + g = "git"; + ga = "git add"; + gaa = "git add --all"; + gau = "git add -u"; + gb = "git branch"; + gco = "git checkout"; + gc = "git commit"; + gca = "git commit --amend"; + gcl = "git clone"; + gd = "git diff"; + gf = "git fetch"; + gl = "git log"; + gm = "git merge"; + gp = "git push"; + gpl = "git pull"; + gpn = "git push -u origin (current_branch)"; + gr = "git remote"; + gra = "git remote add"; + grao = "git remote add origin"; + grb = "git rebase"; + grbi = "git rebase -i"; + gs = "git status -sb"; + gsu = "git submodule"; + gro = "git restore"; + gsw = "git switch"; + }; + + shellAliases = { + cl = "printf '\\033[2J\\033[3J\\033[1;1H'"; + git-master-to-main = "git branch -m master main && git push origin :master main:main"; + l = "eza"; + la = "eza -a"; + ll = "eza -l"; + lla = "eza -al"; + shn = "git remote add origin git@git.sr.ht:~zethra/$(basename $(pwd))"; + scratch = "lvim /tmp/scratch"; + tmp = "lvim /dev/null"; + ssh = "kitty +kitten ssh"; + }; + + interactiveShellInit = '' + fish_vi_key_bindings + set fish_cursor_default block + set fish_cursor_insert line + set fish_cursor_replace_one underscore + set fish_cursor_replace underscore + set fish_cursor_external line + set fish_cursor_visual block + + + set -x EXA_COLORS 'di=35;01:da=35' + + # Syntax Highlighting Colors + set -Ux fish_color_normal c0caf5 + set -Ux fish_color_command 7dcfff + set -Ux fish_color_keyword bb9af7 + set -Ux fish_color_quote e0af68 + set -Ux fish_color_redirection c0caf5 + set -Ux fish_color_end ff9e64 + set -Ux fish_color_error f7768e + set -Ux fish_color_param 9d7cd8 + set -Ux fish_color_comment 565f89 + set -Ux fish_color_selection --background=33467c + set -Ux fish_color_search_match --background=33467c + set -Ux fish_color_operator 9ece6a + set -Ux fish_color_escape bb9af7 + set -Ux fish_color_autosuggestion 565f89 + + # Completion Pager Colors + set -Ux fish_pager_color_progress 565f89 + set -Ux fish_pager_color_prefix 7dcfff + set -Ux fish_pager_color_completion c0caf5 + set -Ux fish_pager_color_description 565f89 + set -Ux fish_pager_color_selected_background --background=33467c + + source ~/.config/fish/functions/__fre_cd.fish + + abbr -a nxr --set-cursor "nix run nixpkgs#%" + abbr -a nxsh --set-cursor "nix shell nixpkgs#%" + + complete -x -c mkproj -d "Template name" -a "(ls ~/Projects/nixcfg/programs/cookiecutter)" + ''; + + functions = { + fre-clean = '' + for p in (fre --sorted) + if ! [ -d $p ] + echo $p + fre -D $p + end + end + ''; + fish_greeting = '' + if type -q kitty-img + printf '💖 hiya sashanoraa ' + kitty-img ~/.config/fish/pfp.png 2>/dev/null + echo ' 'welcome to (gethost) "~" 🏳️‍⚧️ + else + echo 💖 hiya sashanoraa welcome to (gethost) "~" 🏳️‍⚧️ + end + ''; + gbd = { + wraps = "git branch -d"; + body = "git branch -d $argv[1] && git push --delete origin $argv[1]"; + }; + gbD = { + wraps = "git branch -D"; + body = "git branch -D $argv[1] && git push --delete origin $argv[1]"; + }; + mkproj = { + body = '' + cookiecutter "$HOME/Projects/nixcfg/programs/cookiecutter/$argv[1]" + ''; + }; + + gethost = '' + if test -f /run/.containerenv + function gethost + grep -F name= /run/.containerenv | cut -d '"' -f2; + end + else if command -v hostnamectl &> /dev/null + function gethost --wraps=hostnamectl --description 'alias gethost hostnamectl' + hostnamectl --pretty; + end + else if command -v hostname &> /dev/null + function gethost --wraps=hostname --description 'alias gethost hostname -s' + hostname -s; + end + else + function gethost --wraps=hostname --description 'alias gethost hostname' + echo host_error; + end + end + ''; + + mkshell = '' + echo "{ pkgs ? import {} }: + + pkgs.mkShell { + packages = with pkgs; [ $argv ]; + }" > shell.nix + echo "use nix" > .envrc && direnv allow . + printf ".envrc\n.direnv" >> .gitignore + ''; + + copy = '' + if command -v wl-copy &> /dev/null + if test -f "$argv[1]" + wl-copy < "$argv[1]" + else + wl-copy $argv + end + else + xclip -sel clip "$argv" + end + ''; + + paste = '' + if command -v wl-paste &> /dev/null + wl-paste + else + xclip -sel clip -o "$argv" + end + ''; + + current_branch = '' + set ref (git symbolic-ref HEAD 2> /dev/null); or \ + set ref (git rev-parse --short HEAD 2> /dev/null); or return + echo $ref | sed s-refs/heads/-- + ''; + + __fre_cd = { + onVariable = "PWD"; + body = '' + status --is-command-substitution; and return + fre --add (pwd) + ''; + }; + + mommy = '' + set -g prev_status $status + + # SHELL_MOMMYS_LITTLE - what to call you~ (default: "girl") + # SHELL_MOMMYS_PRONOUNS - what pronouns mommy will use for themself~ (default: "her") + # SHELL_MOMMYS_ROLES - what role mommy will have~ (default "mommy") + + set -g COLORS_LIGHT_PINK '\e[38;5;217m' + set -g COLORS_LIGHT_BLUE '\e[38;5;117m' + set -g COLORS_FAINT '\e[2m' + set -g COLORS_RESET '\e[0m' + + set -g DEF_WORDS_LITTLE "girl" + set -g DEF_WORDS_PRONOUNS "her" + set -g DEF_WORDS_ROLES "mommy" + set -g DEF_MOMMY_COLOR "$COLORS_LIGHT_PINK" + set -g DEF_ONLY_NEGATIVE "false" + + set -g NEGATIVE_RESPONSES \ + "do you need MOMMYS_ROLE's help~? ❤️" \ + "Don't give up, my love~ ❤️" \ + "Don't worry, MOMMYS_ROLE is here to help you~ ❤️" \ + "I believe in you, my sweet AFFECTIONATE_TERM~ ❤️" \ + "It's okay to make mistakes, my dear~ ❤️" \ + "just a little further, sweetie~ ❤️" \ + "Let's try again together, okay~? ❤️" \ + "MOMMYS_ROLE believes in you, and knows you can overcome this~ ❤️" \ + "MOMMYS_ROLE believes in you~ ❤️" \ + "MOMMYS_ROLE is always here for you, no matter what~ ❤️" \ + "MOMMYS_ROLE is here to help you through it~ ❤️" \ + "MOMMYS_ROLE is proud of you for trying, no matter what the outcome~ ❤️" \ + "MOMMYS_ROLE knows it's tough, but you can do it~ ❤️" \ + "MOMMYS_ROLE knows MOMMYS_PRONOUN little AFFECTIONATE_TERM can do better~ ❤️" \ + "MOMMYS_ROLE knows you can do it, even if it's tough~ ❤️" \ + "MOMMYS_ROLE knows you're feeling down, but you'll get through it~ ❤️" \ + "MOMMYS_ROLE knows you're trying your best~ ❤️" \ + "MOMMYS_ROLE loves you, and is here to support you~ ❤️" \ + "MOMMYS_ROLE still loves you no matter what~ ❤️" \ + "You're doing your best, and that's all that matters to MOMMYS_ROLE~ ❤️" \ + "MOMMYS_ROLE is always here to encourage you~ ❤️" + + set -g POSITIVE_RESPONSES \ + "*pets your head*" \ + "awe, what a good AFFECTIONATE_TERM~\nMOMMYS_ROLE knew you could do it~ ❤️" \ + "good AFFECTIONATE_TERM~\nMOMMYS_ROLE's so proud of you~ ❤️" \ + "Keep up the good work, my love~ ❤️" \ + "MOMMYS_ROLE is proud of the progress you've made~ ❤️" \ + "MOMMYS_ROLE is so grateful to have you as MOMMYS_PRONOUN little AFFECTIONATE_TERM~ ❤️" \ + "I'm so proud of you, my love~ ❤️" \ + "MOMMYS_ROLE is so proud of you~ ❤️" \ + "MOMMYS_ROLE loves seeing MOMMYS_PRONOUN little AFFECTIONATE_TERM succeed~ ❤️" \ + "MOMMYS_ROLE thinks MOMMYS_PRONOUN little AFFECTIONATE_TERM earned a big hug~ ❤️" \ + "that's a good AFFECTIONATE_TERM~ ❤️" \ + "you did an amazing job, my dear~ ❤️" \ + "you're such a smart cookie~ ❤️" + + # allow for overriding of default words (IF ANY SET) + + if test -n "$SHELL_MOMMYS_LITTLE" + set DEF_WORDS_LITTLE "$SHELL_MOMMYS_LITTLE" + end + if test -n "$SHELL_MOMMYS_PRONOUNS" + set DEF_WORDS_PRONOUNS "$SHELL_MOMMYS_PRONOUNS" + end + if test -n "$SHELL_MOMMYS_ROLES" + set DEF_WORDS_ROLES "$SHELL_MOMMYS_ROLES" + end + if test -n "$SHELL_MOMMYS_COLOR" + set DEF_MOMMY_COLOR "$SHELL_MOMMYS_COLOR" + end + # allow overriding to true + if test "$SHELL_MOMMYS_ONLY_NEGATIVE" = "true" + set DEF_ONLY_NEGATIVE "true" + end + # if the array is set for positive/negative responses, overwrite it + if test -n "$SHELL_MOMMYS_POSITIVE_RESPONSES" + set POSITIVE_RESPONSES "$SHELL_MOMMYS_POSITIVE_RESPONSES" + end + if test -n "$SHELL_MOMMYS_NEGATIVE_RESPONSES" + set NEGATIVE_RESPONSES "$SHELL_MOMMYS_NEGATIVE_RESPONSES" + end + + # split a string on forward slashes and return a random element + function pick_word + random choice (string split -n / $argv) + end + + function pick_response # given a response type, pick an entry from the array + + if test $argv[1] = "positive" + set element (random choice $POSITIVE_RESPONSES) + else if test $argv[1] = "negative" + set element (random choice $NEGATIVE_RESPONSES) + else + echo "Invalid response type: $argv[1]" + exit 1 + end + + # Return the selected response + echo "$element" + + end + + function sub_terms # given a response, sub in the appropriate terms + set -l response $argv + # pick_word for each term + set -l affectionate_term (pick_word $DEF_WORDS_LITTLE) + set -l pronoun (pick_word $DEF_WORDS_PRONOUNS) + set -l role (pick_word $DEF_WORDS_ROLES) + # sub in the terms, store in variable + set -l response (echo "$response" | string replace "AFFECTIONATE_TERM" "$affectionate_term") + set -l response (echo "$response" | string replace "MOMMYS_PRONOUN" "$pronoun") + set -l response (echo "$response" | string replace "MOMMYS_ROLE" "$role") + # we have string literal newlines in the response, so we need to printf it out + # print faint and colorcode + echo -e "$DEF_MOMMY_COLOR$response$COLORS_RESET" + end + + function success + if test "$DEF_ONLY_NEGATIVE" = "true" + return 0 + end + # pick_response for the response type + set -l response (pick_response "positive") + sub_terms "$response" >&2 + return 0 + end + + function failure + set -l response (pick_response "negative") + sub_terms "$response" >&2 + return $prev_status + end + + if test $prev_status -eq 0 + success + else + failure + end + ''; + }; + + plugins = [ + # { + # name = "done"; + # src = pkgs.fishPlugins.done.src; + # } + # { + # name = "puffer"; + # src = pkgs.fishPlugins.puffer.src; + # } + # { + # name = "autopair"; + # src = pkgs.fishPlugins.autopair.src; + # } + ]; +} diff --git a/home/git.nix b/home/git.nix new file mode 100644 index 0000000..b367e79 --- /dev/null +++ b/home/git.nix @@ -0,0 +1,12 @@ +{ + programs.git = { + enable = true; + userName = "serenity-F"; + userEmail = "serenity-amalgam@protonmail.com"; # CHANGEME + extraConfig = { + init.defaultBranch = "main"; + # Automatically track remote branch + push.autoSetupRemote = true; + }; + }; +} diff --git a/home/home.nix b/home/home.nix index 0f66b39..93ff1f6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,38 +1,38 @@ -# This is the home-manager configuration file -# - (replaces ~/.config/nixpkgs/home.nix) -{ +{ inputs, outputs, lib, config, - pkgs, + pkgs, ... }: { imports = [ - # to use home-manager modules from other flakes(nix-colors): - # inputs.nix-colors.homeManagerModule - - ./hyprland.nix + ./hyprland + ./theme + ./kitty.nix + ./git.nix + # ./qutebrowser ]; + home = { + username = "serenity"; + homeDirectory = "/home/serenity"; - # Packages: - home.packages = with pkgs; [ + packages = with pkgs; [ + vlc + vscode + discord + firefox + obsidian + xfce.thunar + ]; - steam - - ]; - - # Programs: - programs = { - home-manager.enable = true; - + stateVersion = "23.11"; }; - - # Nicely reload system units when changing configs + + programs.home-manager.enable = true; + systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "23.11"; } diff --git a/home/hyprland.nix b/home/hyprland.nix deleted file mode 100644 index cd4390a..0000000 --- a/home/hyprland.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: - - let - startupScript = pkgs.pkgs.writeShellScriptBin "start" '' - ${pkgs.waybar}/bin/waybar & - ${pkgs.swww}/bin/swww init & - ${pkgs.kitty}/bin/kitty & - - sleep 1 - - ${pkgs.swww}/bin/swww img ${../resources/wallpaper.png} & - ''; - in -{ - - wayland.windowManager.hyprland = { - enable = true; - - plugins = [ - # inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus - # inputs.hyprland-plugins.packages."${pkgs.system}".hyprbars - ]; - - settings = { - - exec-once = ''${startupScript}/bin/start''; - - "plugin:borders-plus-plus" = { - add_borders = 1; # 0 - 9 - - # you can add up to 9 borders - "col.border_1" = "rgb(ffffff)"; - "col.border_2" = "rgb(2222ff)"; - - # -1 means "default" as in the one defined in general:border_size - border_size_1 = 10; - border_size_2 = -1; - - # makes outer edges match rounding of the parent. Turn on / off to better understand. Default = on. - natural_rounding = "yes"; - }; - - }; - }; - -} diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix new file mode 100644 index 0000000..a01e81f --- /dev/null +++ b/home/hyprland/default.nix @@ -0,0 +1,43 @@ +{ + self, + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + imports = [ + ./hyprland.nix + ./hyprpaper.nix + ./hyprcursor.nix + ./wlogout.nix + ./hypridle.nix + ./hyprlock.nix + ./waybar.nix + ./dunst.nix + ./wofi.nix + ]; + + home.packages = with pkgs; [ + hyprshot + hyprpicker + # xdg-desktop-portal-hyprland + wlr-randr + wl-clipboard + brightnessctl + gnome.gnome-themes-extra + wlsunset + xwayland + xdg-desktop-portal-gtk + wlroots + qt5ct + libva + dconf + wayland-utils + wayland-protocols + meson + ]; + +} diff --git a/home/hyprland/dunst.nix b/home/hyprland/dunst.nix new file mode 100644 index 0000000..0f9d315 --- /dev/null +++ b/home/hyprland/dunst.nix @@ -0,0 +1,83 @@ +{ config, lib, pkgs, ... }: { + + home.packages = with pkgs; [ libnotify ]; + + services.dunst = { + enable = true; + iconTheme = { + name = "Adwaita-Dark"; + package = pkgs.gnome.adwaita-icon-theme; + }; + settings = { + global = { + rounded = "yes"; + origin = "top-center"; + monitor = "0"; + alignment = "center"; + vertical_alignment = "center"; + width = "400"; + height = "400"; + scale = 0; + gap_size = 0; + progress_bar = true; + transparency = 0; + text_icon_padding = 0; + separator_color = "frame"; + sort = "yes"; + idle_threshold = 120; + line_height = 0; + markup = "full"; + show_age_threshold = 60; + ellipsize = "middle"; + ignore_newline = "no"; + stack_duplicates = true; + sticky_history = "yes"; + history_length = 20; + always_run_script = true; + corner_radius = config.theme.rounding; + follow = "mouse"; + font = config.theme.font; + format = "%s\\n%b"; + progress_bar_corner_radius = config.theme.rounding - 10; + #format = '' + # %s %p + # %b''; + frame_color = "#" + config.theme.colors.bg; + highlight = "#" + config.theme.colors.primary-bg; + foreground = "#" + config.theme.colors.fg; + frame_width = 1; + offset = "0x10"; + horizontal_padding = 10; + icon_position = "left"; + indicate_hidden = "yes"; + min_icon_size = 0; + max_icon_size = 64; + mouse_left_click = "do_action, close_current"; + mouse_middle_click = "close_current"; + mouse_right_click = "close_all"; + padding = 10; + plain_text = "no"; + separator_height = 2; + show_indicators = "yes"; + shrink = "no"; + word_wrap = "yes"; + browser = "${pkgs.qutebrowser}/bin/qutebrowser"; + }; + + fullscreen_delay_everything = { fullscreen = "delay"; }; + + urgency_critical = { + background = "#" + config.theme.colors.color1; + foreground = "#" + config.theme.colors.color0; + }; + urgency_low = { + background = "#" + config.theme.colors.alt-bg; + foreground = "#" + config.theme.colors.alt-fg; + }; + urgency_normal = { + background = "#" + config.theme.colors.alt-bg; + foreground = "#" + config.theme.colors.alt-fg; + }; + }; + }; +} diff --git a/home/hyprland/hyprcursor.nix b/home/hyprland/hyprcursor.nix new file mode 100644 index 0000000..518c519 --- /dev/null +++ b/home/hyprland/hyprcursor.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: { + home.packages = with pkgs; [ hyprcursor ]; + + # home.file.".local/share/icons/rose-pine-hyprcursor" = { + # recursive = true; + # source = ./rose-pine; + # }; + +} diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix new file mode 100644 index 0000000..c970830 --- /dev/null +++ b/home/hyprland/hypridle.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: { + home.packages = with pkgs; [ hypridle ]; + + xdg.configFile."hypr/hypridle.conf".text = '' + general { + ignore_dbus_inhibit = false + } + + # Screenlock + listener { + timeout = 600 + on-timeout = ${pkgs.hyprlock}/bin/hyprlock + on-resume = ${pkgs.libnotify}/bin/notify-send "Welcome back ${config.home.username}!" + } + + # Suspend + listener { + timeout = 660 + on-timeout = systemctl suspend + # on-resume = ${pkgs.libnotify}/bin/notify-send "Welcome back to your desktop!" + } + ''; +} diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix new file mode 100644 index 0000000..e2b8a09 --- /dev/null +++ b/home/hyprland/hyprland.nix @@ -0,0 +1,223 @@ +{ + self, + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + + plugins = [ + # inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus + # inputs.hyprland-plugins.packages."${pkgs.system}".hyprbars + ]; + + + settings = { + "$mod" = "SUPER"; + "$shiftMod" = "SUPER_SHIFT"; + + exec-once = [ + "startup" + "${pkgs.hypridle}/bin/hypridle" + "${pkgs.hyprpaper}/bin/hyprpaper" + "${pkgs.kitty}/bin/kitty" + "${pkgs.wofi}/bin/wofi" + + ]; + + + + bind = [ + "$mod, RETURN, exec, ${pkgs.wofi}/bin/wofi" + "$shiftMod, RETURN, exec, ${pkgs.kitty}/bin/kitty" + "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" + "$mod, B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" + "$mod, C, exec, ${pkgs.kitty}/bin/kitty --class peaclock peaclock" + "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" + "$mod, X, exec, powermenu" + "$mod, SPACE, exec, menu" + # Windows control + "$mod, Q, killactive," + "$mod, T, togglefloating," + "$mod, F, fullscreen" + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + # Screenshots + "$mod, PRINT, exec, screenshot window" + ", PRINT, exec, screenshot monitor" + "$shiftMod, PRINT, exec, screenshot region" + "ALT, PRINT, exec, screenshot region swappy" + # Night Shift + "$mod, F2, exec, night-shift-off" + "$mod, F3, exec, night-shift-on" + # Sound output + "$mod, F5, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" + "$mod, F6, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" + "$mod, F7, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" + ] ++ (builtins.concatLists (builtins.genList (i: + let ws = i + 1; + in [ + "$mod, code:1${toString i}, workspace, ${toString ws}" + "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" + ]) 9)); + + bindm = [ "$mod, mouse:272, movewindow" "$mod, R, resizewindow" ]; + + bindl = [ + ",XF86AudioMute, exec, sound-toggle" + ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" + ]; + + bindle = [ + ", XF86AudioRaiseVolume, exec, sound-up" + ", XF86AudioLowerVolume, exec, sound-down" + ", XF86MonBrightnessUp, exec, brightness-up" + ", XF86MonBrightnessDown, exec, brightness-down" + ]; + + env = [ + "XDG_SESSION_TYPE,wayland" + "XDG_CURRENT_DESKTOP,Hyprland" + "XDG_SESSION_TYPE,wayland" + "XDG_SESSION_DESKTOP,Hyprland" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "QT_QPA_PLATFORM=wayland,xcb" + "QT_QPA_PLATFORMTHEME=qt6ct" + "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + "GTK_THEME,Flat-Remix-GTK-White-Darkest-Solid:dark" + # "HYPRCURSOR_THEME,rose-pine" + # "HYPRCURSOR_SIZE,16" + ]; + + general = { + resize_on_border = true; + gaps_in = config.theme.gaps-in; + gaps_out = config.theme.gaps-out; + border_size = config.theme.border-size; + "col.active_border" = "rgba(${config.theme.colors.primary-bg}ff)"; + "col.inactive_border" = "rgba(00000055)"; + border_part_of_window = true; + layout = "master"; + }; + + decoration = { + rounding = config.theme.rounding; + drop_shadow = true; + shadow_range = 25; + shadow_render_power = 3; + "col.shadow" = "rgba(00000055)"; + blur = { enabled = true; }; + }; + + master = { + new_is_master = true; + new_on_top = true; + }; + + gestures = { workspace_swipe = true; }; + + misc = { + disable_hyprland_logo = false; + disable_splash_rendering = true; + focus_on_activate = true; + new_window_takes_over_fullscreen = 2; + }; + + input = { + kb_layout = "us"; + + kb_options = "caps:escape"; + follow_mouse = 1; + sensitivity = 0.1; + repeat_delay = 350; + repeat_rate = 40; + numlock_by_default = true; + + touchpad = { + # sensitivity = 0; + natural_scroll = true; + clickfinger_behavior = true; + }; + }; + + windowrulev2 = [ + "float, class:peaclock" + "move 2% 78%, class:peaclock" + "size 30% 20%, class:peaclock" + + "float, class:floating" + "size 40% 40%, class:floating" + "move 30% 30%, class:floating" + + "float, title:Bluetooth Devices" + "move 20% 20%, title:Bluetooth Devices" + "size 60% 60%, title:Bluetooth Devices" + ]; + + animations = { + enabled = true; + bezier = [ + "linear, 0, 0, 1, 1" + "md3_standard, 0.2, 0, 0, 1" + "md3_decel, 0.05, 0.7, 0.1, 1" + "md3_accel, 0.3, 0, 0.8, 0.15" + "overshot, 0.05, 0.9, 0.1, 1.1" + "crazyshot, 0.1, 1.5, 0.76, 0.92 " + "hyprnostretch, 0.05, 0.9, 0.1, 1.0" + "fluent_decel, 0.1, 1, 0, 1" + "easeInOutCirc, 0.85, 0, 0.15, 1" + "easeOutCirc, 0, 0.55, 0.45, 1" + "easeOutExpo, 0.16, 1, 0.3, 1" + ]; + + animation = [ + "windows, 1, 3, md3_decel, popin 60%" + "border, 1, 10, default" + "fade, 1, 2.5, md3_decel" + "workspaces, 1, 3.5, easeOutExpo, slide" + "specialWorkspace, 1, 3, md3_decel, slidevert" + ]; + }; + + }; + }; + + qt = { + enable = true; + platformTheme = "gtk"; + style.name = "gtk2"; + }; + + gtk = { + enable = true; + theme = { + package = pkgs.flat-remix-gtk; + name = "Flat-Remix-GTK-White-Darkest-Solid"; + }; + + iconTheme = { + package = pkgs.flat-remix-icon-theme; + name = "Flat-Remix-Grey-Darkest"; + }; + + font = { + name = config.theme.font; + size = 10; + }; + }; + + home.pointerCursor = { + gtk.enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 12; + }; +} diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix new file mode 100644 index 0000000..908a884 --- /dev/null +++ b/home/hyprland/hyprlock.nix @@ -0,0 +1,75 @@ +{ pkgs, config, ... }: { + + home.packages = with pkgs; [ hyprlock ]; + + xdg.configFile."hypr/hyprlock.conf".text = '' + background { + monitor = + path = $HOME/.config/wallpapers/${config.theme.wallpaper} + color = rgb(${config.theme.colors.bg}) + + blur_size = 4 + blur_passes = 3 + noise = 0.0117 + contrast = 1.3000 + brightness = 0.8000 + vibrancy = 0.2100 + vibrancy_darkness = 0.0 + } + + input-field { + monitor = + size = 250, 50 + outline_thickness = 3 + dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = rgb(${config.theme.colors.primary-bg}) + inner_color = rgb(${config.theme.colors.bg}) + font_color = rgb(${config.theme.colors.fg}) + fade_on_empty = true + placeholder_text = Password... # Text rendered in the input box when it's empty. + hide_input = false + position = 0, 50 + halign = center + valign = bottom + } + + # Current time + label { + monitor = + text = cmd[update:1000] echo " $(date +"%H:%M:%S") " + color = rgb(${config.theme.colors.fg}) + font_size = 64 + font_family = ${config.theme.font} + position = 0, 16 + halign = center + valign = center + } + + # User label + label { + monitor = + text = Hey $USER + color = rgb(${config.theme.colors.fg}) + font_size = 20 + font_family = ${config.theme.font} + position = 0, 0 + halign = center + valign = center + } + + + # Type to unlock + label { + monitor = + text = Enter passowrd: + color = rgb(${config.theme.colors.fg}) + font_size = 16 + font_family = ${config.theme.font} + position = 0, 30 + halign = center + valign = bottom + } + ''; +} diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix new file mode 100644 index 0000000..d25c538 --- /dev/null +++ b/home/hyprland/hyprpaper.nix @@ -0,0 +1,10 @@ +{ pkgs, config, ... }: { + home.packages = with pkgs; [ hyprpaper ]; + + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = ~/.config/wallpapers/${config.theme.wallpaper} + wallpaper = ,~/.config/wallpapers/${config.theme.wallpaper} + ipc=true + splash=false + ''; +} diff --git a/home/hyprland/waybar.nix b/home/hyprland/waybar.nix new file mode 100644 index 0000000..51c3f07 --- /dev/null +++ b/home/hyprland/waybar.nix @@ -0,0 +1,259 @@ +{ pkgs, config, lib, waybar, ... }: { + services = { + blueman-applet.enable = true; + network-manager-applet.enable = true; + }; + + programs.waybar = { + enable = true; + # package = waybar.packages."${pkgs.system}".waybar; + systemd.enable = true; + settings = { + mainBar = { + layer = "top"; + position = "top"; + spacing = 0; + "margin-top" = config.theme.gaps-out; + "margin-left" = config.theme.gaps-out; + "margin-right" = config.theme.gaps-out; + height = 44; + modules-left = [ "custom/logo" "hyprland/window" ]; + modules-center = [ "hyprland/workspaces" ]; + modules-right = + [ "tray" "backlight" "pulseaudio" "battery" "clock" "custom/power" ]; + + "wlr/taskbar" = { + format = "{icon}"; + "on-click" = "activate"; + "on-click-right" = "fullscreen"; + + "icon-size" = 25; + "tooltip-format" = "{title}"; + }; + "hyprland/window" = { + "format" = "{title:30}"; + "max-length" = 32; + }; + + "hyprland/workspaces" = { + "on-click" = "activate"; + format = "{icon}"; + "format-icons" = { + "default" = ""; + "1" = "1"; + "2" = "2"; + "3" = "3"; + "4" = "4"; + "5" = "5"; + "6" = "6"; + "7" = "7"; + "8" = "8"; + "9" = "9"; + "active" = "󱓻"; + "urgent" = "󱓻"; + }; + "persistent-workspaces" = { + "1" = [ ]; + "2" = [ ]; + "3" = [ ]; + "4" = [ ]; + "5" = [ ]; + }; + }; + + tray = { spacing = 16; }; + + clock = { + "tooltip-format" = "{calendar}"; + "format-alt" = " {:%a, %d %b %Y}"; + format = "󰥔 {:%I:%M %p}"; + }; + + pulseaudio = { + format = "{icon}"; + "format-bluetooth" = "󰂰"; + nospacing = 1; + "tooltip-format" = "Volume : {volume}%"; + "format-muted" = "󰝟"; + "format-icons" = { + "headphone" = ""; + "default" = [ "󰖀" "󰕾" "" ]; + }; + "on-click" = "pamixer -t"; + "scroll-step" = 1; + }; + + "custom/logo" = { + format = "  "; + tooltip = false; + on-click = "menu"; + }; + + battery = { + format = "{capacity}% {icon}"; + "format-icons" = { + "charging" = [ "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅" ]; + "default" = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; + }; + "format-full" = "󰁹 "; + interval = 10; + states = { + warning = 20; + critical = 10; + }; + tooltip = false; + }; + + "custom/power" = { + format = "󰤆"; + tooltip = false; + on-click = "powermenu"; + }; + + backlight = { + device = "nvidia_0"; + format = "{icon}"; + "format-icons" = [ " " " " "" "" "" "" "" "" "" ]; + }; + }; + }; + style = '' + * { + border: none; + border-radius: 0; + min-height: 0; + font-family: "${config.theme.font}"; + color: #${config.theme.colors.fg}; + font-weight: 700; + } + + window#waybar { + background-color: ${ + if config.theme.waybar-transparent then + "rgba(0, 0, 0, 0)" + else + "#${config.theme.colors.bg}" + }; + transition-property: background-color; + transition-duration: 0.5s; + border-radius: ${toString config.theme.rounding}px; + font-size: 13px; + } + + .modules-left, .modules-center, .modules-right { + border-radius: ${toString config.theme.rounding}px; + background-color: #${config.theme.colors.bg}; + padding: 2px 6px; + } + + window#waybar.hidden { + opacity: 0.5; + } + + #workspaces { + background-color: transparent; + } + + #workspaces button { + all: initial; /* Remove GTK theme values (waybar #1351) */ + min-width: 0; /* Fix weird spacing in materia (waybar #450) */ + box-shadow: inset 0 -3px transparent; /* Use box-shadow instead of border so the text isn't offset */ + padding: 6px 18px; + margin: 6px 3px; + border-radius: 4px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + #workspaces button.active { + color: #${config.theme.colors.primary-fg}; + background-color: #${config.theme.colors.primary-bg}; + } + + #workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; + opacity: 0.8; + } + + #workspaces button.urgent { + background-color: #${config.theme.colors.color1}; + } + + #window > * { + font-family: "${config.theme.font-mono}"; + } + + #memory, + #custom-power, + #battery, + #backlight, + #pulseaudio, + #network, + #clock, + #tray, + #backlight{ + border-radius: 9px; + margin: 6px 3px; + padding: 6px 12px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + #tray menu { + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + #custom-logo { + padding-right: 7px; + font-size: 15px; + color: #${config.theme.colors.primary-bg}; + } + + @keyframes blink { + to { + background-color: #f38ba8; + color: #181825; + } + } + + #battery.warning, + #battery.critical, + #battery.urgent { + background-color: #ff0048; + color: #181825; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; + } + + #battery.charging { + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + animation: none; + } + + #custom-power { + background-color: #${config.theme.colors.primary-bg}; + color: #${config.theme.colors.primary-fg}; + } + + + tooltip { + border-radius: 8px; + padding: 15px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + tooltip label { + padding: 5px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + ''; + }; +} diff --git a/home/hyprland/wlogout.nix b/home/hyprland/wlogout.nix new file mode 100644 index 0000000..e0eac1a --- /dev/null +++ b/home/hyprland/wlogout.nix @@ -0,0 +1,117 @@ +{ config, pkgs, ... }: { + + programs.wlogout = { + enable = true; + layout = [ + { + label = "lock"; + action = "${pkgs.hyprlock}/bin/hyprlock"; + text = "Lock"; + keybind = "l"; + } + { + label = "hibernate"; + action = "systemctl hibernate"; + text = "Hibernate"; + keybind = "h"; + } + { + label = "logout"; + action = "killall -9 Hyprland sleep 2"; + text = "Exit"; + keybind = "e"; + } + { + label = "shutdown"; + action = "systemctl poweroff"; + text = "Shutdown"; + keybind = "s"; + } + { + label = "suspend"; + action = "systemctl suspend"; + text = "Suspend"; + keybind = "u"; + } + { + label = "reboot"; + action = "systemctl reboot"; + text = "Reboot"; + keybind = "r"; + } + ]; + + style = '' + * { + font-family: "${config.theme.font}"; + background-image: none; + transition: 20ms; + } + + window { + background-color: rgba(12,12,12,0.5); + } + + button { + color: #${config.theme.colors.fg}; + font-size:20px; + + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + + border-style: solid; + background-color: #${config.theme.colors.bg}; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + } + + button:focus, + button:active { + color: #${config.theme.colors.primary-fg}; + background-color: #${config.theme.colors.primary-bg}; + border: 3px solid #${config.theme.colors.primary-bg}; + } + + /* + ----------------------------------------------------- + Buttons + ----------------------------------------------------- + */ + + #lock,#logout,#suspend,#hibernate,#shutdown,#reboot { + margin: 10px; + border-radius: ${toString config.theme.rounding}px; + } + + #lock { + background-image: image(url("../theme/resources/icons/lock.png")); + } + + #logout { + background-image: image(url("../theme/resources/icons/logout.png")); + } + + #suspend { + background-image: image(url("../theme/resources/icons/suspend.png")); + } + + #hibernate { + background-image: image(url("../theme/resources/icons/hibernate.png")); + } + + #shutdown { + background-image: image(url("../theme/resources/icons/shutdown.png")); + } + + #reboot { + background-image: image(url("../theme/resources/icons/reboot.png")); + } + ''; + }; + + xdg.configFile."resources/icons" = { + recursive = true; + source = ../theme/resources/icons; + }; + +} diff --git a/home/hyprland/wofi.nix b/home/hyprland/wofi.nix new file mode 100644 index 0000000..b07dc03 --- /dev/null +++ b/home/hyprland/wofi.nix @@ -0,0 +1,96 @@ +{ config, ... }: { + + programs.wofi = { + enable = true; + + settings = { + allow_markup = true; + width = 500; + show = "drun"; + prompt = "Apps"; + normal_window = true; + layer = "top"; + term = "foot"; + height = "305px"; + orientation = "horizontal"; + halign = "fill"; + line_wrap = "off"; + dynamic_lines = false; + allow_images = true; + image_size = 24; + exec_search = false; + hide_search = false; + parse_search = false; + insensitive = true; + hide_scroll = true; + no_actions = true; + sort_order = "default"; + gtk_dark = true; + filter_rate = 100; + key_expand = "Tab"; + key_exit = "Escape"; + }; + + style = '' + /** ********** Fonts ********** **/ + + * { + font-family: "${config.theme.font}"; + font-weight: 500; + font-size: 12px; + } + + #window { + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + border-radius: ${toString config.theme.rounding}px; + } + + #outer-box { + padding: 20px; + } + + #input { + background-color: #${config.theme.colors.bg}; + border: 0px solid #${config.theme.colors.primary-bg}; + padding: 8px 12px; + } + + #scroll { + margin-top: 20px; + } + + #inner-box {} + + #img { + padding-right: 8px; + } + + #text { + color: #${config.theme.colors.color7}; + } + + #text:selected { + color: #${config.theme.colors.fg}; + } + + #entry { + padding: 6px; + } + + #entry:selected { + background-color: #${config.theme.colors.primary-bg}; + color: #${config.theme.colors.primary-fg}; + } + + #unselected {} + + #selected {} + + #input, + #entry:selected { + border-radius: ${toString (config.theme.rounding - 10)}px; + } + ''; + }; +} diff --git a/home/kitty.nix b/home/kitty.nix new file mode 100644 index 0000000..0e9715b --- /dev/null +++ b/home/kitty.nix @@ -0,0 +1,56 @@ +{ config, pkgs, ... }: { + + programs.kitty = { + enable = true; + + font = { + name = "spleen 32x64"; + size = 12; + }; + + settings = { + + scrollback_lines = 10000; + enable_audio_bell = false; + update_check_interval = 0; + # font_family = "spleen"; + # font_size = 12; + cursor_shape = "Underline"; + cursor_underline_thickness = 1; + window_padding_width = 5; + url_style = "curly"; + confirm_os_window_close = "0"; + remember_window_size = "no"; + disable_ligatures = "never"; + shell = "${pkgs.fish}/bin/fish"; + initial_window_width = 1200; + initial_window_height = 600; + + background = "#" + config.theme.colors.bg; + url_color = "#" + config.theme.colors.primary-fg; + + color0 = "#" + config.theme.colors.color0; + color8 = "#" + config.theme.colors.color8; + color1 = "#" + config.theme.colors.color1; + color9 = "#" + config.theme.colors.color9; + color2 = "#" + config.theme.colors.color2; + color10 = "#" + config.theme.colors.color10; + color3 = "#" + config.theme.colors.color3; + color11 = "#" + config.theme.colors.color11; + color4 = "#" + config.theme.colors.color4; + color12 = "#" + config.theme.colors.color12; + color5 = "#" + config.theme.colors.color5; + color13 = "#" + config.theme.colors.color13; + color6 = "#" + config.theme.colors.color6; + color14 = "#" + config.theme.colors.color14; + color7 = "#" + config.theme.colors.color7; + color15 = "#" + config.theme.colors.color15; + + cursor = "#" + config.theme.colors.fg; + cursor_text_color = "#" + config.theme.colors.bg; + + selection_foreground = "#" + config.theme.colors.primary-fg; + selection_background = "#" + config.theme.colors.primary-bg; + }; + }; +} diff --git a/home/theme/SerenityOS.nix b/home/theme/SerenityOS.nix new file mode 100644 index 0000000..4c9ab0b --- /dev/null +++ b/home/theme/SerenityOS.nix @@ -0,0 +1,43 @@ +{ + imports = [ ./config/template.nix ]; + + theme = { + wallpaper = "./resources/wallpapers/wallpaper.png"; + waybar-transparent = true; + font-mono = "spleen 32x64"; + font = "spleen 32x64"; + rounding = 10; + gaps-in = 10; + gaps-out = 10; + border-size = 1; + + colors = { + bg = "000000"; + fg = "FCFCFC"; + alt-bg = "101012"; + alt-fg = "ECECEC"; + primary-ansi-16 = "cyan"; + primary-bg = "00cdff"; + primary-fg = "000000"; + secondary-bg = "2849B8"; + secondary-fg = "000000"; + color0 = "000000"; + color1 = "f7768e"; + color2 = "73daca"; + color3 = "e0af68"; + color4 = "7aa2f7"; + color5 = "9978F8"; + color6 = "7dcfff"; + color7 = "E4E5E7"; + color8 = "515878"; + color9 = "f7869e"; + color10 = "83eada"; + color11 = "f0bf78"; + color12 = "8ab2f7"; + color13 = "A988F8"; + color14 = "8ddfff"; + color15 = "f4f5f7"; + }; + }; + +} diff --git a/home/theme/config/template.nix b/home/theme/config/template.nix new file mode 100644 index 0000000..64a40c3 --- /dev/null +++ b/home/theme/config/template.nix @@ -0,0 +1,95 @@ +{ lib, ... }: + +with lib; + +{ + options.theme = { + + waybar-transparent = mkOption { + type = types.bool; + description = "Does waybar have a transparent background?"; + }; + + wallpaper = mkOption { + type = types.str; + description = "Name of the wallpaper (from the wallpapers directory)"; + }; + + font = mkOption { + type = types.str; + description = "Default font"; + }; + + font-mono = mkOption { + type = types.str; + description = "Default mono font"; + }; + + rounding = mkOption { + type = types.int; + description = "Borders rounding"; + }; + + gaps-in = mkOption { + type = types.int; + description = "Gaps in"; + }; + + gaps-out = mkOption { + type = types.int; + description = "Gaps out"; + }; + + border-size = mkOption { + type = types.int; + description = "Border size"; + }; + + colors = let + mkColorOption = name: { + inherit name; + value = mkOption { + type = types.strMatching "[a-fA-F0-9]{6}"; + description = "Color ${name}."; + }; + }; + in listToAttrs (map mkColorOption [ + "bg" + "fg" + "alt-bg" + "alt-fg" + "primary-bg" + "primary-fg" + "secondary-bg" + "secondary-fg" + "color0" + "color1" + "color2" + "color3" + "color4" + "color5" + "color6" + "color7" + "color8" + "color9" + "color10" + "color11" + "color12" + "color13" + "color14" + "color15" + ]) // { + primary-ansi-16 = mkOption { + type = types.str; + description = + "Name of the primary color - ansi 16 colors (black, red, green, yellow, blue, magenta, cyan, white, bright-black, bright-red, bright-green, bright-yellow, bright-blue, bright-magenta, bright-cyan, bright-white)"; + }; + + primary-ansi-16-number = mkOption { + type = types.int; + description = "Set the primary color - ansi 16 colors (0-15)"; + }; + + }; + }; +} diff --git a/home/theme/default.nix b/home/theme/default.nix new file mode 100644 index 0000000..e7d0821 --- /dev/null +++ b/home/theme/default.nix @@ -0,0 +1,42 @@ +{ config, ... }: { + imports = [ + ./SerenityOS.nix + # ./resources + ]; + config.theme.colors.primary-ansi-16-number = + if config.theme.colors.primary-ansi-16 == "black" then + 0 + else if config.theme.colors.primary-ansi-16 == "red" then + 1 + else if config.theme.colors.primary-ansi-16 == "green" then + 2 + else if config.theme.colors.primary-ansi-16 == "yellow" then + 3 + else if config.theme.colors.primary-ansi-16 == "blue" then + 4 + else if config.theme.colors.primary-ansi-16 == "magenta" then + 5 + else if config.theme.colors.primary-ansi-16 == "cyan" then + 6 + else if config.theme.colors.primary-ansi-16 == "white" then + 7 + else if config.theme.colors.primary-ansi-16 == "bright-white" then + 8 + else if config.theme.colors.primary-ansi-16 == "bright-black" then + 9 + else if config.theme.colors.primary-ansi-16 == "bright-red" then + 10 + else if config.theme.colors.primary-ansi-16 == "bright-green" then + 11 + else if config.theme.colors.primary-ansi-16 == "bright-yellow" then + 12 + else if config.theme.colors.primary-ansi-16 == "bright-blue" then + 13 + else if config.theme.colors.primary-ansi-16 == "bright-magenta" then + 14 + else if config.theme.colors.primary-ansi-16 == "bright-cyan" then + 15 + else + 0; + +} diff --git a/home/theme/resources/icons/hibernate.png b/home/theme/resources/icons/hibernate.png new file mode 100644 index 0000000..bf2b001 Binary files /dev/null and b/home/theme/resources/icons/hibernate.png differ diff --git a/home/theme/resources/icons/lock.png b/home/theme/resources/icons/lock.png new file mode 100644 index 0000000..da59b10 Binary files /dev/null and b/home/theme/resources/icons/lock.png differ diff --git a/home/theme/resources/icons/logout.png b/home/theme/resources/icons/logout.png new file mode 100644 index 0000000..8a25922 Binary files /dev/null and b/home/theme/resources/icons/logout.png differ diff --git a/home/theme/resources/icons/reboot.png b/home/theme/resources/icons/reboot.png new file mode 100644 index 0000000..e5fd221 Binary files /dev/null and b/home/theme/resources/icons/reboot.png differ diff --git a/home/theme/resources/icons/shutdown.png b/home/theme/resources/icons/shutdown.png new file mode 100644 index 0000000..663ca03 Binary files /dev/null and b/home/theme/resources/icons/shutdown.png differ diff --git a/home/theme/resources/icons/suspend.png b/home/theme/resources/icons/suspend.png new file mode 100644 index 0000000..af099b9 Binary files /dev/null and b/home/theme/resources/icons/suspend.png differ diff --git a/resources/wallpaper.png b/home/theme/resources/wallpapers/wallpaper.png similarity index 100% rename from resources/wallpaper.png rename to home/theme/resources/wallpapers/wallpaper.png