From 9b38825bfeb5de1700a3a6f110f59b2e2a00592a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Mon, 22 Jul 2024 20:10:13 +0200 Subject: [PATCH] update system --- flake.lock | 93 ++++++++----------- .../desktops/hyprland/default.nix | 20 ++-- modules/home-manager/packages/default.nix | 4 - modules/home-manager/programs/neovide.nix | 11 +-- modules/home-manager/theme/md3-evo.nix | 2 +- 5 files changed, 52 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index ff388c7..0f751a7 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1717576207, - "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", + "lastModified": 1721135360, + "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", "owner": "Kirottu", "repo": "anyrun", - "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", + "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", "type": "github" }, "original": { @@ -74,22 +74,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -119,11 +103,11 @@ ] }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -152,7 +136,10 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": [ + "nixvim", + "flake-compat" + ], "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -164,11 +151,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -206,11 +193,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1721534365, + "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", "type": "github" }, "original": { @@ -227,11 +214,11 @@ ] }, "locked": { - "lastModified": 1719677234, - "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -268,11 +255,11 @@ ] }, "locked": { - "lastModified": 1719128254, - "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "50581970f37f06a4719001735828519925ef8310", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -290,11 +277,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719885773, - "narHash": "sha256-dFuBTBoLUP/qfphSof3DNP9PKvAlU96lmqLMJggMyqA=", + "lastModified": 1721160462, + "narHash": "sha256-/VxDWswjySr3CUuMRP4OBBP3sFSps7r1Bh/AJkZSdVk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "6eae355a1071a94465502c11c5efb241caf1dc0e", + "rev": "b2d62f3b793495c1156cba6a99512cd95ac2c439", "type": "github" }, "original": { @@ -321,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { @@ -337,11 +324,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { @@ -365,11 +352,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719860300, - "narHash": "sha256-ZeF+zI+/53HeS567/mXS2Gw+w8k9FsjRC/TzoVQOpi4=", + "lastModified": 1721651056, + "narHash": "sha256-GOm1qWrT0MurD/84RzWj/E6GPmzPT5nH/hrSYohtlxs=", "owner": "nix-community", "repo": "nixvim", - "rev": "079c2c479b5707adf0b03f817be30945c92c15cf", + "rev": "6dc0bda459bcfb2a38cf7b6ed1d6a5d6a8105f00", "type": "github" }, "original": { @@ -380,11 +367,11 @@ }, "nur": { "locked": { - "lastModified": 1719908032, - "narHash": "sha256-veUPZ3anuH+PQn/CLcNlP0oiuHctzeIDa2w+DzVGE4E=", + "lastModified": 1721666469, + "narHash": "sha256-RSdiElnKDUFnHtiWzu5yMyXcyWBFxRjnyOVaObmawYQ=", "owner": "nix-community", "repo": "NUR", - "rev": "6206fd683edcb79c4a0592cf25e610449ed0d82d", + "rev": "382e7f1785b5366449ccc971c471ebd271274580", "type": "github" }, "original": { @@ -457,11 +444,11 @@ ] }, "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index 7323524..0a9ecc0 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -141,20 +141,20 @@ evince baobab gnome.gvfs - gnome.gnome-keyring - gnome.nautilus - gnome.gnome-calendar + gnome-keyring + nautilus + gnome-calendar gnome.gnome-characters gnome.gnome-contacts gnome.gnome-clocks - gnome.gnome-calculator - gnome.simple-scan - gnome.eog - gnome.geary - gnome.ghex + gnome-calculator + simple-scan + eog + geary + ghex gnome.gnome-weather - gnome.gnome-keyring - gnome.gnome-disk-utility + gnome-keyring + gnome-disk-utility # fixes xorg.xrandr ]; diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix index b999bfd..ad129c7 100644 --- a/modules/home-manager/packages/default.nix +++ b/modules/home-manager/packages/default.nix @@ -13,18 +13,14 @@ # media jellyfin-media-player - youtube-dl - # tartube yt-dlp f3d mpv makemkv handbrake metadata-cleaner - #bitwarden # chat apps - threema-desktop vesktop discord element-desktop diff --git a/modules/home-manager/programs/neovide.nix b/modules/home-manager/programs/neovide.nix index 83a0d21..3e18f19 100644 --- a/modules/home-manager/programs/neovide.nix +++ b/modules/home-manager/programs/neovide.nix @@ -1,15 +1,6 @@ { pkgs, ... }: { - home.packages = [ - (pkgs.neovide.overrideAttrs { - src = pkgs.fetchFromGitHub { - owner = "neovide"; - repo = "neovide"; - rev = "1db63d93b18cc1eb5ac5b3e67b3ca63505f10800"; - hash = "sha256-iBGDxOro1yd98d5XPIw824dapuHDimuP27f/nKbh6qo="; - }; - }) - ]; + home.packages = [ pkgs.neovide ]; xdg.configFile."neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide" { maximized = false; fork = true; diff --git a/modules/home-manager/theme/md3-evo.nix b/modules/home-manager/theme/md3-evo.nix index 4a22d68..6f39bef 100644 --- a/modules/home-manager/theme/md3-evo.nix +++ b/modules/home-manager/theme/md3-evo.nix @@ -176,7 +176,7 @@ in runtimeInputs = [ pkgs.matugen pkgs.swww - pkgs.gnome.zenity + pkgs.zenity ]; text = '' WALLPAPER=${config.xdg.configHome}/matugen/wallpaper