diff --git a/flake.lock b/flake.lock index 4e52f38d..c9d78758 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1718997899, - "narHash": "sha256-YSyEOZVcrBGXln/AseioY1PLYH2FerFMfDhB10ez7LU=", + "lastModified": 1719516323, + "narHash": "sha256-JQzxlhnsPzJARplpJfOcjwJdKKnIaxWFDIvAkoeS6+4=", "owner": "nix-community", "repo": "browser-previews", - "rev": "8ee2bbab4fafc8493d9b334468d907aadfd55068", + "rev": "c236bd9905db3b1bb2f47da2782988ec5bd6ca90", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1718993733, - "narHash": "sha256-Ww0NQoZ/kUVMuV/alkkj1mv2rU5OBHvAu+qhAETXfc4=", + "lastModified": 1719505223, + "narHash": "sha256-7DGqcG5tespj/+5lYl7weWJwsvFjmFNcsWZaO9GDjP8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "3e5fc61611c1ce8f84d4ea326799f7c773723652", + "rev": "71a44f1448c037dbd9ef5df4eaedeb699499c506", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1719054173, - "narHash": "sha256-fXhuAexlBOI9dNDVN0R12KC1PZivOwuNvdCFHrBkV28=", + "lastModified": 1719323427, + "narHash": "sha256-f4ppP2MBPJzkuy/q+PIfyyTWX9OzqgPV1XSphX71tdA=", "owner": "cachix", "repo": "devenv", - "rev": "79911b1484a86f629bf0ce7fd796e2733e9ccd54", + "rev": "f810f8d8cb4e674d7e635107510bcbbabaa755a3", "type": "github" }, "original": { @@ -580,11 +580,11 @@ ] }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -600,11 +600,11 @@ ] }, "locked": { - "lastModified": 1719037157, - "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", + "lastModified": 1719438532, + "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -674,11 +674,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1716309977, - "narHash": "sha256-4jDQIcMDSFOOMBxVTEiC6Ck1vdc0kAFvv+StxnnE59Q=", + "lastModified": 1719068457, + "narHash": "sha256-q2p1YzCg9Dq2jt+6+kjHec9lb6BjCbg5rnVP2Uc/840=", "owner": "hyprwm", "repo": "hypridle", - "rev": "cb169c4e06cec9b4349e3668427e729d22328a54", + "rev": "7c5747b7855d06b4a63a4f515625ab3229278298", "type": "github" }, "original": { @@ -700,11 +700,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1719009683, - "narHash": "sha256-kvGqeJdHpqmDu5qJYCbylipbcPaSr1pFlO1m1xPtPeQ=", + "lastModified": 1719526850, + "narHash": "sha256-GPqjH+P9PPmln5KQbyCKm3kfL1NCykIPLejhUel//w4=", "ref": "refs/heads/main", - "rev": "4778afe2e6b4a6f8c7d218ccd8fe7e0bd4d2ee9c", - "revCount": 4874, + "rev": "b7f42a1e88a5b6c9d2dbdba31e0f35f6a02461e7", + "revCount": 4893, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -923,11 +923,11 @@ ] }, "locked": { - "lastModified": 1718804078, - "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { @@ -975,11 +975,11 @@ ] }, "locked": { - "lastModified": 1718119275, - "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -997,11 +997,11 @@ ] }, "locked": { - "lastModified": 1718977552, - "narHash": "sha256-kyilmbeCDdHFxup6L0UKvxyZ9T2lhy2vRNv0yeqh5j4=", + "lastModified": 1719380852, + "narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a7a9774538612c75324f785ab1300e67abc039d3", + "rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", "type": "github" }, "original": { @@ -1158,11 +1158,11 @@ ] }, "locked": { - "lastModified": 1719019506, - "narHash": "sha256-2lpbK6W3QHxc7BFeEDPumcBoNBx7dO7UE+ypwFVEOOc=", + "lastModified": 1719537947, + "narHash": "sha256-9J85rLXEnuX68Y6VzzlrkMAPmvRvjii5aHyMz5Jfq0Q=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "935d522e2a0306083d15e09c7d17a9358c141f29", + "rev": "b9212133b8b517f99d7cf217823ff43d0432b720", "type": "github" }, "original": { @@ -1200,11 +1200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1216,11 +1216,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1719067133, - "narHash": "sha256-9zBfQiLyLljsw3ZPWlsFDVG6xv3+kJpOQ8u9P4U3d5g=", + "lastModified": 1719555723, + "narHash": "sha256-e4t7AmgF40lPcTqaH0pbZ9++ueBZkqNmW6HAKYfZL8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "343b3d4e6dd5932dc717bad6412d27e7f2aca6d5", + "rev": "052a39dfa402d5935089338759d7130045dc9625", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1718895438, - "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ }, "nur": { "locked": { - "lastModified": 1719066846, - "narHash": "sha256-9RVBjpYm2wFgml0fy2SE0kCgY04rb2SVgKxiv/yfIAc=", + "lastModified": 1719554817, + "narHash": "sha256-LdDYnd2PfcMy/yZKVJ7ujkLA7f/hKM+jSVXxrCAecfs=", "owner": "nix-community", "repo": "NUR", - "rev": "333492b857b7a10e8abd7224e75c12d3c2cfbd23", + "rev": "7c4abedf3993f6e2b9862144c2c6311ab035c6ed", "type": "github" }, "original": { @@ -1392,11 +1392,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716736488, - "narHash": "sha256-cg+xT/xUvT8FQoITx7zh92pUEQj3LgRMw5NgI6aMqOo=", + "lastModified": 1718881664, + "narHash": "sha256-ZULRSiURptz6Da+yECzQDS30IIEAEOYyIAv5rs+p9Fg=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "9ca8b7ccd9665c30a3cb47ce64cf47649404e093", + "rev": "5392004e2b350afda0dd5e92ccd53ab9b1261947", "type": "github" }, "original": { @@ -1470,11 +1470,11 @@ "systems": "systems_15" }, "locked": { - "lastModified": 1718384679, - "narHash": "sha256-5kO9RhDfrsh+zv3e2V8OxwmtobtccPTkJolOaUml9+k=", + "lastModified": 1719389873, + "narHash": "sha256-e7EKgHgu+XscGqfv06w/Cgt6//oyXq3GgftpQQhpFUY=", "owner": "hyprland-community", "repo": "pyprland", - "rev": "c592e2a33bc7e63a39262001df9f03097b4af52c", + "rev": "93f03774eecdebf3a019ade06548ad03d0ff4cd1", "type": "github" }, "original": { @@ -1849,11 +1849,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { @@ -1889,11 +1889,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1718493286, - "narHash": "sha256-doAtbAqUA5GCldRqz1JGee61660ZTn2rj60hOixSKtE=", + "lastModified": 1719199629, + "narHash": "sha256-KTtOPwxXDGQQA41PgCv02OYBb+wUj07RsUbLuNbJyu0=", "ref": "dev", - "rev": "905ea665685c59c35f915351016fb06961370bfd", - "revCount": 962, + "rev": "a60ebe16d97aa0632801e6bc10a2e0d63c5ed5fe", + "revCount": 967, "type": "git", "url": "https://codeberg.org/explosion-mental/wallust" }, @@ -1911,11 +1911,11 @@ ] }, "locked": { - "lastModified": 1718524023, - "narHash": "sha256-p/ltl9jGZ/k9qqgmUXonCIbd40rcQQri6YYY7KVxmv4=", + "lastModified": 1719212309, + "narHash": "sha256-ErkTgm4qDtSRNRijBMwxcPsefrhTkIczGg7RaxoUy8g=", "owner": "Alexays", "repo": "Waybar", - "rev": "1c1089bade49f4b7745f8226886608005d1ed29c", + "rev": "ccc3c132124623bde5127937fe4fc9aa45a9d35d", "type": "github" }, "original": { diff --git a/flake/hosts.nix b/flake/hosts.nix index c93bd196..b98ff7e4 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -14,6 +14,7 @@ config = { allowUnfree = true; allowUnfreePredicate = _: true; + android_sdk.accept_license = true; }; }; in { diff --git a/home-manager/cli-tools.nix b/home-manager/cli-tools.nix index 577f6274..f6e2213a 100644 --- a/home-manager/cli-tools.nix +++ b/home-manager/cli-tools.nix @@ -27,16 +27,8 @@ And scripts may not work the high customised setup # fzf, a command-line fuzzy finder programs.fzf.enable = true; - # nnn, the terminal file manager - programs.nnn = { - enable = true; - package = pkgs.nnn.override {withNerdIcons = true;}; - extraPackages = with pkgs; [ - ffmpegthumbnailer - mediainfo - sxiv - ]; - }; + # Fast terminal file manager written in Rust + programs.yazi.enable = true; # zoxide, A smarter cd command which learns your habits as you go programs.zoxide = { @@ -52,4 +44,17 @@ And scripts may not work the high customised setup home.packages = with pkgs; [ tree # List directory recursively in tree structure ]; + + /* + # nnn, the terminal file manager + programs.nnn = { + enable = true; + package = pkgs.nnn.override {withNerdIcons = true;}; + extraPackages = with pkgs; [ + ffmpegthumbnailer + mediainfo + sxiv + ]; + }; + */ } diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix index 3f588042..ad1b3108 100644 --- a/pkgs/user-packages.nix +++ b/pkgs/user-packages.nix @@ -84,28 +84,29 @@ # Editors # # emacs + # IDEs # + (jetbrains.plugins.addPlugins jetbrains.phpstorm [ + "github-copilot" + "nixidea" + ]) + (jetbrains.plugins.addPlugins jetbrains.rust-rover [ + "github-copilot" + "nixidea" + ]) + # whatsapp-for-linux libreoffice-fresh deluge # Torrent client shotwell # GNOME image editor - # jetbrains.phpstorm - # jetbrains.rust-rover - androidStudioPackages.beta gnome.gnome-logs # GNOME log viewer warp # file transfer, also install android app + clapper ]) ++ (with pkgs-edge; [ # list of latest packages from nixpkgs master # Can be used to install latest version of some packages # Some packages may not be cached so.. it may take some time to build - (jetbrains.plugins.addPlugins jetbrains.phpstorm [ - "github-copilot" - "nixidea" - ]) - (jetbrains.plugins.addPlugins jetbrains.rust-rover [ - "github-copilot" - "nixidea" - ]) + android-studio-full ]); services.flatpak.packages = [ diff --git a/system/hardware/graphics.nix b/system/hardware/graphics.nix index a17bf059..7b3ee3a5 100644 --- a/system/hardware/graphics.nix +++ b/system/hardware/graphics.nix @@ -18,7 +18,7 @@ in { # Extra drivers extraPackages = (with pkgs; [ - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl libva ]) @@ -29,7 +29,7 @@ in { ]); # For 32 bit applications extraPackages32 = with pkgs.driversi686Linux; [ - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl ]; }; diff --git a/system/hyprland.nix b/system/hyprland.nix index 6bfedb39..778d4cf7 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -2,6 +2,8 @@ # this config file contains package, portal and services declaration # made specifically for hyprland { + config, + lib, pkgs, pkgs-edge, inputs, @@ -20,7 +22,7 @@ in { # Enable Hyprland Window Manager programs.hyprland = { enable = true; - systemd.setPath.enable = true; + systemd.setPath.enable = lib.versionOlder config.programs.hyprland.package.version "0.41.2"; package = (pkgs-hyprland.hyprland.override {stdenv = pkgs.clangStdenv;}).overrideAttrs (prevAttrs: { diff --git a/system/nix-settings.nix b/system/nix-settings.nix index c69e7531..cd684f84 100644 --- a/system/nix-settings.nix +++ b/system/nix-settings.nix @@ -4,7 +4,7 @@ userSettings, ... }: { - nix.package = pkgs.nixVersions.latest; # Use latest nix + nix.package = pkgs.lix; # pkgs.nixVersions.latest; # Use latest nix nix.settings.trusted-users = [userSettings.username]; # FIXME: if someday custom cache works without this # Features for building @@ -29,4 +29,5 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = "1"; + nixpkgs.config.android_sdk.accept_license = true; } diff --git a/system/services/ananicy-cpp.nix b/system/services/ananicy-cpp.nix index 97beb05d..4c4bd498 100644 --- a/system/services/ananicy-cpp.nix +++ b/system/services/ananicy-cpp.nix @@ -1,8 +1,8 @@ -{pkgs, pkgs-edge, ...}: { +{pkgs, ...}: { # Enable Ananicy CPP for better system performance services.ananicy = { enable = true; - package = pkgs-edge.ananicy-cpp; + package = pkgs.ananicy-cpp; # from nixpkgs: ananicy-rules-cachyos rulesProvider = pkgs.ananicy-cpp-rules.overrideAttrs (prevAttrs: { patches = [