diff --git a/hosts/x1g13/default.nix b/hosts/x1g13/default.nix index 73221ad..d0e74ec 100644 --- a/hosts/x1g13/default.nix +++ b/hosts/x1g13/default.nix @@ -7,7 +7,7 @@ { imports = [ - inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-9th-gen + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-13th-gen ./../../modules/drivers/intel-drivers.nix ./hardware-configuration.nix ]; diff --git a/modules/core/1password.nix b/modules/core/1password.nix deleted file mode 100644 index 42c5e07..0000000 --- a/modules/core/1password.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - programs._1password.enable = true; - programs._1password-gui = { - enable = true; - }; -} \ No newline at end of file diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 3969ad8..f716868 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,6 +1,11 @@ { pkgs, inputs, ... }: let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; + unstable = import inputs.nixpkgs-unstable { + system = pkgs.system; + config = { + allowUnfree = true; + }; + }; in { programs = { @@ -35,5 +40,7 @@ in unstable.msedit # Microsoft Editor nil # Nix Language Server docker # Containerization Platform + unstable._1password-cli + unstable._1password-gui ]; } diff --git a/modules/home/noctalia.nix b/modules/home/noctalia.nix index edda30a..7787c2d 100644 --- a/modules/home/noctalia.nix +++ b/modules/home/noctalia.nix @@ -22,9 +22,9 @@ { id = "WiFi"; } - { + { id = "CustomButton"; - icon = "wifi"; + icon = "access-point"; leftClickExec = "nm-connection-editor"; } { diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index 2bf725b..75d8aac 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -75,6 +75,7 @@ let userSettings = { "nix.enableLanguageServer" = true; "nix.serverPath" = "nil"; + "[nix].editor.defaultFormatter" = "jnoortheen.nix-ide"; }; }; }; diff --git a/profiles/gui.nix b/profiles/gui.nix index 2b4830a..a2a6f0c 100644 --- a/profiles/gui.nix +++ b/profiles/gui.nix @@ -6,7 +6,6 @@ ./../modules/core/hyprland.nix ./../modules/core/greetd.nix ./../modules/core/noctalia.nix - ./../modules/core/1password.nix ./../modules/core/sns.nix ];