From 21ebbdf59cce11709fa461467db4f1b05e8ebc7b Mon Sep 17 00:00:00 2001 From: xqtc Date: Tue, 16 Jul 2024 21:47:29 +0200 Subject: [PATCH] Some fixups --- flake.lock | 34 ++++++++++++------------- flake.nix | 2 +- home/modules/home-pkgs.nix | 2 ++ hosts/x86_64-linux/beleth/nextcloud.nix | 2 +- hosts/x86_64-linux/lilith/default.nix | 3 +-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 5f04839..a0ae8f6 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1721016201, - "narHash": "sha256-Jk54PIyWbdYLsi5tTQ3SFG4RWOqA5ui6+I9hjthM63o=", + "lastModified": 1721102596, + "narHash": "sha256-NwkxySooO4c+0AmWz+199HKB7cyZAOuzdqwDyYYJrow=", "owner": "rycee", "repo": "nur-expressions", - "rev": "41341e2fdeb70555c92ec7a4d3cd13a8498897fd", + "rev": "2004d4c0218505901d8fad29948f1a1191f658f6", "type": "gitlab" }, "original": { @@ -544,11 +544,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1721038144, - "narHash": "sha256-iIgCW53v4ai+Q7ZUmELXX2aA+gMrZpOMhCOzYenLUnI=", + "lastModified": 1721124769, + "narHash": "sha256-TsPEod+7+A2LqUb/8oZCGFx67BBqBmNfxPzkMXUhIy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "113763dc869d2dd4330f6f5614ec5400b0802c60", + "rev": "69367538edc76e4b7fc27e68cf66f03a37ccdfa0", "type": "github" }, "original": { @@ -624,11 +624,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721037488, - "narHash": "sha256-8sijRffJ4B6uzoKedXnNMZWZM4M0STV3kQEjZ6x7M3g=", + "lastModified": 1721042250, + "narHash": "sha256-CEOGzI9WFGezwJ3lok0F//1UEq5crzE2kZDLQK2EtfE=", "owner": "nix-community", "repo": "nixvim", - "rev": "433d2f213c76945ae108d7a7c93e7b499d58680e", + "rev": "b9ed90003273f0a75151b32948e16b44891f403c", "type": "github" }, "original": { @@ -819,15 +819,15 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1704167711, - "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", - "owner": "the-argus", + "lastModified": 1720901901, + "narHash": "sha256-TIbQS94RqxvBhijTGYDPbaUxwvPQPjULxH2ENghH5nw=", + "owner": "K900", "repo": "spicetify-nix", - "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", + "rev": "7cb65f5011021fd7bacf0a66eec407d444b84ea8", "type": "github" }, "original": { - "owner": "the-argus", + "owner": "K900", "repo": "spicetify-nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 30e7ec1..fac6d30 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - spicetify-nix.url = "github:the-argus/spicetify-nix"; + spicetify-nix.url = "github:K900/spicetify-nix"; nh.url = "github:/viperML/nh"; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 8a58355..a0443cf 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -38,6 +38,8 @@ in { pkgs.typst + pkgs.networkmanagerapplet + pkgs.anki pkgs.openvpn diff --git a/hosts/x86_64-linux/beleth/nextcloud.nix b/hosts/x86_64-linux/beleth/nextcloud.nix index 6e1e9b7..95a11cc 100644 --- a/hosts/x86_64-linux/beleth/nextcloud.nix +++ b/hosts/x86_64-linux/beleth/nextcloud.nix @@ -57,7 +57,7 @@ contacts calendar notes - # previewgenerator + previewgenerator ; recognize = pkgs.fetchNextcloudApp { diff --git a/hosts/x86_64-linux/lilith/default.nix b/hosts/x86_64-linux/lilith/default.nix index 1e6dcc5..7b01b7b 100644 --- a/hosts/x86_64-linux/lilith/default.nix +++ b/hosts/x86_64-linux/lilith/default.nix @@ -9,7 +9,7 @@ # Include the results of the hardware scan. ./hardware-configuration.nix ../../../common - ../beleth/docker.nix + ../../docker.nix #../../antivirus.nix ../../../modules/home-manager.nix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480 @@ -93,7 +93,6 @@ # services.printing.enable = true; # Enable sound. - sound.enable = true; #hardware.pulseaudio = { # enable = true; # package = pkgs.pulseaudioFull;