From 1fe8d17523935aacfa151e9ce0a21eafd5171ace Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sun, 6 Oct 2024 14:14:49 +0200 Subject: [PATCH] Remove prism --- flake.lock | 189 +++++-------------------------- flake.nix | 3 +- modules/home/desktop/default.nix | 11 +- 3 files changed, 31 insertions(+), 172 deletions(-) diff --git a/flake.lock b/flake.lock index 5d2fd51..b622fc1 100644 --- a/flake.lock +++ b/flake.lock @@ -135,22 +135,6 @@ "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -173,24 +157,6 @@ "inputs": { "flake-utils": "flake-utils_3" }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "flake-utils-plus_2": { - "inputs": { - "flake-utils": "flake-utils_4" - }, "locked": { "lastModified": 1715533576, "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", @@ -242,24 +208,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -289,38 +237,15 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "prism", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698162493, - "narHash": "sha256-Zehw3cWiTXGGlDDjzTgIX1BhWG+049D/RcSMAiypAcM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "14b54157201fd574b0fa1b3ce7394c9d3a87fbc1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", "repo": "home-manager", "type": "github" } @@ -628,11 +553,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -674,6 +599,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1728067476, + "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1725762081, "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", @@ -707,27 +648,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -765,26 +690,6 @@ "type": "github" } }, - "prism": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", - "snowfall-lib": "snowfall-lib" - }, - "locked": { - "lastModified": 1714675036, - "narHash": "sha256-xGOQz4R8v0yy16tDhQpuswqeOuMm4bNZ9O4lhs6reK8=", - "owner": "IogaMaster", - "repo": "prism", - "rev": "3822346485a01fefb27f12d9f397c890b599ff7e", - "type": "github" - }, - "original": { - "owner": "IogaMaster", - "repo": "prism", - "type": "github" - } - }, "root": { "inputs": { "alacritty-theme": "alacritty-theme", @@ -796,9 +701,9 @@ "nix-matlab": "nix-matlab", "nix-topology": "nix-topology", "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", - "prism": "prism", - "snowfall-lib": "snowfall-lib_2", + "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", "yazi-flavors": "yazi-flavors" } @@ -807,29 +712,6 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils-plus": "flake-utils-plus", - "nixpkgs": [ - "prism", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, - "snowfall-lib_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" ] @@ -853,7 +735,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1727734513, @@ -929,21 +811,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", diff --git a/flake.nix b/flake.nix index a2db98b..35de252 100644 --- a/flake.nix +++ b/flake.nix @@ -34,13 +34,14 @@ sops-nix.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; nix-colors.url = "github:Misterio77/nix-colors"; - prism.url = "github:IogaMaster/prism"; nix-topology.url = "github:oddlama/nix-topology"; nix-topology.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index c99c94a..e969f43 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -20,19 +20,10 @@ in }; # Do not make conditional, just toggle things on and off - imports = [ - inputs.prism.homeModules.prism - inputs.nix-colors.homeManagerModules.default - ]; + imports = [ inputs.nix-colors.homeManagerModules.default ]; config = lib.mkIf cfg.enable { # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark"; - prism = { - enable = true; - wallpapers = ./wallpapers; - colorscheme = inputs.nix-colors.colorschemes.${cfg.colorscheme}; - }; - gtk = { enable = true; theme = {