diff --git a/.vscode/settings.json b/.vscode/settings.json index 13e48af..ad22b85 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "nixEnvSelector.nixShellConfig": "${workspaceRoot}/shell.nix" + "nixEnvSelector.nixShellConfig": "${workspaceRoot}/shell.nix", + "discord.enabled": false } \ No newline at end of file diff --git a/flake.lock b/flake.lock index 6c68ed3..863165d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cachix": { "locked": { - "lastModified": 1611737567, - "narHash": "sha256-r+Bol0hN5TFlX8cxF7Z6TQOE3EJSFHdDMr84Zm5ZVNs=", + "lastModified": 1612653566, + "narHash": "sha256-7qjA9OgOJ97wzEsgElnFnIIrWJ57Wy8p2IuG85fJDZ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85abeab48b5feda4b163e5bb32f50aad1164e415", + "rev": "8e78c2cfbae71720869c35b6710d652bf28b37cc", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1611784121, - "narHash": "sha256-H0KonFbl300yRHjb41meuEUGJYG/OY0sAu7Z6rAeMCU=", + "lastModified": 1612882769, + "narHash": "sha256-fp3brtAh5zhwYjSfynsEGDnw4pR8MNLB1lRh0leUW/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "db88b625f9230154878db56e934e940d84f153bc", + "rev": "87e2ec341bfda373d50ab58529b4bbb0eb9eb9a0", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "impermanence": { "flake": false, "locked": { - "lastModified": 1611747261, - "narHash": "sha256-747QXtiGrPOq/Hd5GLx20J8w0g6NLZuI2ozV+YggSJo=", + "lastModified": 1611747548, + "narHash": "sha256-2z5wmWda1uI4IkTZrW52jiHq3bzhYLc+GgjvaSd544M=", "owner": "nix-community", "repo": "impermanence", - "rev": "48f3a3018e3ea69037eb2ddea4a7439096708ccd", + "rev": "58558845bc68dcf2bb32caa80564f7fe3f6cbc61", "type": "github" }, "original": { @@ -52,22 +52,6 @@ "type": "github" } }, - "lldbpkgs": { - "locked": { - "lastModified": 1610289362, - "narHash": "sha256-vAA4Uef2b1mvnRRqONRoSfHaT7okGPi9kEataxE72zs=", - "owner": "oxalica", - "repo": "nixpkgs", - "rev": "871ca2455a75af983dafa16a01de3df09e15c497", - "type": "github" - }, - "original": { - "owner": "oxalica", - "ref": "vscode-lldb", - "repo": "nixpkgs", - "type": "github" - } - }, "mynex": { "inputs": { "nixpkgs": [ @@ -90,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1611884384, - "narHash": "sha256-f1tdYcZgFPFQki6g6byoIDvDrZQlH4I2212vHeW58WE=", + "lastModified": 1612883193, + "narHash": "sha256-pXGwXF/Kl/64VhYRnyULbKsU5sSaE4dWxvTN/RtmUys=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b837f5748608d5d85cf562f3fa6eea6f8d1fdc42", + "rev": "7deb84b02ee30523180ceb7a3570d316cd72bee7", "type": "github" }, "original": { @@ -115,11 +99,11 @@ ] }, "locked": { - "lastModified": 1611929163, - "narHash": "sha256-n4MSUnmVKPyY12EU3XIfcTLpznoMOtYOgPoBaKT6udk=", + "lastModified": 1612785904, + "narHash": "sha256-zegRO+ZJvnN3ph+Q87Gor5E4QZV3EaRm0APvoyoDrw0=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "f66efbb74476d55e477e1f39dec79241bfaccccb", + "rev": "3ac5f9154a25b099d2f61856c49698caca3cf0c0", "type": "github" }, "original": { @@ -132,7 +116,6 @@ "inputs": { "home": "home", "impermanence": "impermanence", - "lldbpkgs": "lldbpkgs", "mynex": "mynex", "nixpkgs": "nixpkgs", "nixpkgsWayland": "nixpkgsWayland" diff --git a/hosts/default.nix b/hosts/default.nix index 4565f4d..0d70e33 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -inputs@{ home, impermanence, mynex, nixpkgs, self, pkgs, lldbPkgs, system, ... }: +inputs@{ home, impermanence, mynex, nixpkgs, self, pkgs, system, ... }: let utils = import ../lib/utils.nix { inherit lib pkgs; }; @@ -10,7 +10,6 @@ let inherit system; specialArgs = { - inherit lldbPkgs; usr = { inherit utils; }; util = utils; nixosPersistence = "${impermanence}/nixos.nix"; diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix index 1a6770f..d2ff1d1 100644 --- a/hosts/lungmen.nix +++ b/hosts/lungmen.nix @@ -168,7 +168,7 @@ in }; virtualisation.podman.enable = true; services.postgresql = { - enable = false; + enable = true; enableTCPIP = true; authentication = pkgs.lib.mkOverride 10 '' local all all trust diff --git a/users/patriot/home.nix b/users/patriot/home.nix index 1677257..bb68c54 100644 --- a/users/patriot/home.nix +++ b/users/patriot/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, lldbPkgs, util, ... }: +{ config, lib, pkgs, util, ... }: let inherit (lib) mapAttrs' nameValuePair; inherit (builtins) readDir; @@ -213,7 +213,8 @@ in font-awesome (nerdfonts.override { fonts = [ "Iosevka" ]; }) # Programs - latte-dock + audacity + kdenlive gnome3.seahorse wine-staging cachix @@ -722,7 +723,7 @@ in # (mkExt "dance" "0.3.2" "gregoire" "sha256-+g8EXeCkPOPvZ60JoXkGTeSXYWrXmKrcbUaEfDppdgA=") (mkExt "material-icon-theme" "4.4.0" "PKief" "sha256-yiM+jtc7UW8PQTwmHmXHSSmvYC73GLh/cLYnmYqONdU=") (mkExt "github-vscode-theme" "1.1.5" "github" "sha256-EPAJjM4CbR8MhV+3pm6mC12KzSt2Em6pT+c2HknNntI=") - ]) ++ [ lldbPkgs.vscode-extensions.vadimcn.vscode-lldb ]; + ]) ++ [ pkgs.vscode-extensions.vadimcn.vscode-lldb ]; userSettings = { "workbench.iconTheme" = "material-icon-theme"; "workbench.colorTheme" = "GitHub Dark";