diff --git a/flake.lock b/flake.lock index 0112989..271138b 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1740779034, - "narHash": "sha256-5OiXksiGBBb2zN/OjB5iH0nbchhwC/WSNRDFQBclniU=", + "lastModified": 1740961576, + "narHash": "sha256-9L6d3owtajM72YvUOpK1zYle2nM0BpsuopbF9lm9lJs=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "40223e7b9a44414f21bca1a1b74ac975c5ca93a2", + "rev": "4df58996ed654f6ce9b71b41c1826484c6870739", "type": "github" }, "original": { @@ -203,6 +203,20 @@ } }, "flake-compat_2": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -217,6 +231,22 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -301,7 +331,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -319,7 +349,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -356,6 +386,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_10" + }, + "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": { @@ -459,6 +507,31 @@ "type": "github" } }, + "gomod2nix": { + "inputs": { + "flake-utils": [ + "superfile", + "flake-utils" + ], + "nixpkgs": [ + "superfile", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710154385, + "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -466,11 +539,11 @@ ] }, "locked": { - "lastModified": 1740699498, - "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", + "lastModified": 1741056285, + "narHash": "sha256-/JKDMVqq8PIqcGonBVKbKq1SooV3kzGmv+cp3rKAgPA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b71edac7a3167026aabea82a54d08b1794088c21", + "rev": "70fbbf05a5594b0a72124ab211bff1d502c89e3f", "type": "github" }, "original": { @@ -574,11 +647,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1740707551, - "narHash": "sha256-C4Abte12fRoOsrSc5mmD86oQ2XGiw65w+X7x9E+i3BA=", + "lastModified": 1741035361, + "narHash": "sha256-K5mLlTW55w4WuysD1oR9a37PDl2vrYxtw8TxVCA4sDA=", "ref": "refs/heads/main", - "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d", - "revCount": 5851, + "rev": "d7e7a292613a4f20218074ff8299dff099a80098", + "revCount": 5861, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -771,11 +844,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1740730563, - "narHash": "sha256-OfTKeEdFGeDTBAQdQESy4Yjrx2Vf+0oCRKju0CfgYIY=", + "lastModified": 1740863579, + "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "4810d0f502b26469d96de2ea5310a7a84cd4696f", + "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd", "type": "github" }, "original": { @@ -999,6 +1072,27 @@ "type": "github" } }, + "nixcord": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_5", + "systems": "systems_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1740790927, + "narHash": "sha256-HfDgt1X8KjC4zFh4hBMkxIPAIsgFehaX8c+6OZ16kic=", + "owner": "kaylorben", + "repo": "nixcord", + "rev": "a1b3b4ccc9d48791ea63d1e94819077a1e379e2a", + "type": "github" + }, + "original": { + "owner": "kaylorben", + "repo": "nixcord", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1740646007, @@ -1017,11 +1111,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { @@ -1043,6 +1137,54 @@ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1739020877, @@ -1093,27 +1235,43 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", - "owner": "nixos", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -1123,7 +1281,23 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { + "locked": { + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1740303746, "narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=", @@ -1139,38 +1313,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -1212,15 +1354,15 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_8", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1740776117, - "narHash": "sha256-zQuEScC1oP5q9Qtu+IthuD9AUeYx0f9dGCqHYxkVUDE=", + "lastModified": 1741075138, + "narHash": "sha256-lAErDUEuag1Jx/AU+QDh602B4sA4ZD2eiziL6DzcI84=", "owner": "nix-community", "repo": "NUR", - "rev": "2efd087395c3c3a0778af4bfb79ea8955a5dbb17", + "rev": "27984718bf6c800ea2cb9f7823510d83db558c34", "type": "github" }, "original": { @@ -1236,7 +1378,7 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1740408283, @@ -1281,16 +1423,16 @@ "flake-utils": "flake-utils_2", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nmd": "nmd", - "systems": "systems_6" + "systems": "systems_7" }, "locked": { - "lastModified": 1740702856, - "narHash": "sha256-NxVK4PUdcuwzaAQX1Xj2tMaowDLqL5p8wtWp3EyD0Vw=", + "lastModified": 1740938036, + "narHash": "sha256-KDc+kDDX9s8c574sx7idXVYTJM2WZElAk9qbgxrCnSo=", "owner": "notashelf", "repo": "nvf", - "rev": "08be38ab06c95f56cb9d27805826c1b1d0ffac98", + "rev": "f24189f1d2a7730b7fe87164bae40c2d0be8d3c9", "type": "github" }, "original": { @@ -1342,14 +1484,16 @@ "hyprpanel": "hyprpanel", "hyprpolkitagent": "hyprpolkitagent", "hyprspace": "hyprspace", + "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nur": "nur", "nvf": "nvf", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", + "superfile": "superfile", "zen-browser": "zen-browser" } }, @@ -1466,11 +1610,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -1484,14 +1628,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1740284169, - "narHash": "sha256-Ne+3kEyOFD2sNfw3cnKk+Zi/tTk+WkmnsfE7PDLNEXU=", + "lastModified": 1740889006, + "narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "fd31f20e2bd2bf3894d729590bf578c02c252239", + "rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc", "type": "github" }, "original": { @@ -1507,14 +1651,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_10", "nur": "nur_2", - "systems": "systems_8", + "systems": "systems_9", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1522,11 +1666,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740769934, - "narHash": "sha256-iyxUwII/NQNClT77VqQiDpaXJz1r0Z8tNVxgY64mLak=", + "lastModified": 1740959323, + "narHash": "sha256-UtSKsLCWwA4wPFm7mgl33qeu8sj0on9Hyt3YhDWWkAM=", "owner": "danth", "repo": "stylix", - "rev": "de4ee5899042801b62f988687acd454d4d411075", + "rev": "489833b201a84488c6b4371a261fdbcafa6abcb6", "type": "github" }, "original": { @@ -1535,6 +1679,27 @@ "type": "github" } }, + "superfile": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "gomod2nix": "gomod2nix", + "nixpkgs": "nixpkgs_11" + }, + "locked": { + "lastModified": 1740917926, + "narHash": "sha256-cbDfo+2rwNk4s/YhKhyQvpI4T9CseGyWGtc55ofyBT0=", + "owner": "yorukot", + "repo": "superfile", + "rev": "34fd3e6e5c3b829bfc9dccae79c8102d189bff1c", + "type": "github" + }, + "original": { + "owner": "yorukot", + "repo": "superfile", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -1550,6 +1715,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -1590,9 +1770,8 @@ "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "id": "systems", + "type": "indirect" } }, "systems_5": { @@ -1655,6 +1834,21 @@ "type": "github" } }, + "systems_9": { + "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": { @@ -1738,6 +1932,24 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1737103437, + "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nur", @@ -1758,7 +1970,7 @@ "type": "github" } }, - "treefmt-nix_2": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "stylix", @@ -1823,7 +2035,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1740560716, diff --git a/flake.nix b/flake.nix index 16739e9..7c52e0c 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake nvf.url = "github:notashelf/nvf"; superfile = { url = "github:yorukot/superfile"; }; + nixcord = { url = "github:kaylorben/nixcord"; }; }; outputs = inputs@{ nixpkgs, ... }: { diff --git a/home/programs/discord/default.nix b/home/programs/discord/default.nix new file mode 100644 index 0000000..c30fa20 --- /dev/null +++ b/home/programs/discord/default.nix @@ -0,0 +1,8 @@ +{ inputs, ... }: { + imports = [ inputs.nixcord.homeManagerModules.nixcord ]; + + programs.nixcord = { + enable = true; + config = { frameless = true; }; + }; +} diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index 041b769..46e1c0f 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -1,6 +1,6 @@ # My shell configuration { pkgs, lib, config, ... }: -let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch +let fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch in { home.packages = with pkgs; [ bat ripgrep tldr sesh ]; diff --git a/home/programs/superfile/default.nix b/home/programs/superfile/default.nix new file mode 100644 index 0000000..5e48d90 --- /dev/null +++ b/home/programs/superfile/default.nix @@ -0,0 +1,6 @@ +{ inputs, pkgs, ... }: { + + home.packages = [ + inputs.superfile.packages.${pkgs.system}.default # CLI file manager + ]; +} diff --git a/home/system/hyprland/animations.nix b/home/system/hyprland/animations.nix index d7d83af..298482b 100644 --- a/home/system/hyprland/animations.nix +++ b/home/system/hyprland/animations.nix @@ -1,6 +1,6 @@ { config, ... }: let - animationSpeed = config.var.theme.animation-speed; + animationSpeed = config.theme.animation-speed; animationDuration = if animationSpeed == "slow" then "4" diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 7eab7fd..feed226 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -1,13 +1,13 @@ # So best window tiling manager { pkgs, config, inputs, ... }: let - border-size = config.var.theme.border-size; - gaps-in = config.var.theme.gaps-in; - gaps-out = config.var.theme.gaps-out; - active-opacity = config.var.theme.active-opacity; - inactive-opacity = config.var.theme.inactive-opacity; - rounding = config.var.theme.rounding; - blur = config.var.theme.blur; + border-size = config.theme.border-size; + gaps-in = config.theme.gaps-in; + gaps-out = config.theme.gaps-out; + active-opacity = config.theme.active-opacity; + inactive-opacity = config.theme.inactive-opacity; + rounding = config.theme.rounding; + blur = config.theme.blur; keyboardLayout = config.var.keyboardLayout; in { @@ -59,6 +59,7 @@ in { "DP-8, disable" "DP-9, disable" "HDMI-A-1,3440x1440@99.98,auto,1" + "desc:United Microelectr Corporation UMC SHARP,3840x2160,auto,2" ",prefered,auto,1" ]; diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix index e1cb71a..5378759 100644 --- a/home/system/hyprpanel/default.nix +++ b/home/system/hyprpanel/default.nix @@ -2,7 +2,7 @@ # Display informations like workspaces, battery, wifi, ... { inputs, config, ... }: let - transparentButtons = config.var.theme.bar.transparentButtons; + transparentButtons = config.theme.bar.transparentButtons; accent = "#${config.lib.stylix.colors.base0D}"; accent-alt = "#${config.lib.stylix.colors.base03}"; @@ -12,15 +12,15 @@ let font = "${config.stylix.fonts.serif.name}"; fontSize = "${toString config.stylix.fonts.sizes.desktop}"; - rounding = config.var.theme.rounding; - border-size = config.var.theme.border-size; + rounding = config.theme.rounding; + border-size = config.theme.border-size; - gaps-out = config.var.theme.gaps-out; - gaps-in = config.var.theme.gaps-in; + gaps-out = config.theme.gaps-out; + gaps-in = config.theme.gaps-in; - floating = config.var.theme.bar.floating; - transparent = config.var.theme.bar.transparent; - position = config.var.theme.bar.position; + floating = config.theme.bar.floating; + transparent = config.theme.bar.transparent; + position = config.theme.bar.position; location = config.var.location; in { diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix index f495525..91158af 100644 --- a/home/system/wofi/default.nix +++ b/home/system/wofi/default.nix @@ -6,7 +6,7 @@ let background-alt = "#${config.lib.stylix.colors.base01}"; foreground = "#${config.lib.stylix.colors.base05}"; font = config.stylix.fonts.serif.name; - rounding = config.var.theme.rounding; + rounding = config.theme.rounding; font-size = config.stylix.fonts.sizes.popups; in { diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 36f603f..4932fe3 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -19,7 +19,7 @@ ../../nixos/variables-config.nix # Choose your theme here - ../../themes/stylix/yoru.nix + # ../../themes/stylix/yoru.nix ./hardware-configuration.nix ./variables.nix diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index e2ed886..1b02aec 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -17,6 +17,8 @@ ../../home/programs/lazygit ../../home/programs/zen ../../home/programs/duckduckgo-colorscheme + ../../home/programs/superfile + ../../home/programs/discord # Scripts ../../home/scripts # All scripts @@ -34,6 +36,8 @@ ../../home/system/udiskie ../../home/system/clipman + # ../../themes/stylix/yoru.nix + ./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets ]; @@ -43,7 +47,6 @@ packages = with pkgs; [ # Apps - discord # Chat bitwarden # Password manager vlc # Video player blanket # White-noise app diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix index a239541..7f48638 100644 --- a/hosts/laptop/variables.nix +++ b/hosts/laptop/variables.nix @@ -1,5 +1,5 @@ { config, ... }: { - imports = [ ../../nixos/variables-config.nix ]; + imports = [ ../../nixos/variables-config.nix ../../themes/yoru.nix ]; config.var = { hostname = "nixy"; @@ -23,6 +23,6 @@ autoGarbageCollector = true; # Choose your theme variables here - theme = import ../../themes/var/yoru.nix; + # theme = import ../../themes/var/2025.nix; }; } diff --git a/themes/stylix/2025.nix b/themes/stylix/2025.nix deleted file mode 100644 index ba5f3a8..0000000 --- a/themes/stylix/2025.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, inputs, ... }: { - stylix = { - enable = true; - - # Edited catppuccin - base16Scheme = { - base00 = "10101a"; # Default Background - base01 = - "16161f"; # Lighter Background (Used for status bars, line number and folding marks) - base02 = "2b2b2b"; # Selection Background - base03 = "45475a"; # Comments, Invisibles, Line Highlighting - base04 = "585b70"; # Dark Foreground (Used for status bars) - base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators - base06 = "f5e0dc"; # Light Foreground (Not often used) - base07 = "b4befe"; # Light Background (Not often used) - base08 = - "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = - "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background - base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted - base0C = - "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = - "A594FD"; # Functions, Methods, Attribute IDs, Headings, Accent color - base0E = - "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = - "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. - }; - - cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 24; - }; - - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrains Mono Nerd Font"; - }; - sansSerif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - serif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - sizes = { - applications = 13; - desktop = 13; - popups = 13; - terminal = 13; - }; - }; - - polarity = "dark"; - image = pkgs.fetchurl { - url = - "https://github.com/anotherhadi/nixy-wallpapers/blob/main/wallpapers/" - + "3.png" + "?raw=true"; - sha256 = "sha256-fT2ah18IAxoy3hzlLl9SkqhchzfVvZneUrZWzntMo40="; - }; - - }; - -} diff --git a/themes/stylix/nixy.nix b/themes/stylix/nixy.nix deleted file mode 100644 index 3b82f9f..0000000 --- a/themes/stylix/nixy.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ pkgs, inputs, ... }: { - stylix = { - enable = true; - - # Edited catppuccin - base16Scheme = { - base00 = "0b0b0b"; # Default Background - base01 = - "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks) - base02 = "2b2b2b"; # Selection Background - base03 = "45475a"; # Comments, Invisibles, Line Highlighting - base04 = "585b70"; # Dark Foreground (Used for status bars) - base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators - base06 = "f5e0dc"; # Light Foreground (Not often used) - base07 = "b4befe"; # Light Background (Not often used) - base08 = - "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = - "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background - base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted - base0C = - "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = - "A594FD"; # Functions, Methods, Attribute IDs, Headings, Accent color - base0E = - "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = - "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. - }; - - cursor = { - package = pkgs.posy-cursors; - name = "Posy-Cursor-Mono"; - size = 24; - }; - - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrains Mono Nerd Font"; - }; - sansSerif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - serif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - sizes = { - applications = 13; - desktop = 13; - popups = 13; - terminal = 13; - }; - }; - - polarity = "dark"; - image = inputs.nixy-wallpapers + "/wallpapers/black-oil.png"; - }; - -} diff --git a/themes/stylix/pinky.nix b/themes/stylix/pinky.nix deleted file mode 100644 index b98bfe5..0000000 --- a/themes/stylix/pinky.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, inputs, ... }: { - stylix = { - enable = true; - - # Edited catppuccin - base16Scheme = { - base00 = "0b0b0b"; # Default Background - base01 = - "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks) - base02 = "2b2b2b"; # Selection Background - base03 = "45475a"; # Comments, Invisibles, Line Highlighting - base04 = "585b70"; # Dark Foreground (Used for status bars) - base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators - base06 = "f5e0dc"; # Light Foreground (Not often used) - base07 = "b4befe"; # Light Background (Not often used) - base08 = - "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = - "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background - base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted - base0C = - "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = - "c6a0f6"; # Functions, Methods, Attribute IDs, Headings, Accent color - base0E = - "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = - "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. - }; - - cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 20; - }; - - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrains Mono Nerd Font"; - }; - sansSerif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - serif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - sizes = { - applications = 13; - desktop = 13; - popups = 13; - terminal = 13; - }; - }; - - targets.nixvim.transparentBackground = { - main = true; - signColumn = true; - }; - targets.nixvim.plugin = "base16-nvim"; - - polarity = "dark"; - image = inputs.nixy-wallpapers + "/wallpapers/4.png"; - }; - -} diff --git a/themes/stylix/whitish.nix b/themes/stylix/whitish.nix deleted file mode 100644 index c9c4f95..0000000 --- a/themes/stylix/whitish.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, inputs, ... }: { - stylix = { - enable = true; - - # Edited catppuccin - base16Scheme = { - base00 = "0b0b0b"; # Default Background - base01 = - "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks) - base02 = "2b2b2b"; # Selection Background - base03 = "45475a"; # Comments, Invisibles, Line Highlighting - base04 = "585b70"; # Dark Foreground (Used for status bars) - base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators - base06 = "f5e0dc"; # Light Foreground (Not often used) - base07 = "b4befe"; # Light Background (Not often used) - base08 = - "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = - "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background - base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted - base0C = - "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = - "8492EB"; # Functions, Methods, Attribute IDs, Headings, Accent color - base0E = - "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = - "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. - }; - - cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 20; - }; - - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrains Mono Nerd Font"; - }; - sansSerif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - serif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - sizes = { - applications = 13; - desktop = 13; - popups = 13; - terminal = 13; - }; - }; - - targets.nixvim.transparentBackground = { - main = true; - signColumn = true; - }; - targets.nixvim.plugin = "base16-nvim"; - - polarity = "dark"; - image = inputs.nixy-wallpapers + "/wallpapers/zywgxy.png"; - }; - -} diff --git a/themes/stylix/yoru.nix b/themes/stylix/yoru.nix deleted file mode 100644 index 206906c..0000000 --- a/themes/stylix/yoru.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, inputs, ... }: { - stylix = { - enable = true; - - # Edited catppuccin - base16Scheme = { - base00 = "0c0e0f"; # Default Background - base01 = - "141617"; # Lighter Background (Used for status bars, line number and folding marks) - base02 = "161819"; # Selection Background - base03 = "2f3132"; # Comments, Invisibles, Line Highlighting - base04 = "27292a"; # Dark Foreground (Used for status bars) - base05 = "edeff0"; # Default Foreground, Caret, Delimiters, Operators - base06 = "e4e6e7"; # Light Foreground (Not often used) - base07 = "f2f4f5"; # Light Background (Not often used) - base08 = - "f26e74"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted - base09 = - "ecd28b"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url - base0A = "e79881"; # Classes, Markup Bold, Search Text Background - base0B = "82c29c"; # Strings, Inherited Class, Markup Code, Diff Inserted - base0C = - "6791c9"; # Support, Regular Expressions, Escape Characters, Markup Quotes - base0D = - "709ad2"; # Functions, Methods, Attribute IDs, Headings, Accent color - base0E = - "c58cec"; # Keywords, Storage, Selector, Markup Italic, Diff Changed - base0F = - "363839"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. - }; - - cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 24; - }; - - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrains Mono Nerd Font"; - }; - sansSerif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - serif = { - package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; - name = "SFProDisplay Nerd Font"; - }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - sizes = { - applications = 13; - desktop = 13; - popups = 13; - terminal = 13; - }; - }; - - polarity = "dark"; - image = pkgs.fetchurl { - url = - "https://github.com/anotherhadi/nixy-wallpapers/blob/main/wallpapers/" - + "pink-sky-mountains.png" + "?raw=true"; - sha256 = "sha256-EF/tjNSpFHVei78HN7etXqsuBeA+PnxSKXw8HSPypys="; - }; - - }; - -} diff --git a/themes/var/2025.nix b/themes/var/2025.nix deleted file mode 100644 index 9736aa2..0000000 --- a/themes/var/2025.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - rounding = 16; - gaps-in = 9; - gaps-out = 9 * 2; - active-opacity = 1; - inactive-opacity = 0.93; - blur = true; - border-size = 3; - animation-speed = "fast"; # "fast" | "medium" | "slow" - fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - position = "top"; # "top" | "bottom" - transparent = false; - transparentButtons = false; - floating = true; - }; -} diff --git a/themes/var/nixy.nix b/themes/var/nixy.nix deleted file mode 100644 index 5524135..0000000 --- a/themes/var/nixy.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - rounding = 15; - gaps-in = 10; - gaps-out = 10 * 2; - active-opacity = 1; - inactive-opacity = 0.89; - blur = true; - border-size = 3; - animation-speed = "medium"; # "fast" | "medium" | "slow" - fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - position = "top"; # "top" | "bottom" - transparent = true; - transparentButtons = false; - floating = true; - }; -} diff --git a/themes/var/pinky.nix b/themes/var/pinky.nix deleted file mode 100644 index 0f1258b..0000000 --- a/themes/var/pinky.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - rounding = 25; - gaps-in = 12; - gaps-out = 12 * 2; - active-opacity = 1; - inactive-opacity = 0.87; - blur = true; - border-size = 3; - animation-speed = "slow"; # "fast" | "medium" | "slow" - fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - position = "top"; # "top" | "bottom" - transparent = true; - transparentButtons = false; - floating = true; - }; -} diff --git a/themes/var/whitish.nix b/themes/var/whitish.nix deleted file mode 100644 index f801a84..0000000 --- a/themes/var/whitish.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - rounding = 15; - gaps-in = 10; - gaps-out = 10 * 2; - active-opacity = 1; - inactive-opacity = 0.86; - blur = true; - border-size = 2; - animation-speed = "medium"; # "fast" | "medium" | "slow" - fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - position = "top"; # "top" | "bottom" - transparent = false; - transparentButtons = false; - floating = true; - }; -} diff --git a/themes/var/yoru.nix b/themes/var/yoru.nix deleted file mode 100644 index 9b8f0dd..0000000 --- a/themes/var/yoru.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - rounding = 12; - gaps-in = 9; - gaps-out = 9 * 2; - active-opacity = 0.96; - inactive-opacity = 0.96; - blur = true; - border-size = 3; - animation-speed = "fast"; # "fast" | "medium" | "slow" - fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" - - bar = { - position = "top"; # "top" | "bottom" - transparent = true; - transparentButtons = false; - floating = true; - }; -} diff --git a/themes/yoru.nix b/themes/yoru.nix new file mode 100644 index 0000000..977ae46 --- /dev/null +++ b/themes/yoru.nix @@ -0,0 +1,100 @@ +{ lib, pkgs, inputs, config, ... }: { + + options.theme = lib.mkOption { + type = lib.types.attrs; + default = { + rounding = 12; + gaps-in = 9; + gaps-out = 9 * 2; + active-opacity = 0.96; + inactive-opacity = 0.96; + blur = true; + border-size = 3; + animation-speed = "fast"; # "fast" | "medium" | "slow" + fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" + + bar = { # Hyprpanel + position = "top"; # "top" | "bottom" + transparent = true; + transparentButtons = false; + floating = true; + }; + }; + description = "Theme configuration options"; + }; + + config = { + stylix = { + enable = true; + + # Edited catppuccin + base16Scheme = { + base00 = "0c0e0f"; # Default Background + base01 = + "141617"; # Lighter Background (Used for status bars, line number and folding marks) + base02 = "161819"; # Selection Background + base03 = "1f2122"; # Comments, Invisibles, Line Highlighting + base04 = "27292a"; # Dark Foreground (Used for status bars) + base05 = "edeff0"; # Default Foreground, Caret, Delimiters, Operators + base06 = "e4e6e7"; # Light Foreground (Not often used) + base07 = "f2f4f5"; # Light Background (Not often used) + base08 = + "f26e74"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted + base09 = + "ecd28b"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url + base0A = "e79881"; # Classes, Markup Bold, Search Text Background + base0B = + "82c29c"; # Strings, Inherited Class, Markup Code, Diff Inserted + base0C = + "6791c9"; # Support, Regular Expressions, Escape Characters, Markup Quotes + base0D = + "709ad2"; # Functions, Methods, Attribute IDs, Headings, Accent color + base0E = + "c58cec"; # Keywords, Storage, Selector, Markup Italic, Diff Changed + base0F = + "759fcB"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. + }; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 24; + }; + + fonts = { + monospace = { + package = pkgs.nerd-fonts.jetbrains-mono; + name = "JetBrains Mono Nerd Font"; + }; + sansSerif = { + package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; + name = "SFProDisplay Nerd Font"; + }; + serif = { + package = inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd; + name = "SFProDisplay Nerd Font"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + sizes = { + applications = 13; + desktop = 13; + popups = 13; + terminal = 13; + }; + }; + + polarity = "dark"; + image = pkgs.fetchurl { + url = + "https://github.com/anotherhadi/nixy-wallpapers/blob/main/wallpapers/" + + "pink-sky-mountains.png" + "?raw=true"; + sha256 = "sha256-EF/tjNSpFHVei78HN7etXqsuBeA+PnxSKXw8HSPypys="; + }; + + }; + }; + +}