diff --git a/configuration.nix b/configuration.nix old mode 100755 new mode 100644 index 9e989cb..69f3650 --- a/configuration.nix +++ b/configuration.nix @@ -100,7 +100,7 @@ blueman dmidecode file - cowsay + parallel # ]) ++ (with pkgs-unstable; [ # # sendme ]); @@ -117,7 +117,7 @@ xwayland.enable = true; }; - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; nixpkgs.config.allowUnfree = true; diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 30cd6f7..c5daa53 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -6,44 +6,42 @@ pkgs: rec { rounding = 3; gap-size = 5; border-width = 2; - color = - let - dark = (-0.5); - bright = (0.5); - alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); - ccolor = builtins.mapAttrs alter-set { - black = "#111111"; # "#111111" "#001100"; - white = "#dddddd"; # "#dddddd" "#66dd66"; - blue = "#4444dd"; # "#3333dd" "#003300"; - cyan = "#44dddd"; # "#11dddd" "#00dd55"; - green = "#44dd44"; # "#11dd11" "#11dd11"; - magenta = "#dd44dd"; # "#dd11dd" "#005500"; - red = "#dd4444"; # "#dd1111" "#00aa00"; - yellow = "#dddd44"; # "#dddd11" "#ffff00"; - }; - facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; - fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; - fcolor = facolor // fbcolor; - xcolor = with ccolor; with fcolor; rec { - background = "#000000"; - # foreground = "#dddddd"; - # accent = blue; - # secondary = cyan; - # tertiary = magenta; - # special = yellow; - # weird = green; - positive = alter "#00dd00"; - negative = alter "#dd0000"; - border = accent.base; - border2 = secondary.base; - }; - in ccolor // fcolor // xcolor; + color = let + dark = (-0.5); + bright = (0.5); + alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); + ccolor = builtins.mapAttrs alter-set { + black = "#111111"; # "#111111" "#001100"; + white = "#dddddd"; # "#dddddd" "#66dd66"; + blue = "#4444dd"; # "#3333dd" "#003300"; + cyan = "#44dddd"; # "#11dddd" "#00dd55"; + green = "#44dd44"; # "#11dd11" "#11dd11"; + magenta = "#dd44dd"; # "#dd11dd" "#005500"; + red = "#dd4444"; # "#dd1111" "#00aa00"; + yellow = "#dddd44"; # "#dddd11" "#ffff00"; + }; + facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; + fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; + fcolor = facolor // fbcolor; + xcolor = with ccolor; with fcolor; { + background = "#000000"; + # foreground = "#dddddd"; + # accent = blue; + # secondary = cyan; + # tertiary = magenta; + # special = yellow; + # weird = green; + positive = alter "#00dd00"; + negative = alter "#dd0000"; + border = accent.base; + border2 = secondary.base; + }; + in ccolor // fcolor // xcolor; font = { code = { - name = "JetBrainsMono-NF"; - name2 = "JetBrainsMono Nerd Font"; + name = "JetBrainsMono Nerd Font"; package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); # name = "CascadiaCove-NF"; # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); diff --git a/flake.lock b/flake.lock old mode 100755 new mode 100644 index 0e4b154..4c7ccc7 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1730569007, - "narHash": "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=", + "lastModified": 1732650593, + "narHash": "sha256-/fDdm6O0ljOqmN+xlZMxy9NjhFfYxOPCLhCRw11diEA=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "260f386075c7f6818033b05466a368d8821cde2d", + "rev": "55da6e2363d8298b54f3aba2d8cac8057163e2b7", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1731959031, + "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", "type": "github" }, "original": { @@ -176,6 +176,28 @@ "type": "github" } }, + "flake-utils-plus": { + "inputs": { + "flake-utils": [ + "yazi-plugins", + "flake-utils" + ] + }, + "locked": { + "lastModified": 1696281284, + "narHash": "sha256-xcmtTmoiiAOSk4abifbtqVZk0iwBcqJfg47iUbkwhcE=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "6cf1e312fb259693c4930d07ca3cbe1d07ef4a48", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "ref": "v1.4.0", + "repo": "flake-utils-plus", + "type": "github" + } + }, "flake-utils_2": { "inputs": { "systems": "systems_4" @@ -194,6 +216,27 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": [ + "yazi-plugins", + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -238,6 +281,28 @@ "type": "github" } }, + "haumea": { + "inputs": { + "nixpkgs": [ + "yazi-plugins", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -245,16 +310,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -302,11 +367,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732100541, - "narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=", + "lastModified": 1733157082, + "narHash": "sha256-wbfUls7vwEs00xdGbYn1L8ZOrMS4zhisq9XVwjND/fc=", "ref": "refs/heads/main", - "rev": "940f7aa990dbc99815bab8d355999d8277534b17", - "revCount": 5484, + "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888", + "revCount": 5509, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -407,11 +472,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732059967, - "narHash": "sha256-PN7B3bzpXJgfJ5oUzTWx7Y/v2Zeq6bsRLxqeWmqXN1I=", + "lastModified": 1732716575, + "narHash": "sha256-OvFJCj52HuXxRrcCXrieIoiOzbeYFvDXNO8SndFiyAE=", "owner": "h3rmt", "repo": "hyprswitch", - "rev": "e9c4cf7a9f69d52bdbaec14006f04b1205eeceb5", + "rev": "2b77dbcb422123dfce9bb82d698649e9757f35e0", "type": "github" }, "original": { @@ -433,11 +498,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -498,11 +563,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -514,11 +579,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1732219096, - "narHash": "sha256-gbvtOPW7K7v4EFo7Feo5s+SI7FMVrCOA5CgnuMhWO/Y=", + "lastModified": 1733169301, + "narHash": "sha256-0KG/PlnFOQ1IsOen9zUXKsnd6R1rkn0YwKr3jTUZWsM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "328abff1f7a707dc8da8e802f724f025521793ea", + "rev": "3b932c5d6fd8a8153e45f67f85af3b17827126b5", "type": "github" }, "original": { @@ -574,11 +639,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -620,16 +685,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -676,11 +741,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -733,6 +798,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "yazi": "yazi", + "yazi-plugins": "yazi-plugins", "zen-browser": "zen-browser" } }, @@ -789,11 +855,11 @@ ] }, "locked": { - "lastModified": 1732186149, - "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { @@ -862,6 +928,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -910,11 +991,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732207337, - "narHash": "sha256-lPgx3ElbhNp2q0ASAIUDwuszh8cYGmJTNQSdiasmBGI=", + "lastModified": 1733065969, + "narHash": "sha256-g4bDtyNyKKHHFYY3xTImIttFosn9PcrVbomAiyuu59g=", "owner": "sxyazi", "repo": "yazi", - "rev": "428c92270385c55ffc2862947f2377f4247268e4", + "rev": "20dc0550bc2266fef04f1b3b0b3ec662431951a6", "type": "github" }, "original": { @@ -923,6 +1004,30 @@ "type": "github" } }, + "yazi-plugins": { + "inputs": { + "flake-utils": "flake-utils_3", + "flake-utils-plus": "flake-utils-plus", + "haumea": "haumea", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1732366073, + "narHash": "sha256-rTWuZ7yr3JeCcmeWgbgsribsxyN5TH14vzZrsB869WA=", + "owner": "lordkekz", + "repo": "nix-yazi-plugins", + "rev": "064746e112746ddce3527a77d4524c2447672754", + "type": "github" + }, + "original": { + "owner": "lordkekz", + "repo": "nix-yazi-plugins", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": "nixpkgs_6" diff --git a/flake.nix b/flake.nix old mode 100755 new mode 100644 index 3311f3f..dd62e00 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; inputs = { - nixpkgs = { url = "nixpkgs/nixos-24.05"; }; + nixpkgs = { url = "nixpkgs/nixos-24.11"; }; nixpkgs-unstable = { url = "nixpkgs/nixos-unstable"; }; nixpkgs-latest = { url = "github:nixos/nixpkgs?ref=master"; }; - home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; }; @@ -14,8 +14,11 @@ Hyprspace = { url = "github:KZDKM/Hyprspace"; inputs.hyprland.follows = "hyprland"; }; hyprswitch = { url = "github:h3rmt/hyprswitch/release"; }; - # firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; yazi.url = "github:sxyazi/yazi"; + yazi-plugins = { + url = "github:lordkekz/nix-yazi-plugins"; + inputs.nixpkgs.follows = "nixpkgs"; + }; zen-browser.url = "github:MarceColl/zen-browser-flake"; }; diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 7f066b1..2ef5a99 100755 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 5a0970b..342d2a3 100755 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -1,51 +1,31 @@ { pkgs, lib, rice, user, secrets, ... }: let channels = [ - "Caedrel" - "NoWay4u_Sir" - "zackrawrr" - "agurin" "asmongold" - "Broeki" - "Broxah" - # "Caedrel" - "chrissyofficial" + "Caedrel" "EintrachtSpandau" "GamesDoneQuick" "gdolphn" "GRONKH" "handofblood" "HisWattson" - "imls" - "iskall85" "Jankos" - "Karni" "KuruHS" "kutcherlol" - "LCK" - "LCS" "LEC" "lol_nemesis" - "loltyler1" - "LPL" - "maxim" "NASA" "NNOPrime" - # "NoWay4u_Sir" + "NoWay4u_Sir" "OfficialMikeShinoda" - "ow_esports" - "PrimeGaming" - "PrimeLeague" "Rekkles" "riotgames" - "Sola" "ThePrimeagen" "Tolkin" - "Trick2g" "TSM_ImperialHal" "Xisuma" - # "zackrawrr" + "zackrawrr" ]; tabber = channel-name: { highlightsEnabled = true; diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index 797a03e..ea4696c 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -5,17 +5,18 @@

