diff --git a/flake.nix b/flake.nix index 9d5ff5c..3952bf8 100644 --- a/flake.nix +++ b/flake.nix @@ -141,7 +141,7 @@ ./home ./home/shell ./home/applications - ./home/desktops/kde + ./home/desktops/gnome ]; }; } diff --git a/hosts/Bellerophon/default.nix b/hosts/Bellerophon/default.nix index b8acc21..f59fda5 100644 --- a/hosts/Bellerophon/default.nix +++ b/hosts/Bellerophon/default.nix @@ -15,7 +15,7 @@ in { inputs.nixos-hardware.nixosModules.common-cpu-intel ./hardware-configuration.nix - #./duo-configuration.nix + ./duo-configuration.nix inputs.disko.nixosModules.disko ./disko.nix @@ -24,7 +24,7 @@ in { ../../modules/containers.nix ../../modules/virtualization.nix ../../modules/harden.nix - ../../modules/kde.nix + ../../modules/gnome.nix ]; # Set networking diff --git a/hosts/Bellerophon/duo-configuration.nix b/hosts/Bellerophon/duo-configuration.nix index a4fb555..9a20d3c 100644 --- a/hosts/Bellerophon/duo-configuration.nix +++ b/hosts/Bellerophon/duo-configuration.nix @@ -1,9 +1,9 @@ {pkgs, ...}: let # Clone the repository duoRepo = builtins.fetchGit { - url = "https://github.com/panotaka/zenbook-duo-2024-ux8406ma-linux"; + url = "https://github.com/alesya-h/zenbook-duo-2024-ux8406ma-linux"; # Specify a specific commit or branch if needed - rev = "c178539c2c64e4e6867211d3557e6bfe9327014b"; # Uncomment this line to specify a branch or commit + rev = "2b8be1840f38f92e6626da7a442245b74ed0715f"; # Uncomment this line to specify a branch or commit }; # Path to the duo script @@ -32,7 +32,7 @@ in { wantedBy = ["default.target"]; after = ["graphical-session.target"]; - path = [pkgs.gnome-monitor-config pkgs.usbutils pkgs.inotify-tools pkgs.kdePackages.libkscreen]; + path = [pkgs.gnome-monitor-config pkgs.usbutils pkgs.inotify-tools]; serviceConfig = { ExecStart = "${modifiedDuoScript} watch-displays"; Restart = "always"; diff --git a/themes/gruvbox/default.nix b/themes/gruvbox/default.nix new file mode 100644 index 0000000..54e6988 --- /dev/null +++ b/themes/gruvbox/default.nix @@ -0,0 +1,59 @@ +{ + system, + inputs, + pkgs, + ... +}: { + stylix.enable = true; + + stylix.image = ./wallpaper.png; + + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml"; + + home-manager.sharedModules = [ + { + programs.vscode = { + extensions = with inputs.nix-vscode-extensions.extensions.${system}; [ + vscode-marketplace.jdinhlife.gruvbox + vscode-marketplace.vscode-icons-team.vscode-icons + ]; + userSettings = { + "workbench.colorTheme" = "Gruvbox Dark Hard"; + "workbench.iconTheme" = "vscode-icons"; + }; + }; + + stylix.cursor = { + package = pkgs.qogir-icon-theme; + name = "Qogir"; + }; + } + ]; + + stylix.cursor = { + package = pkgs.qogir-icon-theme; + name = "Qogir"; + }; + + stylix.fonts = { + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + + monospace = { + package = pkgs.nerdfonts.override {fonts = ["VictorMono"];}; + name = "VictorMono Nerd Font"; + }; + + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; +} diff --git a/themes/gruvbox/wallpaper.png b/themes/gruvbox/wallpaper.png new file mode 100644 index 0000000..49f8466 Binary files /dev/null and b/themes/gruvbox/wallpaper.png differ