From 86484e6bfdbf2937b6dfcf339bef2312f6039a86 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 28 Nov 2022 10:11:35 +0100 Subject: [PATCH] Switched onedrive from custom service to default one + removed unused unstable packages --- flake.lock | 84 +++++++++++++++++++++++++++++------ hm_modules/dunst.nix | 4 +- hm_modules/rofi.nix | 2 +- odin/common_configuration.nix | 2 +- odin/hm.nix | 2 +- thor/configuration.nix | 1 + thor/hm.nix | 2 +- 7 files changed, 77 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 65e3701..7041163 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -15,6 +31,27 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -62,11 +99,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1668334946, - "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", + "lastModified": 1669146234, + "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", + "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", "type": "github" }, "original": { @@ -77,11 +114,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668766498, - "narHash": "sha256-UjZlIrbHGlL3H3HZNPTxPSwJfr49jIfbPWCYxk0EQm4=", + "lastModified": 1669625751, + "narHash": "sha256-KIT7X/L0h0e5gbvvU3rPsrWsftei6i8obXPlvBYAy1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f42a45c015f28ac3beeb0df360e50cdbf495d44b", + "rev": "cc7ae74d400f29260eab2f48f1f44a10914d0f9c", "type": "github" }, "original": { @@ -91,13 +128,29 @@ "type": "github" } }, - "nixpkgs-u": { + "nixpkgs-stable": { "locked": { - "lastModified": 1668765800, - "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", + "lastModified": 1668984258, + "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", + "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-u": { + "locked": { + "lastModified": 1669411043, + "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", "type": "github" }, "original": { @@ -134,19 +187,22 @@ }, "pre-commit-hooks_2": { "inputs": { + "flake-compat": "flake-compat", "flake-utils": [ "flake-utils" ], + "gitignore": "gitignore", "nixpkgs": [ "nixpkgs-u" - ] + ], + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1667992213, - "narHash": "sha256-8Ens8ozllvlaFMCZBxg6S7oUyynYx2v7yleC5M0jJsE=", + "lastModified": 1669152228, + "narHash": "sha256-FEDReoTLWJHXcNso7aaAlAUU7uOqIR6Hc/C/nqlfooE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ebcbfe09d2bd6d15f68de3a0ebb1e4dcb5cd324b", + "rev": "078b0dee35e2da01334af682ec347463b70a9986", "type": "github" }, "original": { diff --git a/hm_modules/dunst.nix b/hm_modules/dunst.nix index cf40b21..4638283 100644 --- a/hm_modules/dunst.nix +++ b/hm_modules/dunst.nix @@ -2,10 +2,10 @@ let palette = pkgs.lib.rice.palette.toRGBHex pkgs.rice.colorPalette; in { - home.packages = with pkgs; [ unstable.dunst rice.font.normal.package ]; + home.packages = with pkgs; [ dunst rice.font.normal.package ]; services.dunst = { enable = true; - package = pkgs.unstable.dunst; + # package = pkgs.unstable.dunst; iconTheme = { package = pkgs.qogir-icon-theme; name = "Qogir-dark"; diff --git a/hm_modules/rofi.nix b/hm_modules/rofi.nix index 5c78d02..63265db 100644 --- a/hm_modules/rofi.nix +++ b/hm_modules/rofi.nix @@ -11,7 +11,7 @@ enable = true; location = "center"; font = "${pkgs.rice.font.monospace.name} ${toString pkgs.rice.font.monospace.size}"; - package = pkgs.unstable.rofi; + # package = pkgs.unstable.rofi; plugins = with pkgs.unstable;[ rofi-calc ]; diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index 17499ec..484e6b2 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -167,7 +167,7 @@ with lib; { syntaxHighlighting.enable = true; }; - # List services that you want to enable: + services.onedrive.enable = true; # Enable the OpenSSH daemon. services.openssh = { diff --git a/odin/hm.nix b/odin/hm.nix index 99f5f1a..1a64dff 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -141,7 +141,7 @@ ../hm_modules/nushell.nix ../hm_modules/obs-studio.nix ../hm_modules/office.nix - ../hm_modules/onedrive.nix + # ../hm_modules/onedrive.nix ../hm_modules/pass.nix ../hm_modules/picom.nix ../hm_modules/polybar.nix diff --git a/thor/configuration.nix b/thor/configuration.nix index c168367..fdc68b6 100644 --- a/thor/configuration.nix +++ b/thor/configuration.nix @@ -120,6 +120,7 @@ with lib; { package = pkgs.gnome3.gvfs; }; fwupd.enable = true; + onedrive.enable = true; openssh = { enable = true; openFirewall = true; diff --git a/thor/hm.nix b/thor/hm.nix index 2e6d24b..b6af65a 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -122,7 +122,7 @@ ../hm_modules/nushell.nix ../hm_modules/obs-studio.nix ../hm_modules/office.nix - ../hm_modules/onedrive.nix + # ../hm_modules/onedrive.nix ../hm_modules/pass.nix ../hm_modules/picom.nix ../hm_modules/polybar.nix