diff options
Diffstat (limited to '')
| -rw-r--r-- | home/baseline/default.nix | 10 | ||||
| -rw-r--r-- | home/baseline/git.nix | 9 | ||||
| -rw-r--r-- | home/baseline/graphics.nix | 7 | ||||
| -rw-r--r-- | home/baseline/nvim.nix | 9 | ||||
| -rw-r--r-- | home/baseline/zsh.nix | 10 | ||||
| -rw-r--r-- | home/baseline/zshrc.nix | 8 | ||||
| -rw-r--r-- | home/default.nix | 2 | ||||
| -rw-r--r-- | home/desktop/default.nix | 10 | ||||
| -rw-r--r-- | home/desktop/firefox.nix | 12 | ||||
| -rw-r--r-- | home/desktop/sway.nix | 32 | ||||
| -rw-r--r-- | home/environ/default.nix | 2 | ||||
| -rw-r--r-- | home/environ/gpg.nix | 10 | ||||
| -rw-r--r-- | home/environ/pass.nix | 32 | ||||
| -rw-r--r-- | home/environ/path.nix | 14 | ||||
| -rw-r--r-- | home/environ/source.nix | 10 | ||||
| -rw-r--r-- | home/environ/ssh.nix | 10 | ||||
| -rw-r--r-- | home/environ/tmux.nix | 10 | ||||
| -rw-r--r-- | home/environ/units.nix | 12 | ||||
| -rw-r--r-- | home/environ/vtmp.nix | 9 | ||||
| -rw-r--r-- | home/isolation/default.nix | 9 | ||||
| -rw-r--r-- | home/pim/dav.nix | 12 | ||||
| -rw-r--r-- | home/pim/syncthing.nix | 9 |
22 files changed, 164 insertions, 84 deletions
diff --git a/home/baseline/default.nix b/home/baseline/default.nix index a859fb7..046a475 100644 --- a/home/baseline/default.nix +++ b/home/baseline/default.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.baseline; -in -{ +in { imports = [ ./git.nix ./graphics.nix diff --git a/home/baseline/git.nix b/home/baseline/git.nix index faad082..9707f44 100644 --- a/home/baseline/git.nix +++ b/home/baseline/git.nix @@ -1,8 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: with lib; let cfg = config.local; -in -{ +in { config = { programs.git = { enable = true; diff --git a/home/baseline/graphics.nix b/home/baseline/graphics.nix index 5948dd0..0e349c6 100644 --- a/home/baseline/graphics.nix +++ b/home/baseline/graphics.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; { config = { dconf.settings = { diff --git a/home/baseline/nvim.nix b/home/baseline/nvim.nix index 882788d..edcabe8 100644 --- a/home/baseline/nvim.nix +++ b/home/baseline/nvim.nix @@ -1,8 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: with lib; let cfg = config.local.baseline; -in -{ +in { config = { home.sessionVariables.EDITOR = "nvim"; diff --git a/home/baseline/zsh.nix b/home/baseline/zsh.nix index 48fdd4a..2be24b7 100644 --- a/home/baseline/zsh.nix +++ b/home/baseline/zsh.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.baseline; -in -{ +in { config = { programs.zsh = { enable = true; diff --git a/home/baseline/zshrc.nix b/home/baseline/zshrc.nix index fe8ec9d..b963649 100644 --- a/home/baseline/zshrc.nix +++ b/home/baseline/zshrc.nix @@ -1,4 +1,8 @@ -{ grml-zsh-config, local, ... }: '' +{ + grml-zsh-config, + local, + ... +}: '' source ${grml-zsh-config}/etc/zsh/zshrc export PATH="$PATH:$HOME/.cargo/bin" @@ -45,7 +49,7 @@ _GRML_NIX_SHELL="{''${INSTALLABLES[@]}} " fi - unset INSTALLABLES PATH_ITEM + unset INSTALLABLES PATH_ITEM function grml_nix_shell() { REPLY="$_GRML_NIX_SHELL" diff --git a/home/default.nix b/home/default.nix index 38963ef..67bc37b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,4 +1,4 @@ -{ flakes, ... }: { +{flakes, ...}: { imports = [ flakes.hm-isolation.homeManagerModule flakes.impermanence.nixosModules.home-manager.impermanence diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 1608693..d46e97e 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.desktop; -in -{ +in { imports = [ ./firefox.nix ./sway.nix diff --git a/home/desktop/firefox.nix b/home/desktop/firefox.nix index a074ac0..f19b3ad 100644 --- a/home/desktop/firefox.nix +++ b/home/desktop/firefox.nix @@ -1,14 +1,18 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.desktop; -in -{ +in { config = mkIf cfg.enable { programs.firefox = { enable = true; package = pkgs.firefox.override { - nativeMessagingHosts = [ pkgs.passff-host ]; + nativeMessagingHosts = [pkgs.passff-host]; }; profiles."main.profile" = { diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index a1fdc6f..d363e11 100644 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.desktop; -in -{ +in { config = mkIf cfg.enable { home.packages = [ pkgs.wlr-randr @@ -19,14 +23,17 @@ in enable = true; timeouts = [ - { timeout = 600; command = "${getExe pkgs.gtklock} -d"; } + { + timeout = 600; + command = "${getExe pkgs.gtklock} -d"; + } ]; }; }; systemd.user.services.wl-gammarelay-rs = { - Unit.After = [ "sway-session.target" ]; - Install.WantedBy = [ "sway-session.target" ]; + Unit.After = ["sway-session.target"]; + Install.WantedBy = ["sway-session.target"]; Service.ExecStart = getExe pkgs.wl-gammarelay-rs; }; @@ -40,7 +47,7 @@ in fonts = { size = 11.0; - names = [ "DejaVu Sans Mono" ]; + names = ["DejaVu Sans Mono"]; style = "Bold Semi-Condensed"; }; @@ -49,13 +56,12 @@ in position = "top"; }; - keybindings = - let - mod = config.wayland.windowManager.sway.config.modifier; - wofi = config.programs.wofi.package; + keybindings = let + mod = config.wayland.windowManager.sway.config.modifier; + wofi = config.programs.wofi.package; - grimshot = getExe pkgs.sway-contrib.grimshot; - in + grimshot = getExe pkgs.sway-contrib.grimshot; + in mkOptionDefault { "${mod}+a" = "focus parent"; "${mod}+c" = "focus child"; diff --git a/home/environ/default.nix b/home/environ/default.nix index 53841f1..fcd4dd0 100644 --- a/home/environ/default.nix +++ b/home/environ/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{lib, ...}: with lib; { imports = [ ./gpg.nix diff --git a/home/environ/gpg.nix b/home/environ/gpg.nix index 91feee6..a8173b7 100644 --- a/home/environ/gpg.nix +++ b/home/environ/gpg.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; -in -{ +in { config = mkIf cfg.enable { programs.gpg = { enable = true; diff --git a/home/environ/pass.nix b/home/environ/pass.nix index 0762432..cd431a2 100644 --- a/home/environ/pass.nix +++ b/home/environ/pass.nix @@ -1,21 +1,27 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; -in -{ +in { config = mkIf cfg.enable { programs.password-store = { enable = true; - package = pkgs.pass.withExtensions (exts: (with exts; [ - pass-audit - pass-genphrase - pass-otp - pass-tomb - pass-update - ]) ++ [ - pkgs.local.pass-bcr - pkgs.local.pass-tail - ]); + package = pkgs.pass.withExtensions (exts: + (with exts; [ + pass-audit + pass-genphrase + pass-otp + pass-tomb + pass-update + ]) + ++ [ + pkgs.local.pass-bcr + pkgs.local.pass-tail + ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/pass"; diff --git a/home/environ/path.nix b/home/environ/path.nix index 912f781..9fc0a94 100644 --- a/home/environ/path.nix +++ b/home/environ/path.nix @@ -1,10 +1,14 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; py = pkgs.python3Packages; -in -{ +in { config = mkIf cfg.enable { home.packages = [ pkgs.calc @@ -13,8 +17,8 @@ in pkgs.local.athena-bccr.latest.firmador pkgs.gcc pkgs.gnome-screenshot - (pkgs.gajim.overrideAttrs (super: { buildInputs = super.buildInputs ++ [ pkgs.gsound ]; })) - (pkgs.local.athena-bccr.latest.gaudi.override { gaudiHash = "sha256-0nuku63USr5rC0rIwUC6toDN46qu8/KkezDTsVz9uJo="; }) + (pkgs.gajim.overrideAttrs (super: {buildInputs = super.buildInputs ++ [pkgs.gsound];})) + (pkgs.local.athena-bccr.latest.gaudi.override {gaudiHash = "sha256-0nuku63USr5rC0rIwUC6toDN46qu8/KkezDTsVz9uJo=";}) pkgs.gnucash pkgs.gruvbox-dark-icons-gtk pkgs.hack-font diff --git a/home/environ/source.nix b/home/environ/source.nix index ed9f53c..57b990e 100644 --- a/home/environ/source.nix +++ b/home/environ/source.nix @@ -1,10 +1,14 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; py = pkgs.python3Packages; -in -{ +in { config = mkIf cfg.enable { nix.registry."system".to = { type = "path"; diff --git a/home/environ/ssh.nix b/home/environ/ssh.nix index 6426dc8..d363baf 100644 --- a/home/environ/ssh.nix +++ b/home/environ/ssh.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; -in -{ +in { config = mkIf cfg.enable { programs.ssh = { enable = true; diff --git a/home/environ/tmux.nix b/home/environ/tmux.nix index 223851d..8d7b96f 100644 --- a/home/environ/tmux.nix +++ b/home/environ/tmux.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; -in -{ +in { options.local.environ.tmuxPass = { enable = mkEnableOption "tmux-pass plugin"; }; diff --git a/home/environ/units.nix b/home/environ/units.nix index bb039b7..ae4e680 100644 --- a/home/environ/units.nix +++ b/home/environ/units.nix @@ -1,13 +1,17 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.environ; -in -{ +in { config = mkIf cfg.enable { systemd.user = { timers = { units-cur = { - Install.WantedBy = [ "timers.target" ]; + Install.WantedBy = ["timers.target"]; Timer.OnCalendar = "daily"; Unit.Description = "Update currency information for 'units'"; }; diff --git a/home/environ/vtmp.nix b/home/environ/vtmp.nix index 9481b6f..bd02699 100644 --- a/home/environ/vtmp.nix +++ b/home/environ/vtmp.nix @@ -1,8 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: with lib; let cfg = config.local.environ; -in -{ +in { config = mkIf cfg.enable { systemd.user.tmpfiles.rules = [ "d %t/vtmp 0700" diff --git a/home/isolation/default.nix b/home/isolation/default.nix index d5d2979..aff006c 100644 --- a/home/isolation/default.nix +++ b/home/isolation/default.nix @@ -1,8 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: with lib; let cfg = config.local.shenvs; -in -{ +in { options.local.shenvs = { enable = mkEnableOption "hm-isolation shenvs"; }; diff --git a/home/pim/dav.nix b/home/pim/dav.nix index c19b2ed..a0759e2 100644 --- a/home/pim/dav.nix +++ b/home/pim/dav.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.local.dav; -in -{ +in { options.local.dav = with types; { enable = mkEnableOption "Web/Card/CalDAV"; }; @@ -42,7 +46,7 @@ in }; Install = { - WantedBy = [ "sockets.target" ]; + WantedBy = ["sockets.target"]; }; }; }; diff --git a/home/pim/syncthing.nix b/home/pim/syncthing.nix index e234c42..9ed1708 100644 --- a/home/pim/syncthing.nix +++ b/home/pim/syncthing.nix @@ -1,8 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: with lib; let cfg = config.local.syncthing; -in -{ +in { options.local.syncthing = { enable = mkEnableOption "syncthing"; }; |
