From 248542eee31a3f04e2f155ea7c2eb968c5cd01e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 3 Nov 2024 13:44:24 +0000 Subject: [PATCH] update --- flake.lock | 82 +++++++++++++----------------- nixos/boxes/foryog/default.nix | 2 +- nixos/boxes/foureighty/default.nix | 2 +- nixos/gnome/home.nix | 2 +- nixos/gui/default.nix | 2 +- 5 files changed, 40 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 5510c842..75855a6b 100644 --- a/flake.lock +++ b/flake.lock @@ -24,18 +24,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -70,11 +64,11 @@ ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", + "lastModified": 1730560543, + "narHash": "sha256-Ny8bMwoQH2JmLr2/+Zqer1Aizk5nCIXLPGUL1YyFS3I=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "rev": "e56d80b28314643da5a0a27c6371c0682ab8389f", "type": "github" }, "original": { @@ -91,11 +85,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1730190761, + "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "3979285062d6781525cded0f6c4ff92e71376b55", "type": "github" }, "original": { @@ -238,11 +232,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728005615, - "narHash": "sha256-w1WowT3N72xT3LDCoQFLLENTqkydqpGcVeiffcXXbHw=", + "lastModified": 1730313564, + "narHash": "sha256-1RBs/WOH3gp2ETDruEbM2vq2tPiJmqQ3wrjiKREE5NU=", "owner": "helix-editor", "repo": "helix", - "rev": "162028d444b1e56ee39775460adb65e4f957bc3f", + "rev": "38faf74febf3332fb119302324bfd21229d39e14", "type": "github" }, "original": { @@ -358,11 +352,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -390,11 +384,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1728154148, - "narHash": "sha256-exXN+9pKwBrMD0aA6JPmbMrbQ7QIn3V69B0RDfI4ONo=", + "lastModified": 1730578053, + "narHash": "sha256-Gz7Lon/enY8Y58j9n/jFboB/zCsGonOuD4ru83zO1qY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6241f4f0e6fb08021bf940770852a5d71af54bc8", + "rev": "527e4bfbddad967d66d4b6d760b31a1bfda4fd2a", "type": "github" }, "original": { @@ -406,11 +400,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -422,11 +416,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1728154148, - "narHash": "sha256-exXN+9pKwBrMD0aA6JPmbMrbQ7QIn3V69B0RDfI4ONo=", + "lastModified": 1730578053, + "narHash": "sha256-Gz7Lon/enY8Y58j9n/jFboB/zCsGonOuD4ru83zO1qY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6241f4f0e6fb08021bf940770852a5d71af54bc8", + "rev": "527e4bfbddad967d66d4b6d760b31a1bfda4fd2a", "type": "github" }, "original": { @@ -438,11 +432,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -454,11 +448,11 @@ }, "nur": { "locked": { - "lastModified": 1728153016, - "narHash": "sha256-MKjHJ7iSlZTSslIk8d+QwPNDBvrfz61pl6jl2wnyuo0=", + "lastModified": 1730573567, + "narHash": "sha256-4N2g4+CzkN2wjTsDelKD67DEp4T0yUpsyoSDKieLYM4=", "owner": "nix-community", "repo": "NUR", - "rev": "e04ee56d887b86becbcb7bcef332bdba891b5714", + "rev": "3199e01a7dc67e11dd0c175f0c6559fb5328c707", "type": "github" }, "original": { @@ -510,21 +504,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], "nixpkgs": [ "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { @@ -564,11 +554,11 @@ ] }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix index 9aa2fccd..286ff4d4 100644 --- a/nixos/boxes/foryog/default.nix +++ b/nixos/boxes/foryog/default.nix @@ -62,7 +62,7 @@ ../../home-manager/programs/kitty.nix ]; home.packages = - (with inputs.nixpkgs-master.legacyPackages."${system}"; [bisq-desktop zed-editor]) + (with inputs.nixpkgs-master.legacyPackages."${system}"; [zed-editor]) ++ (with pkgs; [lutris]) ++ (with inputs.endless-sky.legacyPackages."${system}"; [endless-sky]); }; diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix index b59c2045..5a37fac1 100644 --- a/nixos/boxes/foureighty/default.nix +++ b/nixos/boxes/foureighty/default.nix @@ -84,7 +84,7 @@ home-manager.users.cyryl = {...}: { imports = [../../home-manager/programs/alacritty.nix ../../gui/vscode.nix]; home.packages = with inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux"; - [bisq-desktop] + [] ++ (with pkgs; [lutris]) ++ (with inputs.endless-sky.legacyPackages."x86_64-linux"; [endless-sky]); }; diff --git a/nixos/gnome/home.nix b/nixos/gnome/home.nix index 42abb8be..2709a879 100644 --- a/nixos/gnome/home.nix +++ b/nixos/gnome/home.nix @@ -9,7 +9,7 @@ home.sessionVariables = {QT_QPA_PLATFORM = "wayland";}; home.packages = - (with pkgs; [gnome-usage gnome3.gnome-tweaks]) + (with pkgs; [gnome-usage gnome.gnome-tweaks]) ++ (with pkgs.gnomeExtensions; [ caffeine clipboard-indicator diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 18c736ed..c4645bfb 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -15,7 +15,7 @@ enable = true; iconTheme = { name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; + package = pkgs.gnome.adwaita-icon-theme; }; }; qt = {enable = true;};