From 49f6bc0926415931704fce4c2275079410315047 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Tue, 8 Oct 2024 16:53:10 +0100 Subject: [PATCH] added stylix but not working yet, switched from anyrun to wofi cause looks nice innit --- flake.lock | 288 +++++++++++++++++++++++---- flake.nix | 10 +- home-manager/home.nix | 43 +--- home-manager/hyprland.nix | 2 +- home-manager/stylix.nix | 7 + hosts/gabbielaptop/configuration.nix | 2 +- modules/stylix.nix | 7 + 7 files changed, 269 insertions(+), 90 deletions(-) create mode 100644 home-manager/stylix.nix create mode 100644 modules/stylix.nix diff --git a/flake.lock b/flake.lock index cc208d0..4150849 100644 --- a/flake.lock +++ b/flake.lock @@ -21,25 +21,69 @@ "type": "github" } }, - "anyrun": { + "base16": { "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" + "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1721135360, - "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", - "owner": "anyrun-org", - "repo": "anyrun", - "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", "type": "github" }, "original": { - "owner": "anyrun-org", - "repo": "anyrun", + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", "type": "github" } }, @@ -151,28 +195,23 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, + "flake-compat_4": { + "flake": false, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "flake-parts_2": { + "flake-parts": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -193,7 +232,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -216,7 +255,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1726560853, @@ -232,6 +271,27 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flatpaks": { "inputs": { "nixpkgs": "nixpkgs", @@ -252,6 +312,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -326,6 +402,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -367,11 +460,32 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], @@ -461,11 +575,27 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -541,7 +671,6 @@ "root": { "inputs": { "aagl": "aagl", - "anyrun": "anyrun", "disko": "disko", "flatpaks": "flatpaks", "home-manager": "home-manager", @@ -549,7 +678,8 @@ "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "satisfactory-server": "satisfactory-server", - "stablepkgs": "stablepkgs" + "stablepkgs": "stablepkgs", + "stylix": "stylix" } }, "rust-overlay": { @@ -631,18 +761,48 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_2", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_3", + "systems": "systems_3", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1728312564, + "narHash": "sha256-z01cTK5VeLFOUekhAXrJHLDzE74uAxxMwE2p6+Wp9Sg=", + "owner": "danth", + "repo": "stylix", + "rev": "63426a59e714c4389c5a8e559dee05a0087a3043", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -676,6 +836,54 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -699,7 +907,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index bf303f8..05f14c6 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Anyrun launcher - anyrun = { - url = "github:anyrun-org/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # Declarative flatpak management, documentation states overriding nixpkgs is not supported flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3"; @@ -45,6 +39,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + stylix.url = "github:danth/stylix"; }; outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs: @@ -66,6 +61,7 @@ ./modules/aagl.nix inputs.aagl.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote + inputs.stylix.nixosModules.stylix { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects # Imports home-manager module for use within nixos, not reccomended for use WITH standalone version @@ -90,9 +86,9 @@ modules = [ ./home-manager/home.nix # ./home-manager/librewolf.nix - inputs.anyrun.homeManagerModules.default inputs.flatpaks.homeManagerModules.default inputs.nixvim.homeManagerModules.default +# inputs.stylix.HomeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine ]; }; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 55292e9..449b2e1 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -16,6 +16,7 @@ ./nixvim.nix ./nextcloud.nix ./git.nix + ./stylix.nix ]; # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed @@ -56,6 +57,7 @@ bitwarden-desktop xwaylandvideobridge virtualbox + wofi ]; home.sessionVariables = { @@ -146,47 +148,6 @@ }; }; - programs.anyrun = { - enable = true; - config = { - plugins = [ - # An array of all the plugins you want, which either can be paths to the .so files, or their packages - inputs.anyrun.packages.${pkgs.system}.applications - inputs.anyrun.packages.${pkgs.system}.rink -# ./some_plugin.so -# "${inputs.anyrun.packages.${pkgs.system}.anyrun-with-all-plugins}/lib/kidex" - ]; - x = { fraction = 0.5; }; - y = { fraction = 0.3; }; - width = { fraction = 0.3; }; - hideIcons = false; - ignoreExclusiveZones = false; - layer = "overlay"; - hidePluginInfo = false; - closeOnClick = true; - showResultsImmediately = false; - maxEntries = null; - }; - extraCss = '' - #window { - background: transparent; - } - #main { - background-color: grey; - text-color: white; - outline-color: black; - } - ''; - -# extraConfigFiles."some-plugin.ron".text = '' -# Config( -# // for any other plugin -# // this file will be put in ~/.config/anyrun/some-plugin.ron -# // refer to docs of xdg.configFile for available options -# ) -# ''; - }; - services.blueman-applet.enable = true; programs.htop.enable = true; } diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 8b15add..a246b8a 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -45,7 +45,7 @@ "$mod, F, exec, firefox" "$mod, 1, exec, alacritty" "$mod, D, exec, vesktop" - "$mod, space, exec, anyrun" + "$mod, space, exec, wofi --show drun" # Screenshot tool ", Print, exec, grimblast copy area" diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix new file mode 100644 index 0000000..9e805e7 --- /dev/null +++ b/home-manager/stylix.nix @@ -0,0 +1,7 @@ +{ config, ... }: { +# stylix = { +# enable = true; +## base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml"; +# stylix.image = /home/blue/Pictures/wallpaper.png; +# }; +} diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index ad595f2..6dd5564 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -149,7 +149,7 @@ # Enable fingerprint daemon services.fprintd.enable = true; - services.fprintd.tod.enable = true; +# services.fprintd.tod.enable = true; # Enable bluetooth and blueman hardware.bluetooth = { diff --git a/modules/stylix.nix b/modules/stylix.nix new file mode 100644 index 0000000..50d552b --- /dev/null +++ b/modules/stylix.nix @@ -0,0 +1,7 @@ +{ config, ... }: { + stylix = { + enable = true; +# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml"; + stylix.image = /home/blue/Pictures/wallpaper.png; + }; +}