diff --git a/configuration.nix b/configuration.nix index a37e163..47f4168 100644 --- a/configuration.nix +++ b/configuration.nix @@ -119,7 +119,7 @@ enable = true; wrappedBinaries = { vesktop = { - executable = "${pkgs.vesktop}/bin/vesktop"; + executable = "${pkgs-stable.vesktop}/bin/vesktop"; profile = "${pkgs.firejail}/etc/firejail/vesktop.profile"; extraArgs = [ "--ignore=dbus-system" diff --git a/flake.lock b/flake.lock index 2ac5a16..bce5593 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -20,24 +20,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -45,11 +27,11 @@ ] }, "locked": { - "lastModified": 1769699427, - "narHash": "sha256-dAQt3qXugGhg92A+jqaUcmH0elbgEN/mV4vy1+ohLZk=", + "lastModified": 1768366276, + "narHash": "sha256-NUdsaB6H1wvbOC7oh1UZ7Ojg1I+mYBQv8ovlMB6FbHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a08ab21abc8b482f41c521b5f9b0df5b18a67eb", + "rev": "4e235a8746b195e335306d898f0cc93ad6c4564c", "type": "github" }, "original": { @@ -66,11 +48,11 @@ ] }, "locked": { - "lastModified": 1768598210, - "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -85,11 +67,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769548169, - "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", + "lastModified": 1767822991, + "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", "owner": "nix-community", "repo": "impermanence", - "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", + "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", "type": "github" }, "original": { @@ -98,35 +80,13 @@ "type": "github" } }, - "nix4nvchad": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nvchad-starter": "nvchad-starter" - }, - "locked": { - "lastModified": 1769660296, - "narHash": "sha256-y5HtWU7aNNVKUioc4+HBhySFTFMBrlDch9nE94l00uA=", - "owner": "nix-community", - "repo": "nix4nvchad", - "rev": "fdad059e50cda9aa6c5cf340c207099ad21aa5d8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix4nvchad", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -137,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -153,11 +113,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1768242861, + "narHash": "sha256-F4IIxa5xDHjtrmMcayM8lHctUq1oGltfBQu2+oqDWP4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "1327e798cb055f96f92685df444e9a2c326ab5ed", "type": "github" }, "original": { @@ -169,11 +129,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { @@ -185,11 +145,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -199,29 +159,11 @@ "type": "github" } }, - "nvchad-starter": { - "flake": false, - "locked": { - "lastModified": 1753939018, - "narHash": "sha256-xdLr6tlU9uA+wu0pqha2br0fdVm+1MjgjbB5awz9ICU=", - "owner": "NvChad", - "repo": "starter", - "rev": "e3572e1f5e1c297212c3deeb17b7863139ce663e", - "type": "github" - }, - "original": { - "owner": "NvChad", - "ref": "main", - "repo": "starter", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", - "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", @@ -231,14 +173,14 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1769316930, - "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", + "lastModified": 1768107098, + "narHash": "sha256-mSthw4k7jkB5S8+NYZwrQFItLj+17Se7Wn0pIfdASbc=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b2ce438f386943ef611e196a178af2d79042903b", + "rev": "2e40e07527f9d724b1578f0af590ab345e836ec3", "type": "github" }, "original": { @@ -261,21 +203,6 @@ "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 979ad72..c85379c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,14 +12,10 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - + impermanence.url = "github:nix-community/impermanence"; - spicetify-nix.url = "github:Gerg-L/spicetify-nix"; - nix4nvchad = { - url = "github:nix-community/nix4nvchad"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + spicetify-nix.url = "github:Gerg-L/spicetify-nix"; }; outputs = diff --git a/home.nix b/home.nix index fbd80ae..cd955d3 100644 --- a/home.nix +++ b/home.nix @@ -1,12 +1,12 @@ { config, pkgs, inputs, ... }: { - imports = [ inputs.spicetify-nix.homeManagerModules.default inputs.nix4nvchad.homeManagerModule ]; + imports = [ inputs.spicetify-nix.homeManagerModules.default ]; home.username = "xory"; home.homeDirectory = "/home/xory"; home.packages = with pkgs; [ - # neovim + neovim fastfetch git cava @@ -31,6 +31,7 @@ ]; }) mpv + kdePackages.kdenlive gimp inkscape krita @@ -64,10 +65,10 @@ ]; home.file = { - # ".config/nvim/init.lua" = { - # enable = true; - # source = ./config/nvim/init.lua; - # }; + ".config/nvim/init.lua" = { + enable = true; + source = ./config/nvim/init.lua; + }; ".config/hypr" = { enable = true; recursive = true; @@ -144,8 +145,6 @@ eval "$(direnv hook zsh)" mimeType = [ "x-scheme-handler/spotify" ]; }; - programs.nvchad.enable = true; - wayland.windowManager.hyprland.enable = true; programs.waybar.enable = true; programs.wofi.enable = true;