add catppuccin theme flake

flake.lock

@@ -16,6 +16,21 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1726952185,
+        "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "csleeptimer": {
       "inputs": {
         "flake-utils": [
@@ -245,11 +260,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1726560853,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -278,11 +293,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1726560853,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -296,11 +311,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1726560853,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -353,11 +368,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725513492,
+        "lastModified": 1726745158,
-        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -383,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725513492,
+        "lastModified": 1726745158,
-        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -485,11 +500,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726308872,
+        "lastModified": 1727370457,
-        "narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
+        "narHash": "sha256-YlTm2rgsf+UxxNnUCE/B/8bL9A3HOfPZD8l8EjlWm/Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
+        "rev": "57e6b30d181ae6baff0909a61544ecbe1f642936",
         "type": "github"
       },
       "original": {
@@ -506,11 +521,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726308872,
+        "lastModified": 1727346017,
-        "narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
+        "narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
+        "rev": "c124568e1054a62c20fbe036155cc99237633327",
         "type": "github"
       },
       "original": {
@@ -595,11 +610,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726299205,
+        "lastModified": 1727331491,
-        "narHash": "sha256-v4DneIggoLBdypeghj4rMzYngKZ1FgDtYKaYDBkfShk=",
+        "narHash": "sha256-i0tKa6Nh1IMGGQ+fifU5PQyna3lVM6DZYUaUJSkSYwc=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "2da0565b4fa221f7a62e9cafa019cd00b99fdb9e",
+        "rev": "c914a68cbcd80f61d6eeb8152e97abf8fa684e99",
         "type": "github"
       },
       "original": {
@@ -611,11 +626,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1726271736,
+        "lastModified": 1727298068,
-        "narHash": "sha256-n2kXazdrh5+IvCZFrUq4z27n+OX70S6UPHxAI0pBg0w=",
+        "narHash": "sha256-fiDn3BSRLqSRh1cPLCkFIYc0mRpAAxc4Lq89gZ+ioMg=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "67d6b6f27ed3016a2daf6037879d77becc2cfa8f",
+        "rev": "64847fbdc908bf0a301b8f1e1814ff71bd425bae",
         "type": "github"
       },
       "original": {
@@ -651,11 +666,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726188813,
+        "lastModified": 1727003835,
-        "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
+        "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
+        "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d",
         "type": "github"
       },
       "original": {
@@ -687,11 +702,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1725885300,
+        "lastModified": 1727040444,
-        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
+        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
+        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
         "type": "github"
       },
       "original": {
@@ -709,11 +724,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725882169,
+        "lastModified": 1727091786,
-        "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
+        "narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
+        "rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278",
         "type": "github"
       },
       "original": {
@@ -724,11 +739,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726062873,
+        "lastModified": 1727122398,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
@@ -812,11 +827,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1726335481,
+        "lastModified": 1727366999,
-        "narHash": "sha256-mVVi8++ti/cApXgLLHxVUruZGDNe+rlRqacvul9BcQE=",
+        "narHash": "sha256-IGzvFj3RDBkLF92pF4txAon7kJTQMhmR/HTKViKhys8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "908721cdbd25efb05d0975ada5d980e89bba64fa",
+        "rev": "2ea7009e61ea02e08e480c94c06e71e640a59132",
         "type": "github"
       },
       "original": {
@@ -868,11 +883,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1726339530,
+        "lastModified": 1727372286,
-        "narHash": "sha256-AMoQBwy+KLVRDYffKSwsSnbkmvzfkuO0uLfWQWoXeaM=",
+        "narHash": "sha256-FzxzdW3qyQK949FM1HBYwPHck1pthknphECkxHBqbEo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d0a76d184032e1f97cc6fe162c4b207b699ba143",
+        "rev": "1cb268872ecbbb8bcdd76937b1f7536de880811b",
         "type": "github"
       },
       "original": {
@@ -890,11 +905,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726208959,
+        "lastModified": 1726995581,
-        "narHash": "sha256-Bq2YtXyHhDpBrqDlJysQgbhvauyiYTQXt7d6xxZdRck=",
+        "narHash": "sha256-lgsE/CTkZk9OIiFGEIrxXZQ7Feiv41dqlN7pEfTdgew=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "4267d5c5b51591a9553eefbd12172da050ee3433",
+        "rev": "3b7dd61b365ca45380707453758a45f2e9977be3",
         "type": "github"
       },
       "original": {
@@ -953,6 +968,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "csleeptimer": "csleeptimer",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
@@ -1032,11 +1048,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725271838,
+        "lastModified": 1727252110,
-        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -154,6 +154,7 @@
       url = "github:nix-community/nixGL";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    catppuccin.url = "github:catppuccin/nix";
 
     # Neovim
     nixvim = {

modules/home-manager/base/default.nix

@@ -1,10 +1,16 @@
-{pkgs, ...}: {
+{pkgs, inputs, ...}: {
   imports = [
     ./news.nix
     ./nixpkgs.nix
+    inputs.catppuccin.homeManagerModules.catppuccin
   ];
   # programs.home-manager.enable = true;
   home.packages = with pkgs; [
     home-manager
   ];
+
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+  };
 }

modules/home-manager/desktop/default.nix

@@ -46,6 +46,7 @@
     ./darkman
     ./pcmanfm
     ./thunar
+    ./hyprland
   ];
   config = lib.mkIf config.desktop.enable {
     desktop = {

modules/home-manager/desktop/hyprland/default.nix

@@ -0,0 +1,166 @@
+{ lib, config, ... }: {
+  options = {
+    desktop = {
+      hyprland = {
+        enable = lib.mkEnableOption "Hyprland";
+      };
+    };
+  };
+
+  config = {
+    wayland.windowManager.hyprland = lib.mkIf config.desktop.awesome.enable {
+      enable = true;
+      xwayland.enable = true;
+      settings = {
+        #source = [ "~/.config/hypr/themes/catppuccin/mocha.conf" "~/.config/hypr/monitors.conf" ];
+
+        env = [
+          "LIBVA_DRIVER_NAME,nvidia"
+          "XDG_SESSION_TYPE,wayland"
+          "GBM_BACKEND,nvidia-drm"
+          "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+        ];
+
+        cursor = {
+          no_hardware_cursors = true;
+        };
+
+        input = {
+          kb_layout = "de";
+          kb_variant = "nodeadkeys";
+          follow_mouse = 1;
+          numlock_by_default = 1;
+
+          touchpad = {
+            natural_scroll = false;
+          };
+
+          sensitivity = 0;
+          accel_profile = "flat";
+          force_no_accel = true;
+        };
+
+        general = {
+          gaps_in = 3;
+          gaps_out = 6;
+          border_size = 2;
+          col.active_border = "0xaa$blueAlpha";
+          col.inactive_border = "0xaa$surface0Alpha";
+          layout = "dwindle";
+        };
+
+        decoration = {
+          rounding = 3;
+        };
+
+        animations = {
+          enabled = true;
+          bezier = "easyInCubic, 0.32, 0, 0.67, 0";
+          animation = [
+            "windows, 1, 1.125, easyInCubic"
+            "windowsOut, 1, 1.125, easyInCubic, popin 80%"
+            "fade, 1, 1.125, easyInCubic"
+            "workspaces, 1, 1.125, easyInCubic"
+          ];
+        };
+
+        dwindle = {
+          pseudotile = true;
+          preserve_split = true;
+          default_split_ratio = 1;
+        };
+
+        master = {
+          new_is_master = true;
+        };
+
+        gestures = {
+          workspace_swipe = false;
+        };
+
+
+        # See https://wiki.hyprland.org/Configuring/Keywords/ for more
+        "$mainMod" = "SUPER";
+        "$term" = "kitty";
+        "$browser" = "firefox";
+        "$filemanager" = "thunar";
+        "$launcher" = "wofi -bt kitty --show drun";
+
+        bind = [
+          "$mainMod, return, exec, $term"
+          "$mainMod, W, exec, $browser"
+          "$mainMod SHIFT, Q, exit,"
+          "$mainMod, Q, killactive,"
+          "$mainMod, F, togglefloating,"
+          "$mainMod SHIFT, F, fullscreen,"
+          "$mainMod, P, pseudo, # dwindle"
+          "$mainMod, N, togglesplit, # dwindle"
+
+          # Launchers
+          "$mainMod, E, exec, $filemanager"
+          "$mainMod, R, exec, $launcher"
+          "$mainMod, O, exec, wofi-emoji"
+          "$mainMod SHIFT, X, exec, eww open powermenu"
+          "$mainMod, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
+
+          # Move focus with mainMod + arrow keys
+          "ALT, Tab, cyclenext,"
+          "ALT, Tab, bringactivetotop,"
+          "$mainMod, H, movefocus, l"
+          "$mainMod, L, movefocus, r"
+          "$mainMod, K, movefocus, u"
+          "$mainMod, J, movefocus, d"
+          "$mainMod SHIFT, H, movewindow, l"
+          "$mainMod SHIFT, L, movewindow, r"
+          "$mainMod SHIFT, K, movewindow, u"
+          "$mainMod SHIFT, J, movewindow, d"
+          "$mainMod CONTROL, H, resizeactive, -50 0"
+          "$mainMod CONTROL, L, resizeactive, 50 0"
+          "$mainMod CONTROL, K, resizeactive, 0 -50"
+          "$mainMod CONTROL, J, resizeactive, 0 50"
+
+          # Switch workspaces with mainMod + [0-9]
+          "$mainMod, 1, workspace, 1"
+          "$mainMod, 2, workspace, 2"
+          "$mainMod, 3, workspace, 3"
+          "$mainMod, 4, workspace, 4"
+          "$mainMod, 5, workspace, 5"
+          "$mainMod, 6, workspace, 6"
+          "$mainMod, 7, workspace, 7"
+          "$mainMod, 8, workspace, 8"
+          "$mainMod, 9, workspace, 9"
+          "$mainMod, 0, workspace, 10"
+
+          # Move active window to a workspace with mainMod + SHIFT + [0-9]
+          "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
+          "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
+          "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
+          "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
+          "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
+          "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
+          "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
+          "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
+          "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
+          "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
+
+          # Volume
+          ",XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%"
+          ",XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%"
+          ",XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle"
+
+          # Playback controls
+          ",XF86AudioPlay, exec, playerctl play-pause"
+          ",XF86AudioStop, exec, playerctl stop"
+          ",XF86AudioNext, exec, playerctl next"
+          ",XF86AudioPrev, exec, playerctl previous"
+        ];
+
+        bindm = [
+          # Move/resize windows with mainMod + LMB/RMB and dragging
+          "$mainMod, mouse:272, movewindow"
+          "$mainMod, mouse:273, resizewindow"
+        ];
+      };
+    };
+  };
+}

modules/home-manager/desktop/kitty/default.nix

@@ -17,7 +17,7 @@
         window_padding_width = 0;
         symbol_map = "U+E5FA-U+E62B,U+E700-U+E7C5,U+F000-U+F2E0,U+E200-U+E2A9,U+F500-U+FD46,U+E300-U+E3EB,U+F400-U+F4A8,U+2665,U+26A1,U+F27C,U+E0A3,U+E0B4-U+E0C8,U+E0CA,U+E0CC-U+E0D2,U+E0D4,U+23FB-U+23FE,U+2B58,U+F300-U+F313,U+E000-U+E00D Symbols Nerd Font Mono";
       };
-      theme = "Catppuccin-Mocha";
+      #theme = "Catppuccin-Mocha";
     };
   };
 }

modules/home-manager/shell/btop/default.nix

@@ -1,7 +1,7 @@
 { config, lib, ... }: lib.mkIf config.programs.btop.enable {
   programs.btop = {
     settings = {
-      color_theme = "Default";
+      #color_theme = "Default";
       theme_background = false;
     };
   };

modules/home-manager/shell/default.nix

@@ -14,6 +14,7 @@
     ./bat
     ./tldr
     ./borgmatic
+    ./yazi
   ];
 
   home.packages = with pkgs; [

modules/home-manager/shell/starship/default.nix

@@ -23,7 +23,7 @@ lib.mkIf config.programs.starship.enable {
           "$git_commit"
           "$git_state"
           "$git_metrics"
-          "$git_statu"
+          "$git_status"
           "$hg_branch"
           "$package"
           "$c"

modules/home-manager/shell/yazi/default.nix

@@ -0,0 +1,7 @@
+_: {
+  programs = {
+    yazi = {
+      enable = true;
+    };
+  };
+}

profiles/home-manager/odie@asgard/home.nix

@@ -1,8 +1,8 @@
-{
+{ pkgs
-  pkgs,
+, inputs
-  inputs,
+, outputs
-  outputs,
+, vars
-  ...
+, ...
 }: {
   imports = [
     inputs.csleeptimer.homeManagerModules.default
@@ -12,32 +12,35 @@
     outputs.homeManagerModules.development
     outputs.homeManagerModules.games
     outputs.homeManagerModules.user
-    {
-      desktop = {
-        enable = true;
-        awesome = {
-          enable = false;
-        };
-        network-manager.enable = false;
-        xserver.enable = false;
-        xresources.enable = true;
-        pcmanfm.enable = false;
-        thunar.enable = false;
-      };
-      programs = {
-        firefox.enable = false;
-        keepassxc.enable = false;
-      };
-      services = {
-        nixGL.enable = true;
-        borgmatic.enable = true;
-        nextcloud-client.enable = false;
-      };
-      theme.cursor.enable = false;
-      theme.gtk.enable = false;
-      home.packages = with pkgs; [
-        nix-serve
-      ];
-    }
   ];
+  desktop = {
+    enable = true;
+    awesome = {
+      enable = false;
+    };
+    network-manager.enable = false;
+    xserver.enable = false;
+    xresources.enable = true;
+    pcmanfm.enable = false;
+    thunar.enable = false;
+  };
+  programs = {
+    firefox.enable = false;
+    keepassxc.enable = false;
+  };
+  services = {
+    nixGL.enable = true;
+    borgmatic.enable = true;
+    nextcloud-client.enable = false;
+  };
+  theme.cursor.enable = false;
+  theme.gtk.enable = false;
+  home = {
+    sessionVariables = {
+      PATH = "/home/${vars.username}/bin:$PATH";
+    };
+    packages = with pkgs; [
+      nix-serve
+    ];
+  };
 }