diff --git a/flake.lock b/flake.lock index c013bf6..e5838d0 100644 --- a/flake.lock +++ b/flake.lock @@ -337,11 +337,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1695973661, - "narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=", + "lastModified": 1698410321, + "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", "owner": "numtide", "repo": "devshell", - "rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31", + "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1697230660, - "narHash": "sha256-Faw7qTLNVZYxW1nBHKhfrKY0lOicJaxxHh5u/Gq4M3Q=", + "lastModified": 1699099781, + "narHash": "sha256-2WAs839yL6xmIPBLNVwbft46BDh0/RAjq1bAKNRqeR4=", "owner": "nix-community", "repo": "disko", - "rev": "6ad5c9c17cbd5514ce0cc2692dd82dd6d8e5d879", + "rev": "548962c50b8afad7b8c820c1d6e21dc8394d6e65", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1697371398, - "narHash": "sha256-Tn5feZ5SoYHQM9BTjw5e06DuNu8wc21gC9+bq/kXA8Y=", + "lastModified": 1699025595, + "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b67ae3f665379c06999641f99d94dba75b53876", + "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", "type": "github" }, "original": { @@ -721,11 +721,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1697371715, - "narHash": "sha256-1ZV4qoL1B35DsciS/inC+z6vAwjxjWHL3+4G4QQhT0A=", + "lastModified": 1698581311, + "narHash": "sha256-27whmW7vBrNruotHJyMuXOWiDdqWyuBhntngpw5bktc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "af42578368ca0c97d5836ba55b146745911aaecc", + "rev": "0fa525dd0b4f45cabcd510ab83a4d1df3b30d56c", "type": "github" }, "original": { @@ -756,11 +756,11 @@ ] }, "locked": { - "lastModified": 1697304130, - "narHash": "sha256-ovr9mPbMW9UxI1iSeQrIJO8Q2YfLTe8hcRkl6ec0v3c=", + "lastModified": 1699060745, + "narHash": "sha256-hAPo+/xRA/8ICzVMCHgbd5EXwNy1CVrN5mXcg00VK2s=", "owner": "astro", "repo": "microvm.nix", - "rev": "38ce07ca9c5c02c391682defe0bfff947cc5d7a1", + "rev": "decd60449fe2e4130d4d7246513844a08619f4f0", "type": "github" }, "original": { @@ -772,15 +772,16 @@ "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", + "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1696813662, - "narHash": "sha256-dQTBtvjdzKa7+ViWiDdnBpdtDS4FD+gWuJJrfIrxSkc=", + "lastModified": 1699060277, + "narHash": "sha256-As0PilG8NEQzIMOFIzfI3zkBNH2CJHZJXRL5Rc36Ojc=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "7cdbfd5ffe59fe54fd5c44be96f58c45e25d5b62", + "rev": "20a24e8b1004d3293525334ccf3254c083d6fbaa", "type": "github" }, "original": { @@ -789,6 +790,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -796,11 +819,11 @@ ] }, "locked": { - "lastModified": 1697340827, - "narHash": "sha256-XlrR68N7jyaZ0bs8TPrhqcWG0IPG3pbjrKzJMpYOsos=", + "lastModified": 1699156599, + "narHash": "sha256-Qk9ZE/pG9lNIGUVNArJxL0Hc0Soa92eQPPIhcDwWinU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "29977d0796c058bbcfb2df5b18eb5badf1711007", + "rev": "5388a4002179d6778d212dc2fdcc7ac3fdbd5b65", "type": "github" }, "original": { @@ -847,11 +870,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1697100850, - "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", + "lastModified": 1699159446, + "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", + "rev": "627bc9b88256379578885a7028c9e791c29fb581", "type": "github" }, "original": { @@ -884,11 +907,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -900,11 +923,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1697331025, - "narHash": "sha256-a5LJWWHfEvnq9tBd9UyNVdtzLXc2ehu5MCp//Bex/0E=", + "lastModified": 1698540503, + "narHash": "sha256-YN6DJQc7SMe6ep9FhD2BGl92bo24NPNRWjADEJE4xeU=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "05c07c73de74725ec7efa6609011687035a92c0f", + "rev": "ce2acb20a405bf6f910081c2adc988bbc8100e4c", "type": "github" }, "original": { @@ -971,11 +994,11 @@ ] }, "locked": { - "lastModified": 1697372844, - "narHash": "sha256-Ut7Bojh7SqNf2pKRIoGPWWRU9ZjvSxSJS+GByC8AHD0=", + "lastModified": 1699182710, + "narHash": "sha256-86ZgOW3S0Eayvrbe/Q4hWDQ0fz09Nz9KQmFneFQow/Y=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "3bd7c4e831bc3dc82828e179397b06652adf2878", + "rev": "3d8a6352b241192e291640d6305e895b190f3f07", "type": "github" }, "original": { @@ -986,11 +1009,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696810678, - "narHash": "sha256-XAw8D1ZEbdqwhSvn8RsgeeNrDktx4YSikTb5V4ArsrA=", + "lastModified": 1698977350, + "narHash": "sha256-OUDOHWrX3EjX/MlOoCHEb3JMONklbpu4Wa+Xf5s/U+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "35c640b19a189ce3a86698ce2fdcd87d085a339b", + "rev": "4285a2a67daf39e63d9564a47773a1c2081c36a8", "type": "github" }, "original": { @@ -1037,11 +1060,11 @@ ] }, "locked": { - "lastModified": 1699089411, - "narHash": "sha256-IhhzLIQW/cKQQfkQ7B7urgAzQiPHlLKgMeJbSBV02F8=", + "lastModified": 1699136867, + "narHash": "sha256-PhL/EMcOd7UcNfwhbzmBxWKoPHFcBHZNrrEZY9l5KCk=", "owner": "nix-community", "repo": "nixvim", - "rev": "1aecd4c2035b46c49b7f4548e0255b986d59410f", + "rev": "1e91231e863c8681edd8d1c887e9677142e43bfd", "type": "github" }, "original": { @@ -1146,11 +1169,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1696846637, - "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", + "lastModified": 1698852633, + "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", + "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0", "type": "github" }, "original": { @@ -1231,11 +1254,11 @@ ] }, "locked": { - "lastModified": 1697094532, - "narHash": "sha256-SvTC0wNCGpoUBvo9//IoTv5NQjozY0Y5ViTziRO+vt8=", + "lastModified": 1698846025, + "narHash": "sha256-crZer9Qgr7GptKjIN/1aAT1bCtGA+/+9eG+aoKuIQPg=", "owner": "danth", "repo": "stylix", - "rev": "feceaa9d81725c0ca28ab46326b6dd1310a10dea", + "rev": "07795247c2db08711bbd9503e01752c315be0805", "type": "github" }, "original": { @@ -1358,11 +1381,11 @@ ] }, "locked": { - "lastModified": 1695822946, - "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=", + "lastModified": 1698438538, + "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a", + "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", "type": "github" }, "original": { @@ -1410,11 +1433,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1697336859, - "narHash": "sha256-1R8lPIH82OgrBchW5RGkJMB0NzH9cChljmGOFLoS748=", + "lastModified": 1699064982, + "narHash": "sha256-BAKfy2O0Df1JdNWn2rPsrjbIyOdGjJZeGxXZkvMZzvU=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "0fe5cc4682c30b178dfb2c9c0e3ad19d20d0bc6f", + "rev": "9f2e1420e122030953734f795eaf8cf000002abd", "type": "github" }, "original": { diff --git a/modules/config/users.nix b/modules/config/users.nix index 3824d3b..50e08bb 100644 --- a/modules/config/users.nix +++ b/modules/config/users.nix @@ -26,5 +26,6 @@ gitea = uidGid 983; redis-paperless = uidGid 982; nixseparatedebuginfod = uidGid 981; + msr = uidGid 980; }; } diff --git a/users/myuser/dev/default.nix b/users/myuser/dev/default.nix index b7f4a57..e3dd5de 100644 --- a/users/myuser/dev/default.nix +++ b/users/myuser/dev/default.nix @@ -4,11 +4,11 @@ ./gdb.nix ]; - persistence."/state".directories = [ - ".cargo" - ]; - home = { + persistence."/state".directories = [ + ".cargo" + ]; + extraOutputsToInstall = ["man" "doc" "devdoc"]; packages = with pkgs; [ git-lfs diff --git a/users/myuser/graphical/theme.nix b/users/myuser/graphical/theme.nix index 054cd3c..c597bc9 100644 --- a/users/myuser/graphical/theme.nix +++ b/users/myuser/graphical/theme.nix @@ -4,14 +4,6 @@ pkgs, ... }: { - home.pointerCursor = { - gtk.enable = true; - x11.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 24; - }; - xresources.properties = { "Xft.hinting" = true; "Xft.antialias" = true; @@ -59,5 +51,11 @@ stylix = { inherit (nixosConfig.stylix) polarity base16Scheme; targets.gtk.enable = true; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + # size = 24; + }; }; } diff --git a/users/myuser/neovim/default.nix b/users/myuser/neovim/default.nix index bb7571a..ea14c75 100644 --- a/users/myuser/neovim/default.nix +++ b/users/myuser/neovim/default.nix @@ -25,7 +25,7 @@ # init = builtins.readFile ./aaa/init.lua; #}; - home.shellAliases.nixvim = lib.getExe (pkgs.nixvim.makeNixvimWithModule { + home.shellAliases.nixvim = lib.getExe (pkgs.nixvim.makeNixvim { package = pkgs.neovim-unwrapped.overrideAttrs (_final: prev: { nativeBuildInputs = (prev.nativeBuildInputs or []) ++ [pkgs.makeWrapper]; postInstall =