From 08a7dddea61029ded2a1acc2b708724ab533afcc Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 28 Dec 2022 14:42:00 -0700 Subject: [PATCH] fmt --- configs/neovim.nix | 8 +------- flake.nix | 9 ++++----- gui/xfce.nix | 16 +++++++++++++++- hosts/europa/default.nix | 3 ++- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/configs/neovim.nix b/configs/neovim.nix index 1097a8c..ac1fe04 100644 --- a/configs/neovim.nix +++ b/configs/neovim.nix @@ -42,13 +42,7 @@ let else baseVimPackages ++ [ vimPlugins.vim-go ]; in { - environment.systemPackages = with pkgs; [ - go - gopls - gotools - ripgrep - fzf - ]; + environment.systemPackages = with pkgs; [ go gopls gotools ripgrep fzf ]; programs.neovim = { enable = true; defaultEditor = true; diff --git a/flake.nix b/flake.nix index 44554ce..0c11bc0 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ oldStable.url = "github:NixOS/nixpkgs/nixos-22.05-small"; stable.url = "github:NixOS/nixpkgs/nixos-22.11-small"; - sops-nix = { + sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs-stable.follows = "stable"; inputs.nixpkgs.follows = "unstable"; @@ -80,10 +80,9 @@ }; }; - outputs = { self, unstable, unstableSmall, stable, oldStable - , nixos-hardware, reform, sshKnownHosts, microca, gostart, xintray, tsvnstat - , taskobs, mcchunkie, gqrss, darwin, xin-secrets, talon, peerix, ... - }@inputs: + outputs = { self, unstable, unstableSmall, stable, oldStable, nixos-hardware + , reform, sshKnownHosts, microca, gostart, xintray, tsvnstat, taskobs + , mcchunkie, gqrss, darwin, xin-secrets, talon, peerix, ... }@inputs: let supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/gui/xfce.nix b/gui/xfce.nix index e8f31c1..310d104 100644 --- a/gui/xfce.nix +++ b/gui/xfce.nix @@ -1,8 +1,22 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; { options = { xfce = { enable = mkEnableOption "Enable XFCE desktop."; }; }; config = mkIf config.xfce.enable { + security.pam.services = { + gdm.enableKwallet = true; + kdm.enableKwallet = true; + lightdm.enableKwallet = true; + sddm.enableKwallet = true; + slim.enableKwallet = true; + }; + + environment.systemPackages = with pkgs.libsForQt5; [ + kwallet + kwallet-pam + kwalletmanager + ]; + services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.xfce = { enable = true; }; }; diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index 89c6ec6..1166d3e 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -105,7 +105,8 @@ in { ''; shellAliases = { "gh" = "op plugin run -- gh"; - "godeps" = "go list -m -f '{{if not (or .Indirect .Main)}}{{.Path}}{{end}}' all"; + "godeps" = + "go list -m -f '{{if not (or .Indirect .Main)}}{{.Path}}{{end}}' all"; "mutt" = "neomutt -F /etc/neomuttrc"; "neomutt" = "neomutt -F /etc/neomuttrc"; };