diff --git a/flake.nix b/flake.nix index 6b3fee8..38635f8 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,8 @@ nix-colors.url = "github:misterio77/nix-colors"; }; - outputs = { self, nix-colors, nixpkgs, nixpkgs-unstable, home-manager, hyprland - , agenix, deploy-rs, ... }@inputs: + outputs = { self, nix-colors, nixpkgs, nixpkgs-unstable, home-manager + , hyprland, agenix, deploy-rs, ... }@inputs: let inherit (self) outputs; lib = nixpkgs.lib; @@ -79,14 +79,15 @@ # Laptop "m3tam3re@m3-nix" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."x86_64-linux"; - extraSpecialArgs = { inherit inputs nix-colors; - }; + extraSpecialArgs = { inherit inputs nix-colors; }; modules = [ hyprland.homeManagerModules.default ./home/users/m3tam3re/m3-nix.nix allowUnfree + ({ config, pkgs, ... }: { + nixpkgs.overlays = [ overlay-unstable ]; + }) ]; - }; # Company Root Servera "m3tam3re@lkk-nix-1" = home-manager.lib.homeManagerConfiguration { diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix index 84617be..75ec486 100644 --- a/home/features/cli/default.nix +++ b/home/features/cli/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { imports = [ ./bat.nix ./fish.nix @@ -8,9 +7,11 @@ ./starship.nix ./tmux.nix ]; - + programs.autojump = { + enable = true; + enableFishIntegration = true; + }; home.packages = with pkgs; [ - autojump bc busybox comma diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index ae3e4ba..93f50b4 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -15,17 +15,15 @@ xdg.mimeApps = { enable = true; - defaultApplications = { - "application/pdf" = ["okular.desktop"]; - }; + defaultApplications = { "application/pdf" = [ "okular.desktop" ]; }; }; home.sessionVariables = { WEBKIT_DISABLE_COMPOSITING_MODE = "1"; + NIXOS_OZONE_WL = "1"; EDITOR = "emacs"; VISUAL = "emacs"; QT_QPA_PLATFORM = "wayland"; - QT_QPA_PLATFORMTHEME = "qt5ct"; XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_DATA_HOME = "\${HOME}/.local/share"; @@ -34,6 +32,10 @@ fonts.fontconfig.enable = true; + services.dunst = { + enable = true; + }; + home.packages = with pkgs; [ alacritty appimage-run @@ -45,14 +47,17 @@ flameshot fuzzel gnome.file-roller + gnome.nautilus + gnome.nautilus gnome.seahorse + gnome.sushi gnome.vinagre glib gsettings-desktop-schemas hyprpaper - libnotify nyxt pamixer + pavucontrol picom libsForQt5.qtstyleplugins qt5ct @@ -61,6 +66,8 @@ unzip usbutils v4l-utils + wlogout + wtype xdg-utils xdotool zip diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index 8b01fc7..dc3f848 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -11,14 +11,11 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ - betterdiscordctl - davinci-resolve - discord - element-desktop ffmpeg - freetube + fractal gphoto2 handbrake + libsForQt5.kdenlive makemkv mpv obs-studio diff --git a/home/features/desktop/qt.nix b/home/features/desktop/qt.nix index afaa6d2..0953fa4 100644 --- a/home/features/desktop/qt.nix +++ b/home/features/desktop/qt.nix @@ -2,6 +2,7 @@ { qt = { enable = true; + platformTheme = "gtk"; }; gtk = { enable = true; diff --git a/home/features/virtualization/podman.nix b/home/features/virtualization/podman.nix index 6e0c7b3..5c99ee3 100644 --- a/home/features/virtualization/podman.nix +++ b/home/features/virtualization/podman.nix @@ -10,7 +10,7 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ - podman + #podman ]; }; } diff --git a/home/users/m3tam3re/dotfiles/hyprland.nix b/home/users/m3tam3re/dotfiles/hyprland.nix index 29708ae..a76a81e 100644 --- a/home/users/m3tam3re/dotfiles/hyprland.nix +++ b/home/users/m3tam3re/dotfiles/hyprland.nix @@ -124,6 +124,7 @@ windowrule = float, title:branchdialog windowrule = float, Lxappearance windowrule = float, Wofi + windowrule = float, dunst windowrule = animation none,Wofi windowrule = float,viewnior windowrule = float,feh @@ -156,8 +157,8 @@ bind= $mainMod, F, fullscreen bind = $mainMod, E, exec, thunar bind = $mainMod, V, togglefloating, - bind = $mainMod, D, exec, rofi -modi drun emoji calc ssh -show drun -font 'Fira Code 13' -show-icons - bind = $mainMod, D, exec, rofi -modi drun emoji calc ssh -show drun -font 'Fira Code 13' -show-icons + bind = $mainMod, D, exec, rofi -modi 'drun,emoji,calc,ssh' -show drun -font 'Fira Code 13' -show-icons + bind = $mainMod, D, exec, rofi -modi 'drun,emoji,calc,ssh' -show drun -font 'Fira Code 13' -show-icons bind = $mainMod SHIFT, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle diff --git a/hosts/m3-nix/services/default.nix b/hosts/m3-nix/services/default.nix index 03ad6c0..5e0212c 100644 --- a/hosts/m3-nix/services/default.nix +++ b/hosts/m3-nix/services/default.nix @@ -12,7 +12,7 @@ # enable = true; # package = pkgs.gnome3.gvfs; # }; - services.kubo = { enable = true; }; # IPFS +# services.kubo = { enable = true; }; # IPFS services.printing.enable = true; services.netbird.enable = true; } diff --git a/hosts/m3-nix/services/virtualization.nix b/hosts/m3-nix/services/virtualization.nix index 8e725e4..81f3953 100644 --- a/hosts/m3-nix/services/virtualization.nix +++ b/hosts/m3-nix/services/virtualization.nix @@ -2,8 +2,9 @@ virtualisation.libvirtd.enable = true; virtualisation.libvirtd.qemu.swtpm.enable = true; virtualisation.libvirtd.qemu.ovmf.enable = true; - virtualisation.docker = { + virtualisation.podman = { enable = true; - enableOnBoot = true; + enableNvidia = true; + defaultNetwork.dnsname.enable = true; }; }