diff --git a/flake.lock b/flake.lock index 7315300..031c610 100644 --- a/flake.lock +++ b/flake.lock @@ -5,7 +5,7 @@ "fenix": "fenix", "flakeCompat": "flakeCompat", "nixpkgs": [ - "nixpkgs" + "nixpkgsUnstable" ] }, "locked": { @@ -23,6 +23,24 @@ "type": "github" } }, + "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1745006048, + "narHash": "sha256-4ONXaEwnyZGPp84d6wjiqoR4xyTWygUobBTcSkILPzU=", + "owner": "catppuccin", + "repo": "nix", + "rev": "592094a02c4e43a9fa33559ade84d1ca015e8ada", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -80,6 +98,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1741352980, @@ -141,28 +160,29 @@ "flake-parts_4": { "inputs": { "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", + "miovim", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, - "flake-parts_5": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ - "nixvim", + "neovim-nightly-overlay", "nixpkgs" ] }, @@ -180,6 +200,27 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -242,11 +283,14 @@ ] }, "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "lastModified": 1742649964, "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -279,6 +323,7 @@ }, "hercules-ci-effects": { "inputs": { + "flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4", "nixpkgs": [ "neovim-nightly-overlay", @@ -286,11 +331,11 @@ ] }, "locked": { - "lastModified": 1742014779, - "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", + "lastModified": 1744693102, + "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "524637ef84c177661690b924bf64a1ce18072a2c", + "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", "type": "github" }, "original": { @@ -306,11 +351,32 @@ ] }, "locked": { - "lastModified": 1744380363, - "narHash": "sha256-cXjAUuAfQDPSLSsckZuTioQ986iqSPTzx8D7dLAcC+Q=", + "lastModified": 1745033012, + "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e43c6bcb101ba3301522439c459288c4a248f624", + "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -349,38 +415,10 @@ "type": "github" } }, - "ixx_2": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, "miovim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" }, "locked": { @@ -390,29 +428,30 @@ "rev": "bb97adbf0e81cc591c0f67c0b88a476f25a2fe17", "revCount": 5, "type": "git", - "url": "https://git.hypervirtual.world/harry123/miovim" + "url": "https://git.hypervirtual.world/harry123/miovim.git" }, "original": { "type": "git", - "url": "https://git.hypervirtual.world/harry123/miovim" + "url": "https://git.hypervirtual.world/harry123/miovim.git" } }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744333010, - "narHash": "sha256-VBaAreKB9fsgh5fjyK62UA03aPLDL2KhmLvOEbWT8q4=", + "lastModified": 1745044087, + "narHash": "sha256-is3Axl/CPltDo8g2avq1beaeR72V+KeohzsFf4d4u/0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c6f8c36e22e0f41dd17e91734f0e748cf267dd1f", + "rev": "4f94094e0b09f733f412216f24ae83d5f2dd0298", "type": "github" }, "original": { @@ -424,11 +463,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1744273222, - "narHash": "sha256-NWh4+o36VxbGxa8EG6fESZYRIvBy86rD7SOXNPjDR6k=", + "lastModified": 1745018600, + "narHash": "sha256-luXj2Tub5MJhvS+lXp4FVz0MXDB55u/BWuwbpmfGJuk=", "owner": "neovim", "repo": "neovim", - "rev": "dc00b379658ff7d545bd49161a7e81d83474b194", + "rev": "c67398d31bd9a6e3908b06dc1f8b9a403c992e69", "type": "github" }, "original": { @@ -441,14 +480,15 @@ "inputs": { "nixpkgs": [ "nixpkgsUnstable" + "nixpkgsUnstable" ] }, "locked": { - "lastModified": 1744224272, - "narHash": "sha256-cqePj5nuC7flJWNncaVAFq1YZncU0PSyO0DEqGn+vYc=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "113883e37d985d26ecb65282766e5719f2539103", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -512,11 +552,14 @@ ] }, "locked": { + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "lastModified": 1742568034, "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -527,16 +570,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", - "owner": "nixos", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -556,13 +599,28 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgsSmall": { "locked": { - "lastModified": 1744325773, - "narHash": "sha256-bZpSB/MouP20RP9ig0GCGkn/bT6K+cP6y6DMnoCw7tk=", + "lastModified": 1744917357, + "narHash": "sha256-1Sj8MToixDwakJYNMYBS/PYbg8Oa4CAxreXraMHB5qg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58aff6bffd4df979cefa2b99ac582017501be2af", + "rev": "1eae3268880484be84199bdb77941c09bb4a97ba", "type": "github" }, "original": { @@ -574,11 +632,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -589,6 +647,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1741310760, + "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1738797219, "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", @@ -604,13 +678,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1744157173, - "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -620,13 +694,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -636,13 +710,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1744502386, + "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", "type": "github" }, "original": { @@ -652,26 +726,10 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch" }, "locked": { @@ -688,33 +746,12 @@ "type": "github" } }, - "nixvim_2": { - "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": [ - "nixpkgsUnstable" - ], - "nuschtosSearch": "nuschtosSearch_2" - }, - "locked": { - "lastModified": 1744383153, - "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ + "miovim", "miovim", "nixvim", "nixpkgs" @@ -760,19 +797,20 @@ "root": { "inputs": { "alejandra": "alejandra", + "catppuccin": "catppuccin", "home-manager": "home-manager", "miovim": "miovim", + "miovim": "miovim", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", - "nixvim": "nixvim_2", "sops-nix": "sops-nix", - "walker": "walker" + "zen-browser": "zen-browser" } }, "rust-analyzer-src": { @@ -794,14 +832,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", + "lastModified": 1744669848, + "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", + "rev": "61154300d945f0b147b30d24ddcafa159148026a", "type": "github" }, "original": { @@ -825,36 +863,6 @@ "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" - } - }, - "systems_3": { - "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -863,11 +871,11 @@ ] }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { @@ -876,22 +884,24 @@ "type": "github" } }, - "walker": { + "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_6", - "systems": "systems_3" + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgsUnstable" + ] }, "locked": { - "lastModified": 1744044972, - "narHash": "sha256-17L0FA2S3+237RN2o/gKnIyBmfoChVxyrGiYPAovpSU=", - "owner": "abenz1267", - "repo": "walker", - "rev": "b2b47b27ac64b1a9820216520ad61c3989d27c87", + "lastModified": 1745040643, + "narHash": "sha256-QAdOWF7bDXkcJTuZ/X014tAUi9bv+DBNU33uDupzQdU=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "a01acea9d26943263e292da9fee58fe0e7824e72", "type": "github" }, "original": { - "owner": "abenz1267", - "repo": "walker", + "owner": "0xc000022070", + "repo": "zen-browser-flake", "type": "github" } } diff --git a/flake.nix b/flake.nix index e482bb3..6ac7e5b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,10 @@ nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - home-manager.url = "github:nix-community/home-manager/"; - home-manager.inputs.nixpkgs.follows = "nixpkgsUnstable"; + home-manager = { + url = "github:nix-community/home-manager/"; + inputs.nixpkgs.follows = "nixpkgsUnstable"; + }; alejandra.url = "github:kamadorueda/alejandra/3.0.0"; alejandra.inputs.nixpkgs.follows = "nixpkgsUnstable"; @@ -25,28 +27,23 @@ }; */ - miovim = { - url = "git+https://git.hypervirtual.world/harry123/miovim"; - }; + miovim.url = "git+https://git.hypervirtual.world/harry123/miovim.git"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgsUnstable"; + }; + nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.inputs.nixpkgs.follows = "nixpkgsUnstable"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - nixvim = { - url = "github:nix-community/nixvim"; - # If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim. - # url = "github:nix-community/nixvim/nixos-24.11"; - - inputs.nixpkgs.follows = "nixpkgsUnstable"; - }; - walker.url = "github:abenz1267/walker"; }; @@ -54,6 +51,7 @@ { self, nixpkgs, + catppuccin, nixpkgsSmall, nixpkgsUnstable, sops-nix, @@ -61,8 +59,8 @@ nix-darwin, nix-flatpak, home-manager, - nixvim, miovim, + zen-browser, ... }@inputs: let @@ -108,11 +106,13 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.${username} = import ./home-manager/home.nix; + home-manager.users.${username} = { + imports = [ + ./home-manager/home.nix + catppuccin.homeManagerModules.catppuccin + ]; + }; home-manager.extraSpecialArgs = { inherit inputs; }; - home-manager.sharedModules = [ - nixvim.homeManagerModules.nixvim - ]; } ]; }; @@ -185,6 +185,7 @@ darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs; packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix { }; + packages.fourget = pkgs.callPackage ./packages/4get.nix { }; }; } diff --git a/home-manager/dotfiles/.profile b/home-manager/dotfiles/.profile index 8ddda82..017c331 100644 --- a/home-manager/dotfiles/.profile +++ b/home-manager/dotfiles/.profile @@ -1,6 +1 @@ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share - -foot --server -if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then - exec dbus-run-session niri-session -fi diff --git a/home-manager/dotfiles/fuzzel/fuzzel.ini b/home-manager/dotfiles/fuzzel/fuzzel.ini new file mode 100644 index 0000000..8c41159 --- /dev/null +++ b/home-manager/dotfiles/fuzzel/fuzzel.ini @@ -0,0 +1,19 @@ +[main] +font= +match-mode=fzf + +[colors] +background=eff1f5dd +text=4c4f69ff +prompt=5c5f77ff +placeholder=8c8fa1ff +input=4c4f69ff +match=d20f39ff +selection=acb0beff +selection-text=4c4f69ff +selection-match=d20f39ff +counter=8c8fa1ff +border=d20f39ff + +[border] +radius=0 \ No newline at end of file diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index bdeb452..649e664 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -294,6 +294,7 @@ window-rule { // - host Firefox (app-id is "firefox") // - Flatpak Firefox (app-id is "org.mozilla.firefox") match app-id=r#"firefox$"# title="^Picture-in-Picture$" + match app-id=r#"zen$"# title="^Picture-in-Picture$" open-floating true } @@ -333,7 +334,7 @@ binds { // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+Return { spawn "foot"; } - Mod+D { spawn "walker"; } + Mod+D { spawn "fuzzel"; } Super+Alt+L { spawn "swaylock"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. @@ -566,6 +567,7 @@ binds { Mod+Shift+P { power-off-monitors; } } +// wayland support spawn-at-startup "xwayland-satellite" environment { diff --git a/home-manager/dotfiles/niri/wallpapers/miku1.jpg b/home-manager/dotfiles/niri/wallpapers/miku1.jpg new file mode 100644 index 0000000..c3cbabf Binary files /dev/null and b/home-manager/dotfiles/niri/wallpapers/miku1.jpg differ diff --git a/home-manager/dotfiles/waybar/latte.css b/home-manager/dotfiles/waybar/latte.css new file mode 100644 index 0000000..bcbdafc --- /dev/null +++ b/home-manager/dotfiles/waybar/latte.css @@ -0,0 +1,26 @@ +@define-color rosewater #dc8a78; +@define-color flamingo #dd7878; +@define-color pink #ea76cb; +@define-color mauve #8839ef; +@define-color red #d20f39; +@define-color maroon #e64553; +@define-color peach #fe640b; +@define-color yellow #df8e1d; +@define-color green #40a02b; +@define-color teal #179299; +@define-color sky #04a5e5; +@define-color sapphire #209fb5; +@define-color blue #1e66f5; +@define-color lavender #7287fd; +@define-color text #4c4f69; +@define-color subtext1 #5c5f77; +@define-color subtext0 #6c6f85; +@define-color overlay2 #7c7f93; +@define-color overlay1 #8c8fa1; +@define-color overlay0 #9ca0b0; +@define-color surface2 #acb0be; +@define-color surface1 #bcc0cc; +@define-color surface0 #ccd0da; +@define-color base #eff1f5; +@define-color mantle #e6e9ef; +@define-color crust #dce0e8; diff --git a/home-manager/dotfiles/waybar/style.css b/home-manager/dotfiles/waybar/style.css index 2993e06..5e04083 100644 --- a/home-manager/dotfiles/waybar/style.css +++ b/home-manager/dotfiles/waybar/style.css @@ -1,4 +1,5 @@ @define-color primary rgba(123, 0, 44, 1); +@import "latte.css"; * { padding: 0; @@ -12,11 +13,11 @@ font-family: "DM Sans", "CodeNewRoman Nerd Font", sans-serif; font-weight: bold; font-size: 12px; - color: #000; + color: @text; } window#waybar { - background-color: #fff; + background-color: @base; padding-right: 12px; /*border: solid 2px @primary;*/ min-height: 14px; /* set waybar's height to 14px */ diff --git a/home-manager/flake.lock b/home-manager/flake.lock deleted file mode 100644 index 8797456..0000000 --- a/home-manager/flake.lock +++ /dev/null @@ -1,249 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "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-compat_2": { - "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": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1729147490, - "narHash": "sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "e2047498667aeb24e8493ff430a20cff713915f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", - "owner": "neovim", - "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs_2" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home-manager/flake.nix b/home-manager/flake.nix deleted file mode 100644 index 92c5ca0..0000000 --- a/home-manager/flake.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - description = "Home Manager configuration of harry123"; - - inputs = { - # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - }; - - outputs = { nixpkgs, home-manager, ... }@inputs: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - overlays = [ - inputs.neovim-nightly-overlay.overlays.default - ]; - in { - homeConfigurations."harry123" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - # Specify your home configuration modules here, for example, - # the path to your home.nix. - modules = [ ./home.nix - { - nixpkgs.overlays = overlays; - } - ]; - - specialArgs = { - inherit inputs; - }; - - # Optionally use extraSpecialArgs - # to pass through arguments to home.nix - }; - }; -} diff --git a/home-manager/home.nix b/home-manager/home.nix index bf73f67..0a633a9 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -5,11 +5,11 @@ osConfig, inputs, nixvim, + catppuccin, ... }: { - imports = [ inputs.walker.homeManagerModules.default ]; # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "harry123"; @@ -99,7 +99,13 @@ unzip p7zip + libsixel + unzip + p7zip + nixfmt-rfc-style + fuzzel + zsh-syntax-highlighting ] ++ lib.optionals pkgs.stdenv.isLinux [ kdePackages.dolphin @@ -111,7 +117,7 @@ # # Building this configuration will create a copy of 'dotfiles/screenrc' in # # the Nix store. Activating the configuration will then make '~/.screenrc' a # # symlink to the Nix store copy. - ".config/sway".source = dotfiles/sway; + # ".config/sway".source = dotfiles/sway; ".config/foot".source = dotfiles/foot; ".profile".source = dotfiles/.profile; ".config/waybar".source = dotfiles/waybar; @@ -119,6 +125,7 @@ ".bashrc".source = dotfiles/bash/.bashrc; ".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json; ".config/niri".source = dotfiles/niri; + ".config/fuzzel/fuzzel.ini".source = dotfiles/fuzzel/fuzzel.ini; # # You can also set the file content immediately. # ".gradle/gradle.properties".text = '' @@ -228,21 +235,36 @@ server.enable = true; }; - programs.walker = { - enable = true; - runAsService = true; + catppuccin = { + flavor = "latte"; + mpv.enable = true; + mako.enable = true; + lazygit.enable = true; + gtk.enable = true; + fzf.enable = true; + swaylock.enable = true; + }; - # All options from the config.json can be used here. - config = { - search.placeholder = "Example"; - ui.fullscreen = true; - list = { - height = 400; - }; - websearch.prefix = "?"; - switcher.prefix = "/"; + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + + shellAliases = { + ll = "ls -l"; + edit = "sudo -e"; + update = "sudo nixos-rebuild switch"; }; + history.size = 10000; + history.ignoreAllDups = true; + history.path = "$HOME/.zsh_history"; + history.ignorePatterns = [ + "rm *" + "pkill *" + "cp *" + ]; }; # Let Home Manager install and manage itself. diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix index f3783cf..550e443 100644 --- a/hosts/goober/configuration.nix +++ b/hosts/goober/configuration.nix @@ -14,8 +14,8 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../features/client/tailscale.nix - ../../features/client/sway.nix + ../../shared/client/tailscale.nix + ../../shared/client/niri.nix ./features/default.nix ]; @@ -81,9 +81,11 @@ "wheel" "audio" "video" - ]; # Enable ‘sudo’ for the user. + "networkmanager" + ]; + packages = with pkgs; [ - firefox + inputs.zen-browser.packages."${system}".default tailscale mpv logisim-evolution diff --git a/hosts/goober/features/hardware/nvidia.nix b/hosts/goober/features/hardware/nvidia.nix index 68fae52..ade3976 100644 --- a/hosts/goober/features/hardware/nvidia.nix +++ b/hosts/goober/features/hardware/nvidia.nix @@ -1,8 +1,13 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { boot.blacklistedKernelModules = [ "nouveau" ]; - hardware.graphics.enable = true; + hardware.graphics = { + enable = true; + extraPackages = with pkgs; [ nvidia-vaapi-driver ]; + }; services.xserver.videoDrivers = [ "nvidia" ]; - hardware.nvidia.open = false; + hardware.nvidia = { + open = false; + }; } diff --git a/hosts/goober/features/software/flatpak.nix b/hosts/goober/features/software/flatpak.nix index 20da69a..c9a3896 100644 --- a/hosts/goober/features/software/flatpak.nix +++ b/hosts/goober/features/software/flatpak.nix @@ -1,12 +1,12 @@ -{config, ...}: { +{ config, ... }: +{ services.flatpak.enable = true; services.flatpak.packages = [ - "io.github.zen_browser.zen" "com.unicornsonlsd.finamp" ]; - services.flatpak.update.onActivation = true; + services.flatpak.update.onActivation = true; services.flatpak.update.auto = { enable = true; onCalendar = "weekly"; # Default value diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix index c0f1f2e..11a8b96 100644 --- a/hosts/goober/features/software/workstation.nix +++ b/hosts/goober/features/software/workstation.nix @@ -6,7 +6,6 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "reaper" "davinci-resolve" ]; environment.systemPackages = with pkgs; [ @@ -39,5 +38,7 @@ xfce.thunar eclipses.eclipse-java # school wants us to use it... + nil + jetbrains.idea-ultimate ]; } diff --git a/shared/client/default.nix b/shared/client/default.nix index d38c516..8b6b2cb 100644 --- a/shared/client/default.nix +++ b/shared/client/default.nix @@ -1,6 +1,6 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { imports = [ ./tailscale.nix - ] + ]; } diff --git a/shared/client/niri.nix b/shared/client/niri.nix index 430716e..f3e240b 100644 --- a/shared/client/niri.nix +++ b/shared/client/niri.nix @@ -12,6 +12,7 @@ nautilus libheif libheif.out + xwayland-satellite ]; services.gvfs.enable = true; @@ -27,6 +28,9 @@ pkgs.xdg-desktop-portal-gnome ]; }; + + services.xserver.displayManager.gdm.enable = true; + security.pam.loginLimits = [ { domain = "@users"; @@ -49,6 +53,10 @@ }) ]; + services.xserver.xkb = { + layout = "fr"; + }; + programs.waybar = { enable = true; };