diff --git a/dot_config/home-manager/flake.lock b/dot_config/home-manager/flake.lock index 8bf8f88..61dd57d 100644 --- a/dot_config/home-manager/flake.lock +++ b/dot_config/home-manager/flake.lock @@ -1,18 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -26,11 +20,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -54,22 +48,6 @@ "type": "github" } }, - "gnomeExtensions": { - "locked": { - "lastModified": 1726816850, - "narHash": "sha256-aBOeyoNU1W8dlzDWwFN1/9b1S0niUcEy6NTU5YQj+CE=", - "owner": "honnip", - "repo": "nixpkgs", - "rev": "b072c7df2afaa73ad099e2588d73a0c035aae690", - "type": "github" - }, - "original": { - "owner": "honnip", - "ref": "update-gnome-extensions", - "repo": "nixpkgs", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", @@ -78,11 +56,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729068734, - "narHash": "sha256-JOqmdtcdQohQL1qvTDrVJvd+nkydRm+Lyf3qVF5iQ5E=", + "lastModified": 1730790589, + "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=", "owner": "helix-editor", "repo": "helix", - "rev": "d1b8129491124ce6068e95ccc58a7fefb1c9db45", + "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e", "type": "github" }, "original": { @@ -98,11 +76,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -132,11 +110,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -148,11 +126,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -179,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -195,7 +173,6 @@ }, "root": { "inputs": { - "gnomeExtensions": "gnomeExtensions", "helix": "helix", "home-manager": "home-manager", "nixgl": "nixgl", @@ -205,21 +182,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], "nixpkgs": [ "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { diff --git a/dot_config/home-manager/flake.nix b/dot_config/home-manager/flake.nix index 9596530..063169c 100644 --- a/dot_config/home-manager/flake.nix +++ b/dot_config/home-manager/flake.nix @@ -9,8 +9,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixgl.url = "github:nix-community/nixGL"; - gnomeExtensions.url = "github:honnip/nixpkgs/update-gnome-extensions"; - helix.url = "github:helix-editor/helix"; }; @@ -19,7 +17,6 @@ nixpkgs, nixpkgs-unstable, home-manager, - gnomeExtensions, ... } @ inputs: let inherit (self) outputs; diff --git a/dot_config/home-manager/home/gnome.nix b/dot_config/home-manager/home/gnome.nix index 074415a..981580e 100644 --- a/dot_config/home-manager/home/gnome.nix +++ b/dot_config/home-manager/home/gnome.nix @@ -6,10 +6,10 @@ programs.gnome-shell = { enable = true; extensions = [ - {package = pkgs.gnomeExt.gnomeExtensions.appindicator;} + {package = pkgs.gnomeExtensions.appindicator;} {package = pkgs.gnomeExtensions.ddterm;} - {package = pkgs.gnomeExt.gnomeExtensions.alphabetical-app-grid;} - {package = pkgs.gnomeExt.gnomeExtensions.gsconnect;} + {package = pkgs.gnomeExtensions.alphabetical-app-grid;} + {package = pkgs.gnomeExtensions.gsconnect;} {package = pkgs.gnomeExtensions.paperwm;} {package = pkgs.gnomeExtensions.night-theme-switcher;} {package = pkgs.gnomeExtensions.blur-my-shell;} diff --git a/dot_config/home-manager/home/gui.nix b/dot_config/home-manager/home/gui.nix index 6013380..0e6a1db 100644 --- a/dot_config/home-manager/home/gui.nix +++ b/dot_config/home-manager/home/gui.nix @@ -3,21 +3,16 @@ config, pkgs, ... -}: let - nixGLIntel = inputs.nixgl.packages."${pkgs.system}".nixGLIntel; -in { +}: { imports = [ - (builtins.fetchurl { - url = "https://raw.githubusercontent.com/Smona/home-manager/nixgl-compat/modules/misc/nixgl.nix"; - sha256 = "01dkfr9wq3ib5hlyq9zq662mp0jl42fw3f6gd2qgdf8l8ia78j7i"; - }) ]; - nixGL.prefix = "${nixGLIntel}/bin/nixGLIntel"; + nixGL.packages = inputs.nixgl.packages; + nixGL.defaultWrapper = "mesa"; + # nixGL.offloadWrapper = "nvidiaPrime"; + nixGL.installScripts = ["mesa"]; home.packages = with pkgs; [ - nixGLIntel - adw-gtk3 discord @@ -35,7 +30,7 @@ in { }; programs.wezterm = { - enable = true; + enable = false; package = config.lib.nixGL.wrap pkgs.wezterm; extraConfig = '' return { diff --git a/dot_config/home-manager/overlays/default.nix b/dot_config/home-manager/overlays/default.nix index 1685c9f..bb89376 100644 --- a/dot_config/home-manager/overlays/default.nix +++ b/dot_config/home-manager/overlays/default.nix @@ -2,11 +2,6 @@ additions = final: _prev: import ../pkgs final.pkgs; modifications = final: prev: { - gnomeExt = import inputs.gnomeExtensions { - system = final.system; - config.allowUnfree = true; - }; - mods = { }; };