Compare commits

..

No commits in common. "bdfc9707433fe46f97b3094119b8e2064ca4db7b" and "69661cf459c6568932022d77e97efe1d8a400f13" have entirely different histories.

11 changed files with 87 additions and 288 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,166 +0,0 @@
{ 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"
];
};
};
};
}

View File

@ -17,7 +17,7 @@
window_padding_width = 0; 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"; 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";
}; };
}; };
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -1,8 +1,8 @@
{ pkgs {
, inputs pkgs,
, outputs inputs,
, vars outputs,
, ... ...
}: { }: {
imports = [ imports = [
inputs.csleeptimer.homeManagerModules.default inputs.csleeptimer.homeManagerModules.default
@ -12,7 +12,7 @@
outputs.homeManagerModules.development outputs.homeManagerModules.development
outputs.homeManagerModules.games outputs.homeManagerModules.games
outputs.homeManagerModules.user outputs.homeManagerModules.user
]; {
desktop = { desktop = {
enable = true; enable = true;
awesome = { awesome = {
@ -35,12 +35,9 @@
}; };
theme.cursor.enable = false; theme.cursor.enable = false;
theme.gtk.enable = false; theme.gtk.enable = false;
home = { home.packages = with pkgs; [
sessionVariables = {
PATH = "/home/${vars.username}/bin:$PATH";
};
packages = with pkgs; [
nix-serve nix-serve
]; ];
}; }
];
} }