From 35806b21a265ba3120ae3bae8d0f5bd26e12bce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Tue, 17 Mar 2026 10:50:17 +0100 Subject: [PATCH] catppuccin theme start set basic catppuccin/nix --- configuration.nix | 4 +- flake.lock | 45 +++++- flake.nix | 16 +- home/default.nix | 6 +- home/programs/alacritty.nix | 28 ++-- home/programs/default-desktop.nix | 1 - home/programs/default-laptop.nix | 6 +- home/programs/default.nix | 4 +- home/programs/dunst.nix | 84 +++++----- home/programs/eww/src/bar.yuck | 4 +- home/programs/git.nix | 53 ++----- home/programs/hyprlock.nix | 150 +----------------- .../{swww => hyprpaper}/background_temp.jpeg | Bin home/programs/{swww => hyprpaper}/default.nix | 0 home/programs/imv.nix | 5 + home/programs/nixvim/default.nix | 86 +++++----- home/programs/rofi/default.nix | 2 - home/programs/rofi/theme.rafi | 111 ------------- home/programs/zathura-desktop.nix | 21 --- home/programs/zathura-laptop.nix | 21 --- home/programs/zathura.nix | 21 +++ home/themes/catppuccin.nix | 28 ++++ home/themes/default.nix | 5 + machines/configuration-laptop.nix | 2 +- 24 files changed, 247 insertions(+), 456 deletions(-) rename home/programs/{swww => hyprpaper}/background_temp.jpeg (100%) rename home/programs/{swww => hyprpaper}/default.nix (100%) create mode 100644 home/programs/imv.nix delete mode 100644 home/programs/rofi/theme.rafi delete mode 100644 home/programs/zathura-desktop.nix delete mode 100644 home/programs/zathura-laptop.nix create mode 100644 home/programs/zathura.nix create mode 100644 home/themes/catppuccin.nix create mode 100644 home/themes/default.nix diff --git a/configuration.nix b/configuration.nix index a8fccaf..dcbbd55 100644 --- a/configuration.nix +++ b/configuration.nix @@ -52,7 +52,7 @@ displayManager = { sddm = { enable = true; - theme = "catppuccin-mocha-mauve"; + theme = "catppuccin-mocha-pink"; wayland.enable = true; }; #autoLogin = { @@ -93,7 +93,7 @@ environment.systemPackages = with pkgs; [ (catppuccin-sddm.override { flavor = "mocha"; - accent = "mauve"; + accent = "pink"; font = "Fira Code"; fontSize = "9"; # background = "${./wallpaper.png}"; diff --git a/flake.lock b/flake.lock index 6ff5bfb..8b8cd62 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1773403535, + "narHash": "sha256-47MZaFrHxNO8tVUAmtVnerXUw2WWVluBOiU9MulN/yM=", + "owner": "catppuccin", + "repo": "nix", + "rev": "d45b5665cc638bad1b794350de02f4dd41b0bb47", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -87,7 +105,7 @@ "inputs": { "flake-parts": "flake-parts", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1773360308, @@ -140,6 +158,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1773122722, + "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1773201692, "narHash": "sha256-NXrKzNMniu4Oam2kAFvqJ3GB2kAvlAFIriTAheaY8hw=", @@ -155,7 +189,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1773282481, "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", @@ -171,7 +205,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1773282481, "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", @@ -212,7 +246,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1773383285, @@ -230,10 +264,11 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur" } diff --git a/flake.nix b/flake.nix index 093b7e0..d5dede9 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Nix expressions for VSCode and OpenVSX extensions nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,6 +25,8 @@ neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + catppuccin.url = "github:catppuccin/nix"; + # impermanence.url = "github:nix-community/impermanence"; }; @@ -35,6 +36,7 @@ home-manager, nur, nixvim, + catppuccin, # impermanence, ... }@inputs: @@ -47,13 +49,17 @@ ./machines/configuration-laptop.nix ./home/services/pipewire.nix nur.modules.nixos.default + catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager # impermanence.nixosModules.impermanence { home-manager = { useUserPackages = true; extraSpecialArgs = { inherit inputs; }; - users.elias = import ./home/default-laptop.nix; + users.elias.imports = [ + ./home/default-laptop.nix + catppuccin.homeModules.catppuccin + ]; }; nixpkgs.overlays = [ # (import ./overlays/river-status.nix) @@ -69,13 +75,17 @@ ./machines/configuration-desktop.nix ./home/services/pipewire.nix nur.modules.nixos.default + catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager # impermanence.nixosModules.impermanence { home-manager = { useUserPackages = true; extraSpecialArgs = { inherit inputs; }; - users.elias = import ./home/default-desktop.nix; + users.elias.imports = [ + ./home/default-desktop.nix + catppuccin.homeModules.catppuccin + ]; }; nixpkgs.overlays = [ inputs.nur.overlays.default diff --git a/home/default.nix b/home/default.nix index 6644e98..dba8bca 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,6 +3,7 @@ { imports = [ ./services + ./themes ]; # home.persistence."/persistent" = { @@ -53,10 +54,9 @@ programs.home-manager.enable = true; + # ── whatsie insecure ────────────────────────────────────────────────── nixpkgs.config = { allowUnfree = true; - permittedInsecurePackages = [ "qtwebengine-5.15.19" ]; + permittedInsecurePackages = [ "electron-32.3.3" "qtwebengine-5.15.19" ]; }; - - # ── whatsie insecure ────────────────────────────────────────────────── } diff --git a/home/programs/alacritty.nix b/home/programs/alacritty.nix index bee155d..53fa183 100644 --- a/home/programs/alacritty.nix +++ b/home/programs/alacritty.nix @@ -1,21 +1,25 @@ { pkgs, ... }: -let - theme = builtins.fetchurl { - url = - "https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml"; - sha256 = "1idjbm5jim9b36235hgwgp9ab81fmbij42y7h85l4l7cqcbyz74l"; - }; -in { - home.packages = with pkgs; [ fira-code alacritty-theme ]; +# let +# theme = builtins.fetchurl { +# url = +# "https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml"; +# sha256 = "1idjbm5jim9b36235hgwgp9ab81fmbij42y7h85l4l7cqcbyz74l"; +# }; +# in { +{ + home.packages = with pkgs; [ + fira-code + alacritty-theme + ]; programs.alacritty = { enable = true; settings = { - env = { - "TERM" = "xterm-256color"; - import = "${theme}"; - }; + # env = { + # "TERM" = "xterm-256color"; + # import = "${theme}"; + # }; font = { size = 7; normal.family = "Fira Code"; diff --git a/home/programs/default-desktop.nix b/home/programs/default-desktop.nix index 6da2730..ff36954 100644 --- a/home/programs/default-desktop.nix +++ b/home/programs/default-desktop.nix @@ -1,6 +1,5 @@ { imports = [ ./default.nix - ./zathura-desktop.nix ]; } diff --git a/home/programs/default-laptop.nix b/home/programs/default-laptop.nix index 34ad88b..ff36954 100644 --- a/home/programs/default-laptop.nix +++ b/home/programs/default-laptop.nix @@ -1 +1,5 @@ -{ imports = [ ./default.nix ./zathura-laptop.nix ]; } +{ + imports = [ + ./default.nix + ]; +} diff --git a/home/programs/default.nix b/home/programs/default.nix index c4ecb07..3f02395 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -10,6 +10,8 @@ ./eww ./git.nix ./hyprlock.nix + ./hyprpaper + ./imv.nix ./inkscape.nix ./libreoffice.nix ./messenger.nix @@ -22,11 +24,11 @@ ./rofi ./skanlite.nix ./spotify.nix - ./swww ./taskwarrior ./thunderbird.nix ./vlc.nix ./vscode.nix + ./zathura.nix ./zoom.nix ./zsh.nix ]; diff --git a/home/programs/dunst.nix b/home/programs/dunst.nix index 7e83aef..f13545c 100644 --- a/home/programs/dunst.nix +++ b/home/programs/dunst.nix @@ -3,47 +3,47 @@ { services.dunst = { enable = true; - settings = { - global = { - # Your exact styling - unchanged - monitor = 1; - origin = "top-right"; - offset = "15x25"; - width = 300; - height = 100; - gap_size = 5; - notification_limit = 5; - # font removed as requested - frame_width = 1; - separator_color = "frame"; - corner_radius = 12; - corners = "top-left,bottom"; - progress_bar_corner_radius = 8; - progress_bar_corners = "top-left,bottom-right"; - timeout = 5; - idle_threshold = 120; - max_icon_size = 64; - enable_recursive_icon_lookup = true; - show_indicators = true; - sticky_history = true; - history_length = 20; - mouse_left_click = "close_current"; - mouse_right_click = "close_all"; - mouse_middle_click = "context_all"; - format = "%a\\n%s\\n%b"; - }; - - urgency_low = { - timeout = 3; - }; - - urgency_normal = { - timeout = 5; - }; - - urgency_critical = { - timeout = 0; - }; - }; + # settings = { + # global = { + # # Your exact styling - unchanged + # monitor = 1; + # origin = "top-right"; + # offset = "15x25"; + # width = 300; + # height = 100; + # gap_size = 5; + # notification_limit = 5; + # # font removed as requested + # frame_width = 1; + # separator_color = "frame"; + # corner_radius = 12; + # corners = "top-left,bottom"; + # progress_bar_corner_radius = 8; + # progress_bar_corners = "top-left,bottom-right"; + # timeout = 5; + # idle_threshold = 120; + # max_icon_size = 64; + # enable_recursive_icon_lookup = true; + # show_indicators = true; + # sticky_history = true; + # history_length = 20; + # mouse_left_click = "close_current"; + # mouse_right_click = "close_all"; + # mouse_middle_click = "context_all"; + # format = "%a\\n%s\\n%b"; + # }; + # + # urgency_low = { + # timeout = 3; + # }; + # + # urgency_normal = { + # timeout = 5; + # }; + # + # urgency_critical = { + # timeout = 0; + # }; + # }; }; } diff --git a/home/programs/eww/src/bar.yuck b/home/programs/eww/src/bar.yuck index c05a4b9..254b0e4 100644 --- a/home/programs/eww/src/bar.yuck +++ b/home/programs/eww/src/bar.yuck @@ -59,7 +59,9 @@ (button :class "${idle_inhibitor == 'start' ? 'idleOn' : 'idleOff' }" :onclick "systemctl --user is-active hypridle.service && systemctl --user stop hypridle.service || systemctl --user start hypridle.service" - (label :text "${idle_inhibitor == 'start' ? '󰈈' : '󰛐' }")))) + (label + :class "${idle_inhibitor == 'start' ? 'speakerOn' : 'speakerOff'}" + :text "${idle_inhibitor == 'start' ? '󰈈' : '󰛐' }")))) ;; ── Audio ─────────────────────────────────────────────────────────── diff --git a/home/programs/git.nix b/home/programs/git.nix index 990cd8f..cb56a51 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -6,47 +6,26 @@ cz-cli tig ]; - programs.git = { - enable = true; - settings = { - init = { - defaultBranch = "main"; - }; - user = { - email = "elias.schroeter@e.email"; - name = "Elias Schröter"; - }; - }; - signing = { - key = "04F3A2ED4B33F254"; - format = lib.mkForce "openpgp"; - signByDefault = true; - }; - }; - programs.lazygit = { - enable = true; - # https://github.com/catppuccin/lazygit - settings = { - gui = { - theme = { - activeBorderColor = [ - "#f4dbd6" - "bold" - ]; - inactiveBorderColor = [ "#a5adcb" ]; - optionsTextColor = [ "#8aadf4" ]; - selectedLineBgColor = [ "#363a4f" ]; - cherryPickedCommitBgColor = [ "#494d64" ]; - cherryPickedCommitFgColor = [ "#f4dbd6" ]; - unstagedChangesColor = [ "#ed8796" ]; - defaultFgColor = [ "#cad3f5" ]; - searchingActiveBorderColor = [ "#eed49f" ]; + programs = { + git = { + enable = true; + settings = { + init = { + defaultBranch = "main"; }; - authorColors = { - "*" = "#b7bdf8"; + user = { + email = "elias.schroeter@e.email"; + name = "Elias Schröter"; }; }; + signing = { + key = "04F3A2ED4B33F254"; + format = lib.mkForce "openpgp"; + signByDefault = true; + }; }; + + lazygit.enable = true; }; } diff --git a/home/programs/hyprlock.nix b/home/programs/hyprlock.nix index ad4dd3e..282297b 100644 --- a/home/programs/hyprlock.nix +++ b/home/programs/hyprlock.nix @@ -1,153 +1,5 @@ { ... }: { - programs.hyprlock = { - enable = true; - settings = { - # ── colors ──────────────────────────────────────────────────────────── - mocha-base = "rgb(1e1e2e)"; - mocha-mantle = "rgb(181825)"; - mocha-crust = "rgb(11111b)"; - mocha-text = "rgb(cdd6f4)"; - mocha-subtext1 = "rgb(bac2de)"; - mocha-subtext0 = "rgb(a6adc8)"; - mocha-surface2 = "rgb(585b70)"; - mocha-overlay0 = "rgb(6c7086)"; - mocha-blue = "rgb(89b4fa)"; - mocha-peach = "rgb(fab387)"; - mocha-lavender = "rgb(cba6f7)"; - mocha-white = "rgb(cdd6f5)"; - - general = { - hide_cursor = true; - ignore_empty_input = true; - text_trim = false; - fail_timeout = 500; - }; - - animations = { - enabled = true; - fade_in = { - duration = 300; - bezier = "easeOutQuint"; - }; - fade_out = { - duration = 300; - bezier = "easeOutQuint"; - }; - }; - - background = [ - { - path = "screenshot"; - blur_passes = 2; - blur_size = 3; - noise = 0.0117; - contrast = 1.3000; - brightness = 0.8000; - vibrancy = 0.2100; - vibrancy_darkness = 0.0; - } - ]; - - label = [ - # ── Hours ───────────────────────────────────────────────────────────── - { - size = "200, 50"; - position = "50, 100"; - monitor = ""; - text = "cmd[update:1000] printf '%(%H)T'"; - color = "$mocha-lavender"; - font_size = 80; - font_family = "Fira Code"; - shadow_passes = 3; - shadow_size = 4; - halign = "left"; - valign = "bottom"; - } - - # ── : ───────────────────────────────────────────────────────────────── - { - position = "170, 105"; - monitor = ""; - text = ":"; - color = "$mocha-subtext1"; - font_size = 80; - font_family = "Fira Code"; - shadow_passes = 3; - shadow_size = 4; - halign = "left"; - valign = "bottom"; - } - - # ── Minutes ─────────────────────────────────────────────────────────── - { - position = "220, 100"; - monitor = ""; - text = "cmd[update:1000] printf '%(%M)T'"; - color = "$mocha-blue"; - font_size = 80; - font_family = "Fira Code"; - shadow_passes = 3; - shadow_size = 4; - halign = "left"; - valign = "bottom"; - } - - # ── "Monday 2, May" ─────────────────────────────────────────────────── - { - position = "370, 130"; - monitor = ""; - text = "cmd[update:300000] printf '%(%A, %d %b)T'"; - color = "$mocha-text"; - font_size = 18; - font_family = "Fira Code"; - shadow_passes = 3; - shadow_size = 4; - halign = "left"; - valign = "bottom"; - } - - # ── Battery ─────────────────────────────────────────────────────────── - { - position = "-30, -10"; - monitor = ""; - text = "cmd[update:2000] printf ' %s%%' \"$(cat /sys/class/power_supply/BAT0/capacity)\""; - color = "$mocha-peach"; - font_size = 15; - font_family = "Fira Code"; - shadow_passes = 3; - shadow_size = 4; - halign = "right"; - valign = "top"; - } - ]; - - auth = { - fingerprint = { - enabled = true; - # Optional: Customize messages - ready_message = "(Scan fingerprint to unlock)"; - present_message = "Scanning fingerprint"; - retry_delay = 250; - }; - }; - - input-field = [ - { - size = "200, 50"; - position = "0, -80"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_color = "rgb(202, 211, 245)"; - inner_color = "rgb(91, 96, 120)"; - outer_color = "rgb(24, 25, 38)"; - outline_thickness = 3; - placeholder_text = ''Password...''; - shadow_passes = 2; - } - ]; - }; - }; + programs.hyprlock.enable = true; } diff --git a/home/programs/swww/background_temp.jpeg b/home/programs/hyprpaper/background_temp.jpeg similarity index 100% rename from home/programs/swww/background_temp.jpeg rename to home/programs/hyprpaper/background_temp.jpeg diff --git a/home/programs/swww/default.nix b/home/programs/hyprpaper/default.nix similarity index 100% rename from home/programs/swww/default.nix rename to home/programs/hyprpaper/default.nix diff --git a/home/programs/imv.nix b/home/programs/imv.nix new file mode 100644 index 0000000..1f34219 --- /dev/null +++ b/home/programs/imv.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + programs.imv.enable = true; +} diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix index baba314..e423c98 100644 --- a/home/programs/nixvim/default.nix +++ b/home/programs/nixvim/default.nix @@ -39,49 +39,49 @@ syntax on ''; - colorscheme = "catppuccin"; - colorschemes.catppuccin = { - #lazyLoad.enable = true; - enable = true; - flavour = "mocha"; - settings = { - integrations = { - markdown = true; - leap = true; - dap = true; - dap_ui = true; - lsp_trouble = true; - blink_cmp = true; - gitsigns = true; - diffview = true; - treesitter = true; - barbar = true; - telescope = true; - native_lsp = { - enabled = true; - virtual_text = { - errors = [ "italic" ]; - hints = [ "italic" ]; - warnings = [ "italic" ]; - information = [ "italic" ]; - ok = [ "italic" ]; - }; - underlines = { - errors = [ "underline" ]; - hints = [ "underline" ]; - warnings = [ "underline" ]; - information = [ "underline" ]; - ok = [ "underline" ]; - }; - inlay_hints = { - background = true; - }; - }; - lsp_saga = true; - }; - }; - }; - +# colorscheme = "catppuccin"; +# colorschemes.catppuccin = { +# #lazyLoad.enable = true; +# enable = true; +# flavour = "mocha"; +# settings = { +# integrations = { +# markdown = true; +# leap = true; +# dap = true; +# dap_ui = true; +# lsp_trouble = true; +# blink_cmp = true; +# gitsigns = true; +# diffview = true; +# treesitter = true; +# barbar = true; +# telescope = true; +# native_lsp = { +# enabled = true; +# virtual_text = { +# errors = [ "italic" ]; +# hints = [ "italic" ]; +# warnings = [ "italic" ]; +# information = [ "italic" ]; +# ok = [ "italic" ]; +# }; +# underlines = { +# errors = [ "underline" ]; +# hints = [ "underline" ]; +# warnings = [ "underline" ]; +# information = [ "underline" ]; +# ok = [ "underline" ]; +# }; +# inlay_hints = { +# background = true; +# }; +# }; +# lsp_saga = true; +# }; +# }; +# }; +# globals = { mapleader = " "; maplocalleader = ","; diff --git a/home/programs/rofi/default.nix b/home/programs/rofi/default.nix index 9ed3a3b..8edc6c0 100644 --- a/home/programs/rofi/default.nix +++ b/home/programs/rofi/default.nix @@ -11,7 +11,6 @@ programs.rofi = { enable = true; terminal = "${pkgs.alacritty}/bin/alacritty"; - theme = ./theme.rafi; extraConfig = { mode = "run,drun,window,ssh,network"; con-theme = "Oranchelo"; @@ -36,4 +35,3 @@ }; }; } - diff --git a/home/programs/rofi/theme.rafi b/home/programs/rofi/theme.rafi deleted file mode 100644 index 8b62ad3..0000000 --- a/home/programs/rofi/theme.rafi +++ /dev/null @@ -1,111 +0,0 @@ -* { - bg-col: #1e1e2e; - bg-col-light: #1e1e2e; - border-col: #1e1e2e; - selected-col: #1e1e2e; - blue: #89b4fa; - fg-col: #cdd6f4; - fg-col2: #f38ba8; - grey: #6c7086; - - width: 600; - font: "JetBrainsMono Nerd Font 14"; -} - -element-text, element-icon , mode-switcher { - background-color: inherit; - text-color: inherit; -} - -window { - height: 360px; - border: 3px; - border-color: @border-col; - background-color: @bg-col; -} - -mainbox { - background-color: @bg-col; -} - -inputbar { - children: [prompt,entry]; - background-color: @bg-col; - border-radius: 5px; - padding: 2px; -} - -prompt { - background-color: @blue; - padding: 6px; - text-color: @bg-col; - border-radius: 3px; - margin: 20px 0px 0px 20px; -} - -textbox-prompt-colon { - expand: false; - str: ":"; -} - -entry { - padding: 6px; - margin: 20px 0px 0px 10px; - text-color: @fg-col; - background-color: @bg-col; -} - -listview { - border: 0px 0px 0px; - padding: 6px 0px 0px; - margin: 10px 0px 0px 20px; - columns: 2; - lines: 5; - background-color: @bg-col; -} - -element { - padding: 5px; - background-color: @bg-col; - text-color: @fg-col ; -} - -element-icon { - size: 25px; -} - -element selected { - background-color: @selected-col ; - text-color: @fg-col2 ; -} - -mode-switcher { - spacing: 0; - } - -button { - padding: 10px; - background-color: @bg-col-light; - text-color: @grey; - vertical-align: 0.5; - horizontal-align: 0.5; -} - -button selected { - background-color: @bg-col; - text-color: @blue; -} - -message { - background-color: @bg-col-light; - margin: 2px; - padding: 2px; - border-radius: 5px; -} - -textbox { - padding: 6px; - margin: 20px 0px 0px 20px; - text-color: @blue; - background-color: @bg-col-light; -} diff --git a/home/programs/zathura-desktop.nix b/home/programs/zathura-desktop.nix deleted file mode 100644 index 133528f..0000000 --- a/home/programs/zathura-desktop.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -let - theme = builtins.fetchurl { - url = - "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"; - sha256 = "0r2bgh4y7hymq8hhsjc70aw7yw85v668vgqcrcmdsggvdsk4rv1w"; - }; -in { - programs.zathura = { - enable = true; - options = { - synctex-editor-command = '' - include ${theme} - nvim --headless -c "VimtexInverseSearch %l '%f'" - ''; - synctex = true; - font = "Fira Code 16"; - }; - }; -} diff --git a/home/programs/zathura-laptop.nix b/home/programs/zathura-laptop.nix deleted file mode 100644 index 2b68673..0000000 --- a/home/programs/zathura-laptop.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -let - theme = builtins.fetchurl { - url = - "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"; - sha256 = "1zhx3bfz5s2wjrj87w0ryh15vgsqqfhg6dm48p63r5fmqwsak721"; - }; -in { - programs.zathura = { - enable = true; - options = { - synctex-editor-command = '' - include ${theme} - nvim --headless -c "VimtexInverseSearch %l '%f'" - ''; - synctex = true; - font = "Fira Code 16"; - }; - }; -} diff --git a/home/programs/zathura.nix b/home/programs/zathura.nix new file mode 100644 index 0000000..100c786 --- /dev/null +++ b/home/programs/zathura.nix @@ -0,0 +1,21 @@ +{ ... }: + +# let +# theme = builtins.fetchurl { +# url = +# "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"; +# sha256 = "1zhx3bfz5s2wjrj87w0ryh15vgsqqfhg6dm48p63r5fmqwsak721"; +# }; +# in { +{ + programs.zathura = { + enable = true; + options = { + synctex-editor-command = '' + nvim --headless -c "VimtexInverseSearch %l '%f'" + ''; # include ${theme} + synctex = true; + font = "Fira Code 16"; + }; + }; +} diff --git a/home/themes/catppuccin.nix b/home/themes/catppuccin.nix new file mode 100644 index 0000000..346c6a5 --- /dev/null +++ b/home/themes/catppuccin.nix @@ -0,0 +1,28 @@ +{ + ... +}: + +{ + catppuccin = { + enable = true; + flavor = "mocha"; + accent = "pink"; + + alacritty.enable = true; + anki.enable = true; + cursors.enable = true; + dunst.enable = true; + element-desktop.enable = true; + firefox.enable = true; + fzf.enable = true; + hyprlock.enable = true; + imv.enable = true; + lazygit.enable = true; + rofi.enable = true; + spotify-player.enable = true; + thunderbird.enable = true; + vscode.enable = true; + zathura.enable = true; + zsh-syntax-highlighting.enable = true; + }; +} diff --git a/home/themes/default.nix b/home/themes/default.nix new file mode 100644 index 0000000..fc1193a --- /dev/null +++ b/home/themes/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./catppuccin.nix + ]; +} diff --git a/machines/configuration-laptop.nix b/machines/configuration-laptop.nix index c6e260c..84fbc64 100644 --- a/machines/configuration-laptop.nix +++ b/machines/configuration-laptop.nix @@ -25,7 +25,7 @@ auth include login ''; }; - # sudo.fprintAuth = true; + sudo.fprintAuth = false; login.fprintAuth = true; };