diff --git a/configuration.nix b/configuration.nix index 6dc0e36..c116dfc 100644 --- a/configuration.nix +++ b/configuration.nix @@ -134,7 +134,7 @@ systemd.extraConfig = "DefaultLimitNOFILE=2048"; boot.tmp.useTmpfs = false; - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; nixpkgs.config.allowUnfree = true; diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index c5daa53..039d362 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -42,7 +42,7 @@ pkgs: rec { font = { code = { name = "JetBrainsMono Nerd Font"; - package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); + package = pkgs.nerd-fonts.jetbrains-mono; # name = "CascadiaCove-NF"; # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); }; diff --git a/flake.lock b/flake.lock index 97e5949..7301da1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "Hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1742767019, - "narHash": "sha256-FdyHDbf31jl5rIU7IQtBVTbZ1ojGrrp5aFaRrE2819s=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "5b62529c2011ede6069445de9b5b3f8a1f10ecfe", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -41,11 +20,11 @@ ] }, "locked": { - "lastModified": 1742213273, - "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", + "lastModified": 1747864449, + "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", + "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", "type": "github" }, "original": { @@ -192,7 +171,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -232,7 +211,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -250,7 +229,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -297,11 +276,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1743191728, - "narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=", + "lastModified": 1748207486, + "narHash": "sha256-4kR7VyauWpNMrBePHMM8yzQvUzHHGRVkQpJ3DyoKcH0=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941", + "rev": "3f6c02b49e08aed51e4be85d87b79b9dbea34a85", "type": "github" }, "original": { @@ -383,16 +362,16 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -434,11 +413,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", "type": "github" }, "original": { @@ -463,11 +442,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", "type": "github" }, "original": { @@ -488,15 +467,15 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1743297135, - "narHash": "sha256-4JgyJLuHxeoeSsSbi4MkpVYsI4R74Trov33sIg1fa/0=", + "lastModified": 1748295224, + "narHash": "sha256-yR8zw5bSEHd28fGfGM64nW8y72NOfxFvvrXcR2p4WUE=", "ref": "refs/heads/main", - "rev": "da2d7c3971d40f841f2afd7def8e4bad9a351e41", - "revCount": 5948, + "rev": "be6ee6e55f08387a9e2fbf712c061fb238a70319", + "revCount": 6141, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -524,11 +503,11 @@ ] }, "locked": { - "lastModified": 1743339740, - "narHash": "sha256-G6a7R/gb1xH0yI2uevTmDpxZf6rvMh1lOu0gYrqVu5U=", + "lastModified": 1748271549, + "narHash": "sha256-MiVqB5DoHqxNSaQVbYmkaIDz02AJ4XS3oXHI1x2lEX0=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "6dca4ece21864e329394b81cfc767778089097e2", + "rev": "d81d96e9d68c182a202e0bbf14384d60929b4454", "type": "github" }, "original": { @@ -549,11 +528,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "type": "github" }, "original": { @@ -617,11 +596,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "type": "github" }, "original": { @@ -646,11 +625,11 @@ ] }, "locked": { - "lastModified": 1741191527, - "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", + "lastModified": 1747484975, + "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", + "rev": "163c83b3db48a17c113729c220a60b94596c9291", "type": "github" }, "original": { @@ -666,11 +645,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741036724, - "narHash": "sha256-nCsqa5dXW1Qja+smRkVpNkGAHfYkBFJ6U3bVilY5pDo=", + "lastModified": 1745860672, + "narHash": "sha256-tJKLjWaOcJW4Ttu1noSY+lddlJvyX2eonTrgR5IycZo=", "owner": "h3rmt", "repo": "hyprswitch", - "rev": "3feeccf2f1d3d6c0fb7c79b965ccf382118651d2", + "rev": "313e7d5730af2e37ab73fe238b1bd3a2d3e5552f", "type": "github" }, "original": { @@ -692,11 +671,11 @@ ] }, "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "lastModified": 1746635225, + "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", "type": "github" }, "original": { @@ -717,11 +696,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1747584298, + "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", "type": "github" }, "original": { @@ -826,11 +805,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -874,11 +853,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1743346368, - "narHash": "sha256-DJv361yCiMiMyKA1elFtgJ9CbK/nEXLKj7vY0zUBmTk=", + "lastModified": 1748330006, + "narHash": "sha256-g6dhnA/An7un00tBZ8MeC7V0lU9lLySP9+brMXrm3TU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e68c2965da5c7f149dd8543c63d7217753e00c32", + "rev": "68a7635955e17148449379318fefcb60b894e775", "type": "github" }, "original": { @@ -950,11 +929,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -1012,26 +991,26 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "type": "indirect" } }, "nixpkgs_6": { "locked": { - "lastModified": 1737003892, - "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", + "lastModified": 1747312588, + "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", + "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d", "type": "github" }, "original": { @@ -1121,11 +1100,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -1167,7 +1146,6 @@ }, "root": { "inputs": { - "Hyprspace": "Hyprspace", "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", @@ -1239,11 +1217,11 @@ ] }, "locked": { - "lastModified": 1737080704, - "narHash": "sha256-n+J2h9GM9ZpFOQUmtZoCr1+DFF/iO5UlmLJeHIxbZGY=", + "lastModified": 1747363019, + "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9953fe89f8b65401fc4d4a288940bc2cb072949", + "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f", "type": "github" }, "original": { @@ -1275,11 +1253,11 @@ ] }, "locked": { - "lastModified": 1743305778, - "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e873886bbfc32163fe027b8676c75637b7da114", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -1289,21 +1267,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1318,7 +1281,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1333,6 +1296,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1363,21 +1341,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1406,11 +1369,11 @@ ] }, "locked": { - "lastModified": 1741934139, - "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "type": "github" }, "original": { @@ -1426,11 +1389,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1743344227, - "narHash": "sha256-Lp1JUMrhvAmCzftOSQ2Sr0+svemxSxcLeZ4HkmdLXbE=", + "lastModified": 1748249183, + "narHash": "sha256-I+JvW3752iZq4QrTOUDvhVA++0LHq974XxHjQrjA6lM=", "owner": "sxyazi", "repo": "yazi", - "rev": "1765aba68440f73c590cedac14ece6778fe88ff5", + "rev": "74a8ea9bc0289f093c34b15755c05fa25a1c5ace", "type": "github" }, "original": { @@ -1447,14 +1410,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1742573336, - "narHash": "sha256-7cVQTyMA9V1YqqVXwaxmrsUKE8LjnBdIj6fvpKKuAxo=", + "lastModified": 1747505540, + "narHash": "sha256-wJTXPH8VellWNupRxMvv9kkIo+271t4XVupgvT1RkTU=", "owner": "lordkekz", "repo": "nix-yazi-plugins", - "rev": "76e0104f5bfc2517d86cae0332ede54c6d5ba4e8", + "rev": "f3daa56d0f9ea29bd1ecff557f3604ada00fbe31", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index db82a6e..6cef2ae 100644 --- a/flake.nix +++ b/flake.nix @@ -1,29 +1,27 @@ -rec { +{ description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; inputs = { + nixpkgs = { url = "nixpkgs/nixos-25.05"; }; + nixpkgs-unstable = { url = "nixpkgs/nixos-unstable"; }; + nixpkgs-latest = { url = "github:nixos/nixpkgs?ref=master"; }; - nixpkgs = { url = "nixpkgs/nixos-24.11"; }; - nixpkgs-unstable = { url = "nixpkgs/nixos-unstable"; }; - nixpkgs-latest = { url = "github:nixos/nixpkgs?ref=master"; }; + home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; }; + nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; }; - nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; }; - sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; }; + hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; }; + hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + hyprswitch = { url = "github:h3rmt/hyprswitch/release"; }; - hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; }; - hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - Hyprspace = { url = "github:KZDKM/Hyprspace"; inputs.hyprland.follows = "hyprland"; }; - hyprswitch = { url = "github:h3rmt/hyprswitch/release"; }; - - yazi = { url = "github:sxyazi/yazi"; }; - yazi-plugins = { url = "github:lordkekz/nix-yazi-plugins"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser = { url = "github:MarceColl/zen-browser-flake"; }; - ghostty = { url = "github:ghostty-org/ghostty"; }; + yazi = { url = "github:sxyazi/yazi"; }; + yazi-plugins = { url = "github:lordkekz/nix-yazi-plugins"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { url = "github:MarceColl/zen-browser-flake"; }; + ghostty = { url = "github:ghostty-org/ghostty"; }; }; outputs = { self, ... }@inputs: with inputs; let @@ -42,7 +40,7 @@ rec { pkgs = import nixpkgs { inherit system config; } // { unstable = import nixpkgs-unstable { inherit system config; }; latest = import nixpkgs-latest { inherit system config; }; - version = "24.11"; + version = "25.05"; }; nvidia-set = import ./flake-modules/nvidia.nix; @@ -70,6 +68,7 @@ rec { inherit system; modules = [ ./nix-on-droid.nix ]; specialArgs = let + pkgs.version = "24.05"; hyper = hyper-base // { inherit host; system = "aarch64-linux"; diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 04e30d3..8260cd7 100644 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/fish.nix b/home-modules/fish.nix index bfecb3b..c749406 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -17,7 +17,7 @@ ⠀⠀⠀⠀⠀⣰⣿⣿⣿⡄⠉⠉⢻⣿⣏⠉⠉⠀⠀⠀ TFM ⠀⠀⠀⠀⠰⣿⠟⠀⢻⣿⣆⠀⠀⠻⣿⠆⠀⠀⠀⠀ PROMPT - " | lolcat --force) + " | lolcat --force 2> /dev/null) msg=" $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-release | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 162a9b9..e1e6b7f 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -10,7 +10,7 @@ python311Packages.python-lsp-server jdt-language-server ruff - ruff-lsp + # ruff-lsp pyright lldb # debugger for llvm stuff yaml-language-server # yaml diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index cdaf089..9be707d 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -409,8 +409,7 @@ in { # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace"" "SUPER, T, exec, SESSION_FROM_DE=TRUE ${terminal}" "SUPER SHIFT, T, exec, ${terminal-exec}'ssh nxace'" - "SUPER, Z, exec, waybar_mode set ' '" - "SUPER, Z, submap, tuda" + "SUPER, Z, exec, zathura" "SUPER, U, exec, [tile] thunderbird " "SUPER, I, exec, ${terminal-exec}'hx ~/nix-dots/ && fish'" "SUPER SHIFT, I, exec, ${terminal-exec}'nh home switch || read'" @@ -428,7 +427,7 @@ in { "SUPER, A, execr, waybar_mode set ' 󰹑 '" "SUPER, A, submap, scrL" "SUPER, S, exec, spotify" - "SUPER, D, exec, vesktop" + "SUPER, D, exec, vesktop --disable-gpu-compositing" "SUPER, F, fullscreen" # "SUPER, G," "SUPER, H, movefocus, l" @@ -564,8 +563,12 @@ in { ${action_simple { key = "X"; cmd = "exec,firefox https://nx2.site";}} ${action_simple { key = "Y"; cmd = "exec,firefox https://youtube.com";}} ${action_simple { key = "P"; cmd = "exec,firefox https://pw.nx2.site";}} - bind = , Escape, exec, waybar_mode unset - bind = , Escape, submap, reset + ${action_simple { key = "P"; cmd = "exec,firefox https://pw.nx2.site";}} + bind=,Z,exec,waybar_mode set ' ' + bind=,Z,submap,tuda + bind=,Z,submap,reset + bind=,Escape,exec,waybar_mode unset + bind=,Escape,submap,reset submap = reset diff --git a/home-modules/mako.nix b/home-modules/mako.nix index 67d8c67..298516e 100644 --- a/home-modules/mako.nix +++ b/home-modules/mako.nix @@ -3,14 +3,16 @@ home.packages = with pkgs; [ libnotify ]; services.mako = with rice; { enable = true; - defaultTimeout = 10000; # in ms - backgroundColor = color.background; - textColor = color.foreground; - borderColor = color.border; - borderSize = border-width; - font = font.code.name; - borderRadius = rounding; - anchor = "top-right"; - margin = builtins.toString (gap-size * 2) ; + settings = { + defaultTimeout = 10000; # in ms + backgroundColor = color.background; + textColor = color.foreground; + borderColor = color.border; + borderSize = border-width; + font = font.code.name; + borderRadius = rounding; + anchor = "top-right"; + margin = builtins.toString (gap-size * 2) ; + }; }; } diff --git a/home-modules/nh.nix b/home-modules/nh.nix index 00db414..07db55c 100644 --- a/home-modules/nh.nix +++ b/home-modules/nh.nix @@ -7,7 +7,7 @@ nvd ]; sessionVariables = { - FLAKE = "${hyper.home}/nix-dots"; + NH_FLAKE = "${hyper.home}/nix-dots"; }; }; } diff --git a/home-modules/programming/js.nix b/home-modules/programming/js.nix index 8360c5d..668a083 100644 --- a/home-modules/programming/js.nix +++ b/home-modules/programming/js.nix @@ -2,5 +2,6 @@ { home.packages = with pkgs; [ nodejs + typescript-language-server ]; } diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix index 6ef5d6d..6a3fa2c 100644 --- a/home-modules/vscode.nix +++ b/home-modules/vscode.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, user, host, rice, allowed, ... }: +{ config, pkgs, lib, host, rice, ... }: { config = lib.mkIf (host != "NxACE") { home.packages = [ @@ -8,91 +8,80 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - jnoortheen.nix-ide - ms-python.python - ms-python.black-formatter - redhat.vscode-yaml - redhat.vscode-xml - ms-python.python - mhutchie.git-graph - github.vscode-pull-request-github - esbenp.prettier-vscode - gencer.html-slim-scss-css-class-completion - donjayamanne.githistory - mads-hartmann.bash-ide-vscode - bungcip.better-toml - arrterian.nix-env-selector - # ms-vscode-remote.remote-ssh - - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "just-black"; - publisher = "nur"; - version = "3.1.1"; - sha256 = "sha256-fatJZquCDsLDFGVzBol2D6LIZUbZ6GzqcVEFAwLodW0="; - } - { - name = "vscode-sshfs"; - publisher = "Kelvin"; - version = "1.26.1"; - sha256 = "sha256-WO9vYELNvwmuNeI05sUBE969KAiKYtrJ1fRfdZx3OYU="; - } - { - name = "color-highlight"; - publisher = "naumovs"; - version = "2.8.0"; - sha256 = "sha256-mT2P1lEdW66YkDRN6fi0rmmvvyBfXiJjAUHns8a8ipE="; - } - { - name = "dancehelix"; - publisher = "silverquark"; - version = "0.5.16"; - sha256 = "sha256-oHwtlbB18ctEnfStDOpJ+2/Kq41JZog8FVhTa1/s7m0="; - } - # { - # name = "remote-ssh-edit"; - # publisher = "ms-vscode-remote"; - # version = "0.86.0"; - # sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; - # } - # { - # name = "remote-ssh"; - # publisher = "ms-vscode-remote"; - # version = "0.110.2024030715"; - # sha256 = "sha256-gkxrBwPRDdLFaxc1/vYFBsv4Z0JOhDzb8LrLhkToC/g="; - # } - ]; - userSettings = { - workbench.colorTheme = "Just Black"; - editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace"; - remote.SSH.useLocalServer = false; + profiles.default ={ + userSettings = { + workbench.colorTheme = "Just Black"; + editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace"; + remote.SSH.useLocalServer = false; + }; + keybindings = [ + { + key = "ctrl+d"; + command = "editor.action.deleteLines"; + when = "textInputFocus"; + } + { + key = "ctrl+shift+d"; + command = "editor.action.duplicateSelection"; + when = "textInputFocus"; + } + { + # unset so that ctrl d is not set twice + key = ""; + command = "editor.action.addSelectionToNextFindMatch"; + when = "editorFocus"; + } + { + # unset so that ctrl shift d is not set twice + key = ""; + command = "workbench.view.debug"; + } + ]; + + extensions = with pkgs.vscode-extensions; [ + jnoortheen.nix-ide + ms-python.python + ms-python.black-formatter + redhat.vscode-yaml + redhat.vscode-xml + ms-python.python + mhutchie.git-graph + github.vscode-pull-request-github + esbenp.prettier-vscode + gencer.html-slim-scss-css-class-completion + donjayamanne.githistory + mads-hartmann.bash-ide-vscode + bungcip.better-toml + arrterian.nix-env-selector + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "just-black"; + publisher = "nur"; + version = "3.1.1"; + sha256 = "sha256-fatJZquCDsLDFGVzBol2D6LIZUbZ6GzqcVEFAwLodW0="; + } + { + name = "vscode-sshfs"; + publisher = "Kelvin"; + version = "1.26.1"; + sha256 = "sha256-WO9vYELNvwmuNeI05sUBE969KAiKYtrJ1fRfdZx3OYU="; + } + { + name = "color-highlight"; + publisher = "naumovs"; + version = "2.8.0"; + sha256 = "sha256-mT2P1lEdW66YkDRN6fi0rmmvvyBfXiJjAUHns8a8ipE="; + } + { + name = "dancehelix"; + publisher = "silverquark"; + version = "0.5.16"; + sha256 = "sha256-oHwtlbB18ctEnfStDOpJ+2/Kq41JZog8FVhTa1/s7m0="; + } + ]; + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; }; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - keybindings = [ - { - key = "ctrl+d"; - command = "editor.action.deleteLines"; - when = "textInputFocus"; - } - { - key = "ctrl+shift+d"; - command = "editor.action.duplicateSelection"; - when = "textInputFocus"; - } - { - # unset so that ctrl d is not set twice - key = ""; - command = "editor.action.addSelectionToNextFindMatch"; - when = "editorFocus"; - } - { - # unset so that ctrl shift d is not set twice - key = ""; - command = "workbench.view.debug"; - } - ]; }; }; diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix index ef3bf7e..e142715 100644 --- a/home-modules/waybar.nix +++ b/home-modules/waybar.nix @@ -175,6 +175,7 @@ if __name__ == "__main__": margin-bottom = 0; margin-right = 0; spacing = 10; + fixed-center = true; modules-left = [ # "cpu" # "memory" @@ -189,7 +190,7 @@ if __name__ == "__main__": ]; modules-right = [ "custom/mode" - "custom/caldav_event" + # "custom/caldav_event" "custom/cclock" "tray" ]; @@ -212,6 +213,7 @@ if __name__ == "__main__": format = "󰃰${sep}{}"; exec = "caldav_event"; restart-interval = 60; + max-width = 60; }; "custom/mode" = { exec = "cat /tmp/waybar-mode"; @@ -311,6 +313,10 @@ if __name__ == "__main__": color: rgb(${f accent.bright}); } + #workspaces { + font-family: ${rice.font.code.name}; + } + #workspaces button { color: rgb(${f accent.base}); padding-left: 15px; @@ -335,7 +341,7 @@ if __name__ == "__main__": color: rgb(${f red.base}); } - #window, #custom-ctimeremaining { + #window, #custom-caldav_event { font-family: ${rice.font.base.name}, ${rice.font.code.name}; color: rgb(${f tertiary.bright}); } diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index f389913..102926e 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -269,6 +269,7 @@ { mime = "audio/*"; use = "play"; } { mime = "application/x-httpd-php"; use = [ "edit" "browser" ]; } + { mime = "application/javascript"; use = "edit"; } { mime = "application/json"; use = "edit"; } { mime = "application/ld+json"; use = "edit"; } { mime = "application/pdf"; use = "document"; } diff --git a/home.nix b/home.nix index e3dc5af..e089093 100644 --- a/home.nix +++ b/home.nix @@ -117,7 +117,7 @@ wl-clipboard xclip xfce.thunar - xournal + # xournal yt-dlp inputs.zen-browser.packages."${system}".default diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix index 9c88a2e..4b237d2 100644 --- a/system-modules/fonts.nix +++ b/system-modules/fonts.nix @@ -1,9 +1,4 @@ -{ - pkgs, - # pkgs-unstable, - rice, - ... -}: +{ pkgs, rice, ... }: { fonts.packages = with pkgs; [ noto-fonts @@ -12,10 +7,14 @@ noto-fonts-emoji newcomputermodern atkinson-hyperlegible - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + nerd-fonts.jetbrains-mono + nerd-fonts.zed-mono + nerd-fonts.profont + nerd-fonts.proggy-clean-tt + nerd-fonts.heavy-data + nerd-fonts._3270 ] ++ (with rice.font; [ base.package code.package - # ]) ++ (with pkgs-unstable; [ ]); } diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index 86e2351..dfa9c5e 100644 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -46,7 +46,7 @@ } else {}; hardware.graphics.extraPackages = if host == "NxXPS" then with pkgs; [ - (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then vaapiIntel else intel-vaapi-driver) + (if (lib.versionOlder (lib.versions.majorMinor lib.version) "25.05") then vaapiIntel else intel-vaapi-driver) libvdpau-va-gl intel-media-driver ] else [];