Compare commits

..

No commits in common. "ddf23300b402cec3cc509310030b44ba524f4de8" and "2a03f047547fa2eec38c80341b1fe3866b12855d" have entirely different histories.

7 changed files with 82 additions and 94 deletions

View File

@ -51,11 +51,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764161084, "lastModified": 1755825449,
"narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e95de00a471d07435e0527ff4db092c84998698e", "rev": "8df64f819698c1fee0c2969696f54a843b2231e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
"emacs-config": { "emacs-config": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758175926, "lastModified": 1753376285,
"narHash": "sha256-RJf3SsDucOaO4YbASm1X4VywLBcUr29lSHWUlqdvbaM=", "narHash": "sha256-4Eop4e0WGXSfTUJNVvRX3LWmKYfqRHwyP7CQ29Ul1ec=",
"owner": "larstvei", "owner": "larstvei",
"repo": "dot-emacs", "repo": "dot-emacs",
"rev": "02f2aaf08060cd9821d16bcf2d4012bcd7652481", "rev": "ccb295f284d8e47d7904cb966734ce52dc32eb72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1763863245, "lastModified": 1756046222,
"narHash": "sha256-IkC0fWViM6JOpi0StwEUmOZ2M9BL2UhlGYBBD05kJo0=", "narHash": "sha256-Tt21rG+ee4PrJe85YF36rgmVDIpgh3HjRf2JCtVET/c=",
"owner": "larstvei", "owner": "larstvei",
"repo": "emacs-flake", "repo": "emacs-flake",
"rev": "ec4bd967713f9358448584ce5e4f0ccd827ad694", "rev": "8e643d23c2804f2a8883adba40dcd238e527bfa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1763862392, "lastModified": 1754790584,
"narHash": "sha256-VbvSOxR+Z0humuRdgl18+TinK/ROaGfdigxqjCoWMHA=", "narHash": "sha256-vZgfYDPUNA+x/lDx0ncHwGKuPkbQOLxdmv4LGFOjZoE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a68dfb0337d94e794addd3be77a16a2d4b54e370", "rev": "c684c5f057409a42d83c45ce161781e91e5520a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +124,11 @@
"emacs-plus": { "emacs-plus": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762005821, "lastModified": 1754320041,
"narHash": "sha256-M24JpkYH7xdrm7Uine17wrmnpszfhCn9dBhw13Yt69Q=", "narHash": "sha256-BT0XP4/PUq1n7eboeoMD0POq+wps1dUkKpiBFvjwBjI=",
"owner": "d12frosted", "owner": "d12frosted",
"repo": "homebrew-emacs-plus", "repo": "homebrew-emacs-plus",
"rev": "89952793a1226de8b47dd6269806693713178b84", "rev": "cd8d57de9ac25d9822567ea4d51d5c67d791d7ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,24 +155,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -180,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764361670, "lastModified": 1756022458,
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762964643, "lastModified": 1752603129,
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "827f2a23373a774a8805f84ca5344654c31f354b", "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,15 +199,14 @@
"nanostatus": { "nanostatus": {
"inputs": { "inputs": {
"ags": "ags", "ags": "ags",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1757689076, "lastModified": 1757604536,
"narHash": "sha256-RcNvTv6R/Kl5k/Pe9ZENZGbuw82ZU6Ssx6zOqkjdFPE=", "narHash": "sha256-q0zKPGRi5oW59IpYkxmjyRRLtqwsDaDFbb+oOcFpg2s=",
"owner": "larstvei", "owner": "larstvei",
"repo": "nanostatus", "repo": "nanostatus",
"rev": "ab494b22a5c4fc6e8f07423d5f3b585dee790c6d", "rev": "9338759e13edeca8d8dc14a3b3b8485d5c2fa22e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756177999, "lastModified": 1745249216,
"narHash": "sha256-aSbB7/jrt7ujiJ55f2uGhOo+usGxVSkqbAMVgg2jDls=", "narHash": "sha256-bNuaIdGrs8LfintWymo9KQTILwVxsw5T6zdfxZY6K0g=",
"owner": "cpick", "owner": "cpick",
"repo": "nix-rosetta-builder", "repo": "nix-rosetta-builder",
"rev": "ebb7162a975074fb570a2c3ac02bc543ff2e9df4", "rev": "5cf6aa1f3f2fbb70443d33b5ef7779b7c7063392",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +275,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1763678758, "lastModified": 1754498491,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,27 +291,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1763622513, "lastModified": 1751274312,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1763618868, "lastModified": 1754711617,
"narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "narHash": "sha256-WrZ280bT6NzNbBo+CKeJA/NW1rhvN/RUPZczqCpu2mI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "rev": "00b574b1ba8a352f0601c4dde4faff4b534ebb1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +339,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1764352606, "lastModified": 1755829505,
"narHash": "sha256-ZwPqcETKhoQ+TS40+hFr5CY4wzcNGKhi6l8w2HmmxKc=", "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "24e915b36ca87d32777d766da3a3f4e3ce22cc98", "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,21 +379,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -421,11 +387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764390306, "lastModified": 1756009581,
"narHash": "sha256-UPkmgG/0lvo98UGDAqRBIVp6fDltjtkqmPSeVLTB8nA=", "narHash": "sha256-2I/NyYJm6Zq6fJ1YQWSY1S77LjXw+woFYUYEwU91uCc=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "22ade9265abd347d39b845af952be1e049cafe66", "rev": "0f80eb175059149c59edde75202721cab3384464",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -0,0 +1,32 @@
{
# The animations is taken from Omarchy, see:
# https://github.com/basecamp/omarchy/blob/master/default/hypr/looknfeel.conf
wayland.windowManager.hyprland.settings.animations = {
enabled = true;
bezier = [
"easeOutQuint,0.23,1,0.32,1"
"easeInOutCubic,0.65,0.05,0.36,1"
"linear,0,0,1,1"
"almostLinear,0.5,0.5,0.75,1.0"
"quick,0.15,0,0.1,1"
];
animation = [
"global, 1, 10, default"
"border, 1, 5.39, easeOutQuint"
"windows, 1, 4.79, easeOutQuint"
"windowsIn, 1, 4.1, easeOutQuint, popin 87%"
"windowsOut, 1, 1.49, linear, popin 87%"
"fadeIn, 1, 1.73, almostLinear"
"fadeOut, 1, 1.46, almostLinear"
"fade, 1, 3.03, quick"
"layers, 1, 3.81, easeOutQuint"
"layersIn, 1, 4, easeOutQuint, fade"
"layersOut, 1, 1.5, linear, fade"
"fadeLayersIn, 1, 1.79, almostLinear"
"fadeLayersOut, 1, 1.39, almostLinear"
"workspaces, 0, 0, ease"
];
};
}

View File

@ -42,7 +42,7 @@ in
# App launchers / session # App launchers / session
"$mod, T, exec, kitty" "$mod, T, exec, kitty"
"$mod, E, exec, emacs" "$mod, E, exec, emacs"
"$mod, B, exec, zen-beta" "$mod, B, exec, zen"
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, S, exec, grimblast copysave area /tmp/screenshot-$(date +%F--%T).png" "$mod, S, exec, grimblast copysave area /tmp/screenshot-$(date +%F--%T).png"

View File

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./animations
./bindings ./bindings
./hypridle ./hypridle
./hyprlock ./hyprlock
@ -33,16 +34,7 @@
monitor = [ ",preferred,auto,1" ]; monitor = [ ",preferred,auto,1" ];
gestures.gesture = "3, horizontal, workspace"; gestures.workspace_swipe = true;
animations = {
enabled = true;
animation = [
"global, 1, 1.5, default"
"windows, 1, 1.5, default, slide"
"workspaces, 0, 0, default"
];
};
cursor = { cursor = {
enable_hyprcursor = false; enable_hyprcursor = false;

View File

@ -16,7 +16,7 @@
scipy scipy
xlsxwriter xlsxwriter
yattag yattag
z3-solver z3
] ]
)) ))
]; ];

View File

@ -1,10 +1,8 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
settings.user = { userName = "larstvei";
name = "larstvei"; userEmail = "larstvei@ifi.uio.no";
email = "larstvei@ifi.uio.no";
};
ignores = [ ignores = [
".envrc" ".envrc"
".DS_Store" ".DS_Store"

View File

@ -19,6 +19,6 @@ in
imagemagick imagemagick
inkscape inkscape
pdf2svg pdf2svg
poppler-utils poppler_utils
]; ];
} }