Compare commits

..

4 commits

5 changed files with 48 additions and 44 deletions

View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1676599101, "lastModified": 1676910639,
"narHash": "sha256-CKS6UsOGhoNxGDBt9wyFiWHvtng/+BMAJ4G8ahhe1DE=", "narHash": "sha256-YvZ2lQiUZrv5PCQ0nC/fn/0OT2ag8spCIOQx0COnFZ0=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "de657061b13cf329c57a1a9730a5049a971b40b3", "rev": "5f66c8aa774d8d488cba1cdc4f0c954d2a14e3a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +321,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1676367705, "lastModified": 1676892629,
"narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=", "narHash": "sha256-rlvsqoSBO5dCwfnn7xvImYREidIPJaiFS3b54TZF4pU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5", "rev": "72ce74d3eae78a6b31538ea7ebe0c1fcf4a10f7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1676630258, "lastModified": 1676902515,
"narHash": "sha256-pc3aIr2LgmJFcTQwICpz3d4/u5/xHDI14qY/zEhGM3k=", "narHash": "sha256-tFvDUIWmsEdAWnbwCDCDwcPxcZNGQzPfRpx5tSL/yl0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "be2e4d9dd1e58991a4f54078a331cbcbd8265c7f", "rev": "474ada9267ccb98015991ee9d0d93fbb5da72034",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1676406424, "lastModified": 1676681260,
"narHash": "sha256-G+JhFuaeB15MTU8DbJALm/Yf240FCQmrWZ8Y0UzyqRI=", "narHash": "sha256-R2FvbPzgvDSVs0jCUA9CMDIgw4F6exF8cR+y3Yea5jQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "1d76f4db0d3b487b9a9562195815e181652aef7c", "rev": "2bc88dc8c220db674f458432aec0ac0d9ea6a640",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1676634984, "lastModified": 1676912548,
"narHash": "sha256-VlcjVkzFEYGOVMXvlpS9hREF40Zs3n3Gpw53nlo22CI=", "narHash": "sha256-5KH+YpMju3Zj6PU4wV3qaEznRvyt0y7Ei4hS7jsEh2c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "98042fc6d36ebb11a4defe4f2cee76aa6192257d", "rev": "20c135b191fd84f556cc5eb37b8d9d683a580b1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +456,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1676634789, "lastModified": 1676908542,
"narHash": "sha256-ywC4XWyG6Qgs48ZYHU1BaxfPTlPS/Vt4Zgb5x0kYEWo=", "narHash": "sha256-a5J7LPxpmB69oOzCz0kuh6pXV/IVNMlDfs3pIYwnvHo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "f905ab04507fc5a86affeb5eaf8550c1795ac9b8", "rev": "3507474611a03d88137a1d97666515b551c39cb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -636,11 +636,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1676549890, "lastModified": 1676790509,
"narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=", "narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257", "rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1676513100, "lastModified": 1676879534,
"narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", "narHash": "sha256-HU4RXcwsAX1u7AUbGOBDxkYQkeODcn+HZjXqKa1y/hk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", "rev": "c9495f017f67a11e9c9909b032dc7762dfc853cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -806,11 +806,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1676546582, "lastModified": 1676817468,
"narHash": "sha256-MJ+PXNmUyxnMTFoss7G2lEcUY2cfYZM6RudBAL5aX1k=", "narHash": "sha256-ovuJ1jQOC2/EEibufBkXmSN/O9mLx80Wh7aDmHmHAhA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb7d749c084890192b2cd08ba264e5e4a14df1b", "rev": "0cf4274b5d06325bd16dbf879a30981bc283e58a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -133,4 +133,10 @@ with lib;
}; };
xdg.userDirs.enable = true; xdg.userDirs.enable = true;
}; };
system.activationScripts.diff = ''
if [ -e /run/current-system ]; then
${pkgs.nvd}/bin/nvd --nix-bin-dir ${pkgs.nix}/bin diff /run/current-system/ "$systemConfig"
fi
'';
} }

View file

@ -76,13 +76,21 @@ in
# Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more # Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.45, 0, 0.55, 1 bezier = sine, 0.445, 0.05, 0.55, 0.95
bezier = quad, 0.455, 0.03, 0.515, 0.955
bezier = cubic, 0.68, -0.55, 0.265, 1.55
bezier = quart, 0.77, 0, 0.175, 1
bezier = quint, 0.86, 0, 0.07, 1
bezier = expo, 1, 0, 0, 1
bezier = circ, 0.785, 0.135, 0.15, 0.86
bezier = back, 0.68, -0.55, 0.265, 1.55
animation = windows, 1, 3, myBezier
animation = windowsOut, 1, 3, myBezier animation = windows, 1, 3, circ
animation = border, 1, 3, myBezier animation = windowsOut, 1, 2, quint
animation = fade, 1, 3, myBezier animation = border, 1, 2, sine
animation = workspaces, 1, 3, myBezier animation = fade, 1, 2, sine
animation = workspaces, 1, 5, circ
} }
dwindle { dwindle {

View file

@ -56,7 +56,6 @@ in
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
catppuccin-nvim catppuccin-nvim
cmp-nvim-lsp cmp-nvim-lsp
cmp-spell
cmp_luasnip cmp_luasnip
comment-nvim comment-nvim
copilot-cmp copilot-cmp
@ -85,6 +84,7 @@ in
orgmode orgmode
plenary-nvim # for telescope, neogit plenary-nvim # for telescope, neogit
telescope-nvim telescope-nvim
vim-lion
which-key-nvim which-key-nvim
]; ];
}; };

View file

@ -144,16 +144,6 @@ cmp.setup({
{ name = "luasnip", priority = 7 }, { name = "luasnip", priority = 7 },
{ name = "nvim_lsp", priority = 9 }, { name = "nvim_lsp", priority = 9 },
{ name = "orgmode", priority = 9 }, { name = "orgmode", priority = 9 },
{
name = "spell",
option = {
keep_all_entries = false,
enable_in_context = function()
return true
end,
},
priority = 1,
},
}, },
}) })