diff --git a/home/ags/default.nix b/home/ags/default.nix index 9f220b0..c51e97c 100644 --- a/home/ags/default.nix +++ b/home/ags/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: +{...}: { diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix index 5741f1f..52b1821 100644 --- a/home/alacritty/default.nix +++ b/home/alacritty/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { programs.alacritty = { diff --git a/home/git/default.nix b/home/git/default.nix index fe231df..a19923b 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +{ ...}: { programs.git = { enable = true; userEmail = "mail@joygnu.org"; diff --git a/home/gtk/default.nix b/home/gtk/default.nix index fc6e275..ef89184 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -1,10 +1,9 @@ -{ - pkgs, - config, - ... -}: let +{ pkgs, ... }: +let gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;}; -in { +in + +{ home.file = { ".local/share/icons/GruvboxPlus".source = "${gruvboxPlus}"; }; diff --git a/home/gtk/gruvbox-plus.nix b/home/gtk/gruvbox-plus.nix index d0a69e6..8e8d4ab 100644 --- a/home/gtk/gruvbox-plus.nix +++ b/home/gtk/gruvbox-plus.nix @@ -1,7 +1,10 @@ -{pkgs}: let +{pkgs}: +let link = "https://github.com/SylEleuth/gruvbox-plus-icon-pack/releases/download/v3.1/gruvbox-plus-icon-pack-3.1.zip"; in - pkgs.stdenv.mkDerivation { + pkgs.stdenv.mkDerivation + + { name = "gruvbox-plus"; src = pkgs.fetchurl { diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 4697073..8d3a44c 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ pkgs, ... }: { home.packages = with pkgs; [ rofi-wayland pavucontrol diff --git a/home/hyprland/wallpaper.png b/home/hyprland/wallpaper.png deleted file mode 100644 index 772d027..0000000 Binary files a/home/hyprland/wallpaper.png and /dev/null differ diff --git a/home/misc/default.nix b/home/misc/default.nix index 4974a74..795d056 100644 --- a/home/misc/default.nix +++ b/home/misc/default.nix @@ -1,5 +1,5 @@ -{ config }: +{ ... }: { home.username = "joy"; diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 1df84ed..e56a499 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -30,7 +30,7 @@ enable = true; renderer.groupEmpty = true; }; - # lualine.enable = true; + lualine.enable = true; }; keymaps = [ diff --git a/home/rofi/default.nix b/home/rofi/default.nix index 7693d36..e0d81cb 100644 --- a/home/rofi/default.nix +++ b/home/rofi/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ pkgs, lib, ... }: { programs.rofi = { diff --git a/home/stylix/default.nix b/home/stylix/default.nix deleted file mode 100644 index c56c794..0000000 --- a/home/stylix/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: - -{ - stylix.base16Scheme = { - base00 = "282828"; - base01 = "3c3836"; - base02 = "504945"; - base03 = "665c54"; - base04 = "bdae93"; - base05 = "d5c4a1"; - base06 = "ebdbb2"; - base07 = "fbf1c7"; - base08 = "fb4934"; - base09 = "fe8019"; - base0A = "fabd2f"; - base0B = "b8bb26"; - base0C = "8ec07c"; - base0D = "83a598"; - base0E = "d3869b"; - base0F = "d65d0e"; - }; - - stylix.image = ../hyprland/wallpaper.png; -} diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 764b44c..3a4266f 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ...} : +{ config, ...} : { programs.zsh = { diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 09b9e45..f8ca9bf 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, inputs, ... }: +{ inputs, ... }: { networking.hostName = "desktop"; networking.networkmanager.enable = true; @@ -10,6 +10,5 @@ ../../modules ./hardware.nix inputs.home-manager.nixosModules.default -# nixvim.nixosModules.nixvim ]; } diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 56a384b..a6f17c6 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, inputs, ... }: +{ inputs, ... }: { networking.hostName = "laptop"; networking.networkmanager.enable = true; diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix index 5e06000..7b95bad 100644 --- a/modules/fonts/default.nix +++ b/modules/fonts/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ...}: +{ pkgs, ... }: { fonts.packages = with pkgs; [ diff --git a/modules/gdm/default.nix b/modules/gdm/default.nix index 9870a80..fe78688 100644 --- a/modules/gdm/default.nix +++ b/modules/gdm/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { diff --git a/modules/misc/default.nix b/modules/misc/default.nix index a76c5e7..763828a 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -1,4 +1,4 @@ -{ config, inputs, pkgs, ... }: +{ inputs, pkgs, ... }: { services.blueman.enable = true; @@ -23,11 +23,6 @@ programs.gnupg.agent = { enableSSHSupport = true; }; -#programs.neovim = { -# enable = true; -# defaultEditor = true; -#}; - programs.hyprland.enable = true; users.defaultUserShell = pkgs.zsh; programs.zsh.enable = true; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index e24769f..1bb7387 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/modules/sound/default.nix b/modules/sound/default.nix index dbcfbfe..f99cde4 100644 --- a/modules/sound/default.nix +++ b/modules/sound/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { sound.enable = true; diff --git a/modules/vm/default.nix b/modules/vm/default.nix index daae9e3..cfb6bb8 100644 --- a/modules/vm/default.nix +++ b/modules/vm/default.nix @@ -1,14 +1,11 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - # Enable dconf (System Management Tool) programs.dconf.enable = true; - # Add user to libvirtd group users.users.joy.extraGroups = [ "libvirtd" ]; - # Install necessary packages environment.systemPackages = with pkgs; [ virt-manager virt-viewer @@ -18,10 +15,8 @@ win-spice virtiofsd freerdp - #gnome.adwaita-icon-theme ]; - # Manage the virtualisation services virtualisation = { libvirtd = { enable = true;