From 9376d6df402b9b9a24c36c59567eee3f59ce4e2a Mon Sep 17 00:00:00 2001 From: blahai Date: Tue, 17 Sep 2024 19:55:45 +0300 Subject: [PATCH] horror --- flake.lock | 100 ++++++++++++++++----------- hosts/nyx/configuration.nix | 20 +++++- hosts/nyx/home.nix | 2 +- modules/home-manager/ags/default.nix | 47 ++++--------- 4 files changed, 93 insertions(+), 76 deletions(-) diff --git a/flake.lock b/flake.lock index d714126..2cc75da 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { @@ -39,11 +41,11 @@ ] }, "locked": { - "lastModified": 1725016199, - "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=", + "lastModified": 1725199881, + "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906", + "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "type": "github" }, "original": { @@ -59,7 +61,7 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems_2", "yafas": "yafas" }, @@ -172,11 +174,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -221,16 +223,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1725109672, - "narHash": "sha256-YEYhBaoaYqCc3nNd/XdmmtmQy63FPuMInHCtHkZdmJQ=", + "lastModified": 1725367654, + "narHash": "sha256-1hiNRCEdSZLfyH2y06S+gqUbiSwbwdktStPSJuPesaM=", "ref": "refs/heads/main", - "rev": "838ed87d6ffae0dbdc8a3ecaac2c8be006f6d053", - "revCount": 5167, + "rev": "9b54342baa27d8de0460e1103ec4c3cc65592ed8", + "revCount": 5182, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -284,11 +286,11 @@ ] }, "locked": { - "lastModified": 1724174162, - "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=", + "lastModified": 1725188252, + "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c", + "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "type": "github" }, "original": { @@ -369,6 +371,25 @@ "type": "github" } }, + "matugen": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1711657889, + "narHash": "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc=", + "owner": "InioX", + "repo": "matugen", + "rev": "566277529dadc2b149a8bd8b9859ea791ecdef26", + "type": "github" + }, + "original": { + "owner": "InioX", + "ref": "v2.2.0", + "repo": "matugen", + "type": "github" + } + }, "more-waita": { "flake": false, "locked": { @@ -410,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -442,11 +463,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -458,15 +479,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", - "owner": "NixOS", + "lastModified": 1691186842, + "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -474,11 +495,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -494,6 +515,7 @@ "chaotic": "chaotic", "home-manager": "home-manager_2", "hyprland": "hyprland", + "matugen": "matugen", "more-waita": "more-waita", "nixpkgs": "nixpkgs_4", "sops-nix": "sops-nix", @@ -525,11 +547,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1725201042, + "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7", "type": "github" }, "original": { @@ -546,11 +568,11 @@ ] }, "locked": { - "lastModified": 1725077747, - "narHash": "sha256-4SwFxe789QXOtGNFbwldpqFzkKxIFuyDysFttFWB5eM=", + "lastModified": 1725336973, + "narHash": "sha256-IQPxrZmtav2w0Cq+WkxYANGrlBZW1UhrHOogc9dhLQE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "305b6034ad329268eb33c079e2d33740ccf329ea", + "rev": "f0d3b27df2a5b6c6b2fe32984e4ae6c21a441f2b", "type": "github" }, "original": { @@ -621,11 +643,11 @@ ] }, "locked": { - "lastModified": 1724073926, - "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", + "lastModified": 1725203932, + "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", + "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "type": "github" }, "original": { diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 24cebab..c5b3155 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -8,6 +8,8 @@ inputs.home-manager.nixosModules.default ]; + documentation.nixos.enable = false; + boot = { tmp.cleanOnBoot = true; loader = { @@ -79,6 +81,8 @@ home-manager = { extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; + useUserPackages = true; + verbose = true; users = { "pingu" = import ./home.nix; }; @@ -139,8 +143,18 @@ settings = { experimental-features = [ "nix-command" "flakes" ]; auto-optimise-store = true; - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + substituters = [ + "https://hyprland.cachix.org" + "https://cache.nixos.org" + "https://nixpkgs-wayland.cachix.org" + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; trusted-users = [ "@wheel" "pingu" "root" ]; }; gc = { @@ -193,7 +207,7 @@ material-design-icons material-symbols ddcutil - (python312.withPackages (ps: with ps; [ + (python311.withPackages (ps: with ps; [ pillow material-color-utilities materialyoucolor diff --git a/hosts/nyx/home.nix b/hosts/nyx/home.nix index 3502353..2a564e0 100644 --- a/hosts/nyx/home.nix +++ b/hosts/nyx/home.nix @@ -1,6 +1,6 @@ { inputs, config, pkgs, ... }: let - moreWaita = pkgs.stdenv.mkDerivation { + moreWaita = pkgs.stdenv.mkDerivation { name = "MoreWaita"; src = inputs.more-waita; installPhase = '' diff --git a/modules/home-manager/ags/default.nix b/modules/home-manager/ags/default.nix index e9e161f..44b8db7 100644 --- a/modules/home-manager/ags/default.nix +++ b/modules/home-manager/ags/default.nix @@ -3,28 +3,20 @@ imports = [ inputs.ags.homeManagerModules.default ]; home.packages = with pkgs; [ - gnome.gnome-control-center - blueberry - gammastep - gnome.gnome-bluetooth - material-symbols - gnome-usage - ddcutil - inotify-tools - ollama - pywal + bun dart-sass - hicolor-icon-theme - yad - fuzzel - gradience - adw-gtk3 - (python311.withPackages (p: [ - p.material-color-utilities - p.pywayland - p.materialyoucolor - p.libsass - ])) + fd + brightnessctl + swww + inputs.matugen.packages.${system}.default + slurp + wl-clipboard + wayshot + swappy + hyprpicker + pavucontrol + networkmanager + gtk3 ]; #home.activation = { @@ -42,18 +34,7 @@ # additional packages to add to gjs's runtime extraPackages = with pkgs; [ - hicolor-icon-theme - gnome-usage - gtksourceview - gtksourceview4 - ollama - python311Packages.material-color-utilities - python311Packages.pywayland - pywal - dart-sass - webkitgtk - webp-pixbuf-loader - ydotool + accountsservice ]; }; }