diff --git a/flake.lock b/flake.lock index 3b7a417..5759f2f 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "type": "github" }, "original": { @@ -95,11 +95,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", + "lastModified": 1710951922, + "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", + "rev": "f091af045dff8347d66d186a62d42aceff159456", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709356872, - "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "458b097d81f90275b3fdf03796f0563844926708", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { diff --git a/modules/home/default.nix b/modules/home/default.nix index 8d6af84..b29741a 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -5,5 +5,6 @@ ./tmux.nix ./starship.nix ./git.nix + ./kitty.nix ]; } diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix new file mode 100644 index 0000000..c358727 --- /dev/null +++ b/modules/home/kitty.nix @@ -0,0 +1,43 @@ +{ config, lib, ... }: +let +graphical = if builtins.hasAttr "cherrykitten" config + then config.cherrykitten.graphical + else true; +in +{ + programs.kitty = lib.mkIf graphical { + enable = true; + theme = "Catppuccin-Mocha"; + settings = { + enable_audio_bell = false; + background_opacity = 1; + copy_on_select = "clipboard"; + hide_window_decorations = true; + + # symbol maps + # Seti-UI + Custom + "symbol_map U+E5FA-U+E62B" = "Symbols Nerd Font"; + # Devicons + "symbol_map U+E700-U+E7C5" = "Symbols Nerd Font"; + # Font Awesome + "symbol_map U+F000-U+F2E0" = "Symbols Nerd Font"; + # Font Awesome Extension + "symbol_map U+E200-U+E2A9" = "Symbols Nerd Font"; + # Material Design Icons + "symbol_map U+F500-U+FD46" = "Symbols Nerd Font"; + # Weather + "symbol_map U+E300-U+E3EB" = "Symbols Nerd Font"; + # Octicons + "symbol_map U+F400-U+F4A8,U+2665,U+26A1,U+F27C" = "Symbols Nerd Font"; + # Powerline Extra Symbols + "symbol_map U+E0A3,U+E0B4-U+E0C8,U+E0CC-U+E0D2,U+E0D4" = "Symbols Nerd Font"; + # IEC Power Symbols + "symbol_map U+23FB-U+23FE,U+2b58" = "Symbols Nerd Font"; + # Font Logos + "symbol_map U+F300-U+F313" = "Symbols Nerd Font"; + # Pomicons + "symbol_map U+E000-U+E00D" = "Symbols Nerd Font"; + + }; + }; +} diff --git a/modules/nixos/graphical.nix b/modules/nixos/graphical.nix index cd5a986..5d25264 100644 --- a/modules/nixos/graphical.nix +++ b/modules/nixos/graphical.nix @@ -3,11 +3,10 @@ let cfg = config.cherrykitten.graphical; in { - options.cherrykitten.graphical = { - enable = lib.mkEnableOption (lib.mdDoc "graphical stuffs"); - }; + options.cherrykitten.graphical = lib.mkEnableOption (lib.mdDoc "graphical stuffs"); - config = lib.mkIf cfg.enable { + + config = lib.mkIf cfg { services.xserver = { enable = true; displayManager.sddm.enable = true; @@ -18,44 +17,5 @@ in xkb.layout = "de"; xkb.options = "caps:escape"; }; - - home-manager.users.sammy = { - programs = { - librewolf.enable = true; - - kitty = { - enable = true; - theme = "Catppuccin-Mocha"; - font = { - name = "Monaspace Xenon"; - size = 12; - }; - settings = { - # Seti-UI + Custom - "symbol_map U+E5FA-U+E62B" = "Symbols Nerd Font"; - # Devicons - "symbol_map U+E700-U+E7C5" = "Symbols Nerd Font"; - # Font Awesome - "symbol_map U+F000-U+F2E0" = "Symbols Nerd Font"; - # Font Awesome Extension - "symbol_map U+E200-U+E2A9" = "Symbols Nerd Font"; - # Material Design Icons - "symbol_map U+F500-U+FD46" = "Symbols Nerd Font"; - # Weather - "symbol_map U+E300-U+E3EB" = "Symbols Nerd Font"; - # Octicons - "symbol_map U+F400-U+F4A8,U+2665,U+26A1,U+F27C" = "Symbols Nerd Font"; - # Powerline Extra Symbols - "symbol_map U+E0A3,U+E0B4-U+E0C8,U+E0CC-U+E0D2,U+E0D4" = "Symbols Nerd Font"; - # IEC Power Symbols - "symbol_map U+23FB-U+23FE,U+2b58" = "Symbols Nerd Font"; - # Font Logos - "symbol_map U+F300-U+F313" = "Symbols Nerd Font"; - # Pomicons - "symbol_map U+E000-U+E00D" = "Symbols Nerd Font"; - }; - }; - }; - }; }; }