From 80f2d6797d317fb3d8e34a4e4f8573d7388ab944 Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 30 Jul 2024 23:47:55 +0200 Subject: [PATCH] dnt know --- flake.lock | 141 +++++++++++++++++++++------- flake.nix | 1 + home/core/default.nix | 23 +++++ home/core/gui/anyrun/style-dark.css | 56 ----------- home/users/cnst/default.nix | 15 --- home/users/default.nix | 3 + nixos/core/default.nix | 6 ++ nixos/hosts/default.nix | 1 + 8 files changed, 141 insertions(+), 105 deletions(-) create mode 100644 home/core/default.nix delete mode 100644 home/core/gui/anyrun/style-dark.css create mode 100644 nixos/core/default.nix diff --git a/flake.lock b/flake.lock index 83ca3238..9a90bd7a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "anyrun": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1721135360, + "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", + "owner": "anyrun-org", + "repo": "anyrun", + "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", + "type": "github" + }, + "original": { + "owner": "anyrun-org", + "repo": "anyrun", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -55,8 +75,8 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs", - "systems": "systems", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", "yafas": "yafas" }, "locked": { @@ -213,6 +233,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "anyrun", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -232,7 +273,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -253,7 +294,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -290,7 +331,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -328,7 +369,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -346,7 +387,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -604,16 +645,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "systems": "systems_3", + "nixpkgs": "nixpkgs_3", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1722366828, - "narHash": "sha256-grUcMvIZs3ncEg2irrFJtTPxR0YaOYO4D1CgUB+u0dg=", + "lastModified": 1722375236, + "narHash": "sha256-8yrkwPN3TbCrtZSD/7GSV2kW9hruIZUQymnpyV15TI4=", "ref": "refs/heads/main", - "rev": "8ec3dc4c09c30aab7669f99ba6359be320023fa8", - "revCount": 5028, + "rev": "3b9b5346b830554aa7470ccf1202a7f3be72d1b4", + "revCount": 5029, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -756,8 +797,8 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -897,11 +938,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -959,6 +1000,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1722185531, "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", @@ -974,7 +1031,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1722264024, "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", @@ -990,7 +1047,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1722185531, "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", @@ -1006,7 +1063,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1721466660, "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", @@ -1026,7 +1083,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -1126,20 +1183,21 @@ }, "root": { "inputs": { + "anyrun": "anyrun", "chaotic": "chaotic", "firefox-nightly": "firefox-nightly", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", "hardware": "hardware", "hm": "hm", "hyprland": "hyprland", "lanzaboote": "lanzaboote", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_5", + "systems": "systems_6", "wezterm": "wezterm" } }, @@ -1202,20 +1260,35 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1230,7 +1303,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1245,7 +1318,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1260,7 +1333,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1327,7 +1400,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2", "zlib": "zlib" }, diff --git a/flake.nix b/flake.nix index 69c13717..5022d651 100644 --- a/flake.nix +++ b/flake.nix @@ -72,6 +72,7 @@ wezterm = { url = "github:wez/wezterm?dir=nix"; }; + anyrun.url = "github:anyrun-org/anyrun"; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/core/default.nix b/home/core/default.nix new file mode 100644 index 00000000..ddbd2c5f --- /dev/null +++ b/home/core/default.nix @@ -0,0 +1,23 @@ +{ + imports = [ + # ./gui/anyrun + ./gui/browsers + ./gui/discord + ./gui/gtk + ./gui/utility + ./gui/waybar + ./gui/xdg + + ./tui/alacritty + ./tui/foot + ./tui/neovim + ./tui/wezterm + ./tui/yazi + + ./services/copyq + ./services/hypr + ./services/mako + ./services/polkit + ./services/udiskie + ]; +} diff --git a/home/core/gui/anyrun/style-dark.css b/home/core/gui/anyrun/style-dark.css deleted file mode 100644 index 6895967f..00000000 --- a/home/core/gui/anyrun/style-dark.css +++ /dev/null @@ -1,56 +0,0 @@ -* { - all: unset; - font-size: 1.2rem; -} - -#window, -#match, -#entry, -#plugin, -#main { - background: #ffffff; -} - -#window { - font-size: 60px; - background-image: url("/home/cnst/.config/waybar/images/nixblueflake.svg"); - background-position: center; - background-repeat: no-repeat; - background-size: 60px 60px; -} - -#match.activatable { - border-radius: 8px; - margin: 4px 0; - padding: 4px; - transition: 100ms ease-out; -} -#match.activatable:first-child { - margin-top: 12px; -} -#match.activatable:last-child { - margin-bottom: 0; -} - -#match:hover { - background: rgba(255, 255, 255, 0.05); -} -#match:selected { - background: rgba(255, 255, 255, 0.1); -} - -#entry { - background: rgba(255, 255, 255, 0.05); - border: 1px solid rgba(255, 255, 255, 0.1); - border-radius: 8px; - padding: 4px 8px; -} - -box#main { - background: rgba(0, 0, 0, 0.5); - box-shadow: - inset 0 0 0 1px rgba(255, 255, 255, 0.1), - 0 30px 30px 15px rgba(0, 0, 0, 0.5); - border-radius: 20px; - padding: 12px; -} diff --git a/home/users/cnst/default.nix b/home/users/cnst/default.nix index ff9ecb79..6ab3f98c 100644 --- a/home/users/cnst/default.nix +++ b/home/users/cnst/default.nix @@ -1,27 +1,12 @@ {pkgs, ...}: { imports = [ # core.gui - ../../core/gui/gtk - ../../core/gui/waybar # ../../core/gui/ags - ../../core/gui/browsers - ../../core/gui/xdg - ../../core/gui/discord ../../core/gui/hypr/cnst.nix - ../../core/gui/utility # core.tui ../../core/tui/git/cnst.nix ../../core/tui/shell/cnst.nix - ../../core/tui/foot - ../../core/tui/alacritty - ../../core/tui/wezterm - ../../core/tui/neovim - ../../core/tui/yazi # core.services - ../../core/services/mako - ../../core/services/polkit - ../../core/services/hypr - ../../core/services/copyq # ../../core/services/power-monitor ]; home = { diff --git a/home/users/default.nix b/home/users/default.nix index e08253dd..adc4233b 100644 --- a/home/users/default.nix +++ b/home/users/default.nix @@ -8,14 +8,17 @@ homeImports = { "cnst@cnix" = [ + ../core ../cnst.nix ./cnst ]; "adam@adampad" = [ + ../core ../adam.nix ./adam ]; "toothpick@toothpc" = [ + ../core ../toothpick.nix ./toothpick ]; diff --git a/nixos/core/default.nix b/nixos/core/default.nix new file mode 100644 index 00000000..cbca6619 --- /dev/null +++ b/nixos/core/default.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + anyrun + stow + ]; +} diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix index 77092c34..05bd48ea 100644 --- a/nixos/hosts/default.nix +++ b/nixos/hosts/default.nix @@ -21,6 +21,7 @@ desktop ++ [ ./cnix + "${mod}/core" "${mod}/core/lanzaboote.nix" "${mod}/core/network/cnix.nix"