${color-name}.dark

+

${color-set.dark}

${color-name}.base

+

${color-set.base}

${color-name}.bright

+

${color-set.bright}

''; - - in /* html */ '' @@ -37,7 +38,7 @@ color: ${foreground}; width: fit-content; margin: 10px auto 10px auto; - background: ${background}; + background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}); border: ${builtins.toString rice.border-width}px solid ${border}; border-radius: ${builtins.toString rice.rounding}px; padding: ${builtins.toString rice.gap-size}px; @@ -46,7 +47,7 @@ margin: ${builtins.toString rice.gap-size}px; } .color-container { - font-family: ${rice.font.code.name2}; + font-family: ${rice.font.code.name}; display: flex; gap: ${builtins.toString rice.gap-size}px; margin: ${builtins.toString rice.gap-size}px; @@ -66,18 +67,20 @@ ${cb accent "accent" 100} ${cb secondary "secondary" 100} ${cb tertiary "tertiary" 100} - ${cb weird "weird" 75} - ${cb special "special" 75} - ${cb positive "positive" 30} - ${cb negative "negative" 30} - ${cb black "black" 25} - ${cb white "white" 25} - ${cb blue "blue" 25} - ${cb cyan "cyan" 25} - ${cb green "green" 25} - ${cb magenta "magenta" 25} - ${cb red "red" 25} - ${cb yellow "yellow" 25} + ${cb weird "weird" 100} + ${cb special "special" 100} +
+ ${cb positive "positive" 70} + ${cb negative "negative" 70} +
+ ${cb black "black" 50} + ${cb white "white" 50} + ${cb blue "blue" 50} + ${cb cyan "cyan" 50} + ${cb green "green" 50} + ${cb magenta "magenta" 50} + ${cb red "red" 50} + ${cb yellow "yellow" 50}