diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix index 97c90a6..5283a06 100644 --- a/boxes/desktop/configuration.nix +++ b/boxes/desktop/configuration.nix @@ -16,7 +16,6 @@ ../../common/systemModules/crypt.nix ../../common/systemModules/printing.nix ../../common/systemModules/stylix.nix - inputs # USERS ../../common/users/meyer ]; diff --git a/common/pkgs.nix b/common/pkgs.nix index 3fc54e1..72e7970 100644 --- a/common/pkgs.nix +++ b/common/pkgs.nix @@ -55,7 +55,6 @@ in nodejs_22 ]; gui = with pkgs; [ - cpkg.nekocord cpkg.frog legcord obsidian diff --git a/common/systemModules/stylix.nix b/common/systemModules/stylix.nix index d91121c..64588e1 100644 --- a/common/systemModules/stylix.nix +++ b/common/systemModules/stylix.nix @@ -1,8 +1,29 @@ -{ pkgs, config, ... }: +{ pkgs, inputs, ... }: { + imports = [ + inputs.stylix.nixosModules.stylix + ]; stylix = { enable = true; - base16scheme = ./tokyonight.yaml; + image = ./wallpaper.jpg; + base16Scheme = { + base00 = "#1A1B26"; + base01 = "#16161E"; + base02 = "#2F3549"; + base03 = "#444B6A"; + base04 = "#787C99"; + base05 = "#A9B1D6"; + base06 = "#CBCCD1"; + base07 = "#D5D6DB"; + base08 = "#C0CAF5"; + base09 = "#A9B1D6"; + base0A = "#0DB9D7"; + base0B = "#9ECE6A"; + base0C = "#B4F9F8"; + base0D = "#2AC3DE"; + base0E = "#BB9AF7"; + base0F = "#F7768E"; + }; fonts = { emoji = { package = pkgs.twemoji-color-font; diff --git a/common/systemModules/wallpaper.jpg b/common/systemModules/wallpaper.jpg new file mode 100644 index 0000000..8adfde5 Binary files /dev/null and b/common/systemModules/wallpaper.jpg differ diff --git a/customPackages/default.nix b/customPackages/default.nix index 4970de5..bbd6ecc 100644 --- a/customPackages/default.nix +++ b/customPackages/default.nix @@ -6,10 +6,4 @@ rec { vencord = pkgs.callPackage ./vencord/package.nix { }; frog = pkgs.callPackage ./frog { }; scripts = inputs.scripts.flakePackage pkgs; - nekocord = inputs.nekocord.lib.patch pkgs { - install.renameBinary = true; - version = { - content = /home/meyer/dev/ts/nekocord/dist; - }; - }; } diff --git a/flake.lock b/flake.lock index 99f939a..dd7ab12 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,71 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "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" + } + }, "flake-compat": { "flake": false, "locked": { @@ -16,6 +82,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -34,6 +116,60 @@ "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" + } + }, + "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" + } + }, + "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": [ @@ -54,6 +190,86 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nekocord": { + "inputs": { + "nekocord-installer": "nekocord-installer", + "nekocord-latest": "nekocord-latest", + "nekocord-latest-dev": "nekocord-latest-dev", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731460153, + "narHash": "sha256-IE/knV89tR9Kv6CBKwJOEDoVNtrk+rOTpvOatoPsB2I=", + "owner": "PoolloverNathan", + "repo": "nekocord", + "rev": "891ff720064a251d537dd89ce943aae669926cc0", + "type": "github" + }, + "original": { + "owner": "PoolloverNathan", + "repo": "nekocord", + "type": "github" + } + }, + "nekocord-installer": { + "flake": false, + "locked": { + "narHash": "sha256-/89LCtysKgmDN8jGR2lARC7eArnxrENAdiMCSuPZVo0=", + "type": "file", + "url": "https://nekocord.dev/uploads/nekocord-installer/main/latest.json" + }, + "original": { + "type": "file", + "url": "https://nekocord.dev/uploads/nekocord-installer/main/latest.json" + } + }, + "nekocord-latest": { + "flake": false, + "locked": { + "narHash": "sha256-DQw1QXxrsrbuNQZl0LyTRIZZbfrNjiZIEEIZWVhLgQg=", + "type": "file", + "url": "https://nekocord.dev/uploads/nekocord/main/latest.json" + }, + "original": { + "type": "file", + "url": "https://nekocord.dev/uploads/nekocord/main/latest.json" + } + }, + "nekocord-latest-dev": { + "flake": false, + "locked": { + "narHash": "sha256-Ns+1t7XjrS+TbXWjGEtSTwkqykbjSQ/t0weJh/qhdGI=", + "type": "file", + "url": "https://nekocord.dev/uploads/nekocord/dev/latest.json" + }, + "original": { + "type": "file", + "url": "https://nekocord.dev/uploads/nekocord/dev/latest.json" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -143,6 +359,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1729951556, "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", @@ -161,15 +393,36 @@ "root": { "inputs": { "home-manager": "home-manager", + "nekocord": "nekocord", "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2", - "sops-nix": "sops-nix" + "scripts": "scripts", + "sops-nix": "sops-nix", + "stylix": "stylix" + } + }, + "scripts": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1730600020, + "narHash": "sha256-QHjfVaL0ECvFXWOok4qPLxAD1itFaWm3TZ1MtjLLYgo=", + "owner": "sadan4", + "repo": "scripts", + "rev": "2e9ffe0933a170332bc490771a01dbbd75d06d71", + "type": "github" + }, + "original": { + "owner": "sadan4", + "repo": "scripts", + "type": "github" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -186,6 +439,38 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1731920923, + "narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", + "owner": "danth", + "repo": "stylix", + "rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -200,6 +485,71 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fc589c2..0d779ca 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,6 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nekocord = { - url = "github:PoolloverNathan/nekocord"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -78,7 +74,6 @@ ./boxes/desktop/configuration.nix inputs.home-manager.nixosModules.default inputs.nix-index-database.nixosModules.nix-index - inputs.stylix.nixosModules.stylix { programs.nix-index-database.comma.enable = true; } ]; };