re-add gui programs

This commit is contained in:
Cyryl Płotnicki 2024-03-16 09:11:37 +00:00
parent 4a70cd6410
commit 6d9cd30cce
4 changed files with 78 additions and 97 deletions

View file

@ -6,6 +6,7 @@
../../backups.nix ../../backups.nix
../../boot.nix ../../boot.nix
../../git ../../git
../../gui
../../kde ../../kde
../../vim ../../vim
../../zsh ../../zsh

View file

@ -1,16 +1,8 @@
{ { config, pkgs, discord, inputs, nixpkgs-nixos-unstable
config, , nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: {
pkgs,
discord,
inputs,
nixpkgs-nixos-unstable,
nixpkgs-nixos-stable-and-unfree,
nixpkgs-nixos-unstable-and-unfree,
...
}: {
security.chromiumSuidSandbox.enable = true; security.chromiumSuidSandbox.enable = true;
home-manager.users.cyryl = {...}: { home-manager.users.cyryl = { ... }: {
gtk = { gtk = {
enable = true; enable = true;
iconTheme = { iconTheme = {
@ -18,19 +10,13 @@
package = pkgs.gnome3.adwaita-icon-theme; package = pkgs.gnome3.adwaita-icon-theme;
}; };
}; };
qt = { qt = { enable = true; };
enable = true;
platformTheme = "gnome";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
imports = []; imports = [ ];
programs.chromium.enable = true; programs.chromium.enable = true;
programs.firefox.enable = true; programs.firefox.enable = true;
home.packages = home.packages = (with pkgs;
(with pkgs;
with pkgs.gnome3; with pkgs.gnome3;
with pkgs.python39Packages; [ with pkgs.python39Packages; [
anarchism anarchism
@ -85,9 +71,12 @@
yubikey-manager-qt yubikey-manager-qt
yubikey-personalization yubikey-personalization
yubikey-personalization-gui yubikey-personalization-gui
]) ]) ++ (with nixpkgs-nixos-unstable; [ gnucash thunderbird ])
++ (with nixpkgs-nixos-unstable; [gnucash thunderbird]) ++ [ nixpkgs-nixos-stable-and-unfree.discord ]
++ [nixpkgs-nixos-stable-and-unfree.discord] ++ (with nixpkgs-nixos-unstable-and-unfree; [
++ (with nixpkgs-nixos-unstable-and-unfree; [hopper jetbrains.rust-rover jetbrains.clion]); hopper
jetbrains.rust-rover
jetbrains.clion
]);
}; };
} }

View file

@ -1,18 +1,14 @@
{ { config, pkgs, inputs, system, ... }:
config, let
pkgs,
inputs,
system,
...
}: let
master = inputs.nixpkgs-master; master = inputs.nixpkgs-master;
pkgs = master.legacyPackages."${system}"; pkgs = master.legacyPackages."${system}";
in { in {
disabledModules = []; disabledModules = [ ];
imports = []; imports = [ ];
services.flatpak.enable = true; services.flatpak.enable = true;
services.desktopManager.plasma6.enable = true;
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.sddm = { displayManager.sddm = {
@ -20,7 +16,6 @@ in {
enableHidpi = true; enableHidpi = true;
wayland.enable = true; wayland.enable = true;
}; };
desktopManager.plasma6.enable = true;
}; };
users.users.cyryl.packages = with pkgs; []; users.users.cyryl.packages = with pkgs; [ ];
} }

View file

@ -1,8 +1,4 @@
{ { config, pkgs, ... }: {
config,
pkgs,
...
}: {
programs.atuin.enableZshIntegration = true; programs.atuin.enableZshIntegration = true;
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -14,12 +10,12 @@
share = true; share = true;
}; };
enableAutosuggestions = true; autosuggestion.enable = true;
enableCompletion = true; enableCompletion = true;
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
plugins = ["vi-mode" "git" "python" "history-substring-search" "tmux"]; plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ];
}; };
initExtra = '' initExtra = ''
@ -69,7 +65,7 @@
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
nix-direnv = {enable = true;}; nix-direnv = { enable = true; };
}; };
home.file.".config/starship.toml".text = '' home.file.".config/starship.toml".text = ''