diff --git a/flake.nix b/flake.nix index a9e5699..c822d4e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A very basic flake"; + description = "My highly sofisticated and complicated flake"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; @@ -39,6 +39,7 @@ ... } @ inputs: let system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 492fe3a..20db387 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -2,6 +2,7 @@ inputs, pkgs, pkgs-stable, + lib, ... }: { imports = [ @@ -119,11 +120,12 @@ enable = true; wayland.enable = true; theme = "sddm-astronaut-theme"; - package = pkgs.kdePackages.sddm; + package = lib.mkDefault pkgs.kdePackages.sddm; extraPackages = [pkgs.sddm-astronaut pkgs.kdePackages.qtvirtualkeyboard]; }; }; - #services.desktopManager.plasma6.enable = true; + + services.desktopManager.plasma6.enable = true; #services.xserver.desktopManager.gnome.enable = true; #environment.gnome.excludePackages = with pkgs; [ # gnome-tour @@ -249,7 +251,6 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget - sddm-chili-theme (sddm-astronaut.override { themeConfig = { ScreenWidth = 1920; diff --git a/nixos/desktop/hyprland/hyprland.nix b/nixos/desktop/hyprland/hyprland.nix index 9837c5b..51b33e9 100644 --- a/nixos/desktop/hyprland/hyprland.nix +++ b/nixos/desktop/hyprland/hyprland.nix @@ -33,6 +33,8 @@ stylix.targets = { dunst.enable = true; + kde.enable = true; + gtk.enable = true; waybar = { enableCenterBackColors = false; @@ -117,6 +119,8 @@ "vesktop --start-minimized" "${pkgs.ferdium}/bin/ferdium --minimized" "${pkgs.plasma5Packages.kdeconnect-kde}/bin/kdeconnect-indicator" + + "systemctl --user start hyprpolkitagent" #"swww-daemon --format xrgb" #"swww ../../aurora_borealis.png" "hypridle" @@ -135,7 +139,6 @@ #"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH" #"dbus-update-activation-environment --systemd --all # for XDPH" #"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH" - #"$scrPath/polkitkdeauth.sh # authentication dialogue for GUI apps" ]; "$mod" = "SUPER"; @@ -188,8 +191,8 @@ ]; bindel = [ - ",XF86AudioLowerVolume, exec, swayosd-client --output-volume -1" - ",XF86AudioRaiseVolume, exec, swayosd-client --output-volume 1" + ",XF86AudioLowerVolume, exec, swayosd-client --output-volume -5" + ",XF86AudioRaiseVolume, exec, swayosd-client --output-volume 5" # Brightness ",XF86MonBrightnessUp, exec, swayosd-client --brightness raise" ",XF86MonBrightnessDown, exec, swayosd-client --brightness lower" diff --git a/nixos/desktop/hyprland/packages.nix b/nixos/desktop/hyprland/packages.nix index 8b33dbd..c4d3642 100644 --- a/nixos/desktop/hyprland/packages.nix +++ b/nixos/desktop/hyprland/packages.nix @@ -3,6 +3,7 @@ hyprlock hyprpicker hypridle + hyprpolkitagent kdePackages.dolphin diff --git a/nixos/home.nix b/nixos/home.nix index 29e886d..eaaf13e 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -1,5 +1,4 @@ -{pkgs, -...}: { +{...}: { home.username = "foglar"; home.homeDirectory = "/home/foglar"; home.stateVersion = "24.05"; # Please read the comment before changing. @@ -14,12 +13,7 @@ games.enable = true; gtk.enable = true; - qt = { - enable = true; - style.package = pkgs.libsForQt5.breeze-qt5; - style.name = "breeze-dark"; - platformTheme.name = "kde"; - }; + programs.bash = { enable = true; enableCompletion = true; diff --git a/nixos/packages/programming/code.nix b/nixos/packages/programming/code.nix index 8c3da41..3a17b73 100644 --- a/nixos/packages/programming/code.nix +++ b/nixos/packages/programming/code.nix @@ -11,7 +11,6 @@ config = lib.mkIf config.vscode.enable { home.packages = with pkgs; [ vscode - python3 gopls ];