diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 994dd6c..fd722a0 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -168,7 +168,6 @@ }; }; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; @@ -177,7 +176,10 @@ # enableSSHSupport = true; # }; - services.fprintd.enable = true; + services = { + fprintd.enable = true; + blueman.enable = true; + }; # List services that you want to enable: diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 103e9e9..589a263 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -7,6 +7,7 @@ ../../modules/home-manager/hyprland.nix ../../modules/home-manager/pass.nix ../../modules/home-manager/btop.nix + ../../modules/home-manager/blueman.nix ../../modules/home-manager/git.nix ../../modules/home-manager/wofi.nix ../../modules/home-manager/waybar.nix diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix index a2322d3..de6bc0a 100644 --- a/modules/home-manager/alacritty.nix +++ b/modules/home-manager/alacritty.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.alacritty = { enable = true; settings = { diff --git a/modules/home-manager/blueman.nix b/modules/home-manager/blueman.nix new file mode 100644 index 0000000..87b4034 --- /dev/null +++ b/modules/home-manager/blueman.nix @@ -0,0 +1,3 @@ +{...}: { + services.blueman-applet.enable = true; +} diff --git a/modules/home-manager/btop.nix b/modules/home-manager/btop.nix index 210b24f..d6263fb 100644 --- a/modules/home-manager/btop.nix +++ b/modules/home-manager/btop.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.btop = { enable = true; settings = { diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index 42bf192..4d984c8 100644 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.git = { enable = true; delta.enable = true; diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index 41c8128..d9b40dc 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ ./hyprlock.nix ./hyprpaper.nix diff --git a/modules/home-manager/hyprlock.nix b/modules/home-manager/hyprlock.nix index 6807ff7..13fb799 100644 --- a/modules/home-manager/hyprlock.nix +++ b/modules/home-manager/hyprlock.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.hyprlock = { enable = true; settings = { diff --git a/modules/home-manager/hyprpaper.nix b/modules/home-manager/hyprpaper.nix index b0f1453..88cd05a 100644 --- a/modules/home-manager/hyprpaper.nix +++ b/modules/home-manager/hyprpaper.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { services.hyprpaper = { enable = true; settings = { diff --git a/modules/home-manager/nextcloud.nix b/modules/home-manager/nextcloud.nix index 7393681..411b663 100644 --- a/modules/home-manager/nextcloud.nix +++ b/modules/home-manager/nextcloud.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { services.nextcloud-client = { enable = true; startInBackground = true; diff --git a/modules/home-manager/pass.nix b/modules/home-manager/pass.nix index d47e240..b735380 100644 --- a/modules/home-manager/pass.nix +++ b/modules/home-manager/pass.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.password-store = { enable = true; settings = { diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix index e2179e7..1db0511 100644 --- a/modules/home-manager/tmux.nix +++ b/modules/home-manager/tmux.nix @@ -1,6 +1,4 @@ -{ - pkgs, ... -}: { +{pkgs, ...}: { programs.tmux = { enable = true; baseIndex = 1; @@ -17,12 +15,23 @@ vim-tmux-navigator { plugin = resurrect; - extraConfig = "set -g @ressurect-strategy-nvim 'session'"; + extraConfig = '' + set -g @resurrect-strategy-vim 'session' + set -g @resurrect-strategy-nvim 'session' + set -g @resurrect-capture-pane-contents 'on' + ''; + } + { + plugin = continuum; + extraConfig = '' + set -g @continuum-restore 'on' + set -g @continuum-boot 'on' + set -g @continuum-save-interval '10' + ''; } ]; extraConfig = '' - set -as terminal-features ",xterm-256color:RGB" - ''; - + set -as terminal-features ",xterm-256color:RGB" + ''; }; } diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 74bfdec..97e9a5a 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.waybar = { enable = true; settings = { diff --git a/modules/home-manager/wofi.nix b/modules/home-manager/wofi.nix index 9c8832b..3e83ca0 100644 --- a/modules/home-manager/wofi.nix +++ b/modules/home-manager/wofi.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.wofi = { enable = true; settings = { diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index c852533..c70d984 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { programs.eza.enable = true; programs.zsh = { enable = true; diff --git a/modules/nixos/main-user.nix b/modules/nixos/main-user.nix index 213ce7c..6b83a5d 100644 --- a/modules/nixos/main-user.nix +++ b/modules/nixos/main-user.nix @@ -23,7 +23,7 @@ in { users.users.${cfg.username} = { isNormalUser = true; initialPassword = "12345"; - extraGroups = [ "docker" "input" "networkmanager" "wheel"]; + extraGroups = ["docker" "input" "networkmanager" "wheel"]; description = "Stefan"; shell = pkgs.zsh; };