From 6c68d4240fb13ccf83e7dcd6592175ffd23a8fc2 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sat, 30 Dec 2023 06:20:13 +0100 Subject: [PATCH] Flake: update --- flake.lock | 12 ++++++------ flake.nix | 2 +- instances/odin/common_configuration.nix | 4 +--- instances/odin/hm.nix | 4 ++-- instances/thor/configuration.nix | 2 +- instances/thor/hm.nix | 4 ++-- modules/hm/bitwarden.nix | 5 ++--- modules/hm/research.nix | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index a5ed1f4..d3eedc5 100644 --- a/flake.lock +++ b/flake.lock @@ -328,11 +328,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1703545041, - "narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=", + "lastModified": 1703850206, + "narHash": "sha256-2oJ6XMp1sR+uZstsWDVxzs0E8HULGXBMdx8cLJsj9+8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c", + "rev": "1bace8cedd4fa4ea9efb5ea17a06b9d92af86206", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703832156, - "narHash": "sha256-2u/2oCSFH4QCVKeL/GHnse/S+rZ7aOMQeFJOIwCdBYU=", + "lastModified": 1703843314, + "narHash": "sha256-70rblJGFghDZq0Y+aONmlkwFWDgn54XQZ7K22lC4f3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66559cae054c9abe9f6f997c3c9720fbad8d5443", + "rev": "30864b8447bf85c3ff2efe7af71ffdc60e653288", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b84a363..3405df8 100644 --- a/flake.nix +++ b/flake.nix @@ -165,7 +165,7 @@ ./instances/odin/hardware-configuration.nix ./instances/odin/common_configuration.nix - ./modules/nixos/pro_audio.nix + # ./modules/nixos/pro_audio.nix ./modules/nixos/kdeconnect.nix ./modules/nixos/hyprland.nix diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix index f5b790a..3b5557e 100644 --- a/instances/odin/common_configuration.nix +++ b/instances/odin/common_configuration.nix @@ -189,9 +189,7 @@ with lib; { }; # services.joycond.enable = true; - - services.onedrive = { enable = true; package = pkgs.unstable_pkgs.onedrive; }; - + services.onedrive.enable = true; # Enable the OpenSSH daemon. services.openssh = { enable = true; diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index b66b963..8a5055d 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -132,8 +132,8 @@ ../../modules/hm/pass.nix ../../modules/hm/picom.nix ../../modules/hm/polybar.nix - ../../modules/hm/pro_audio.nix - ../../modules/hm/pycharm.nix + # ../../modules/hm/pro_audio.nix + # ../../modules/hm/pycharm.nix ../../modules/hm/research.nix ../../modules/hm/rofi.nix # ../../modules/hm/screen_locker.nix diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 52eebe6..2b95991 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -162,7 +162,7 @@ with lib; { }; # joycond.enable = true; keybase.enable = true; - onedrive = { enable = true; package = pkgs.unstable_pkgs.onedrive; }; + onedrive.enable = true; openssh = { enable = true; openFirewall = true; }; pipewire = { enable = true; diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index d802102..b77c998 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -123,8 +123,8 @@ ../../modules/hm/pass.nix ../../modules/hm/picom.nix ../../modules/hm/polybar.nix - ../../modules/hm/pro_audio.nix - ../../modules/hm/pycharm.nix + # ../../modules/hm/pro_audio.nix + # ../../modules/hm/pycharm.nix ../../modules/hm/research.nix ../../modules/hm/rofi.nix # ../../modules/hm/screen_locker.nix diff --git a/modules/hm/bitwarden.nix b/modules/hm/bitwarden.nix index fe8a51c..ec9a864 100644 --- a/modules/hm/bitwarden.nix +++ b/modules/hm/bitwarden.nix @@ -1,7 +1,6 @@ { pkgs, config, lib, ... }: { - home.packages = - [ pkgs.unstable_pkgs.bitwarden ] ++ + home.packages = [ pkgs.bitwarden ] ++ lib.optionals config.programs.rofi.enable (builtins.attrValues { - inherit (pkgs.unstable_pkgs) rbw rofi-rbw pinentry-gtk2; + # inherit (pkgs.unstable_pkgs) rbw rofi-rbw pinentry-gtk2; }); } diff --git a/modules/hm/research.nix b/modules/hm/research.nix index cab144c..229a5b4 100644 --- a/modules/hm/research.nix +++ b/modules/hm/research.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { home.packages = builtins.attrValues { - inherit (pkgs.unstable_pkgs) + inherit (pkgs) # mendeley # Reference manager obsidian# Note manager zotero