diff --git a/home/default.nix b/home/default.nix index f83d162..dfbe29a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -12,63 +12,129 @@ ".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern"); ".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern.css"); }; + + pointerCursor = { + gtk.enable = true; + x11.enable = true; + package = pkgs.catppuccin-cursors.mochaMauve; + name = "catppuccin-mocha-mauve-cursors"; + size = 24; + }; + gtk = { + enable = true; + theme = { + name = "CyberHack"; + package = pkgs.mypackages.cyberhack; + }; + }; + qt = { + enable = true; + style.name = "kvantum"; + platformTheme = "qt5ct"; + }; + dconf.settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; + }; }; - programs.home-manager.enable = true; - programs.foot = { - enable = true; - settings.main.font = (if vars.user == "alyx" then "monospace:size=20" else "monospace:size=12"); - settings.colors.alpha = "0.9"; + programs.home-manager.enable = true; + programs.foot = { + enable = true; + settings.main.font = (if vars.user == "alyx" then "monospace:size=20" else "monospace:size=12"); + settings.colors.alpha = "0.9"; + }; + + programs.ncmpcpp = { + enable = true; + settings = { + tags_separator = ";"; }; + }; - programs.ncmpcpp = { - enable = true; - settings = { - tags_separator = ";"; - }; - }; - - services.mpd = { - enable = true; - musicDirectory = "/home/${vars.user}/Music"; - extraConfig = '' - audio_output { - type "pipewire" - name "default pipewire" - } - ''; - }; - - services.mpd-mpris.enable = true; - - services.mpd-discord-rpc.enable = true; - - programs.waybar.enable = true; - - programs.git = { - enable = true; - settings = { - user.name = vars.user; - user.email = (if vars.user == "alyx" then "alyxwren@proton.me" else "beanigit@protonmail.com"); - commit.gpgsign = true; - gpg.format = "ssh"; - user.signingKey = "~/.ssh/id_ed25519.pub"; - init.defaultBranch = "master"; - }; - }; - - wayland.windowManager.sway.enable = true; - wayland.windowManager.sway.xwayland = true; - wayland.windowManager.sway.package = pkgs.swayfx; - wayland.windowManager.sway.config = null; - wayland.windowManager.sway.extraConfig = '' - include ~/.config/nixos/home/wms/sway + services.mpd = { + enable = true; + musicDirectory = "/home/${vars.user}/Music"; + extraConfig = '' + audio_output { + type "pipewire" + name "default pipewire" + } ''; - wayland.windowManager.sway.checkConfig = false; + }; - programs.obs-studio.enable = true; - home.packages = with pkgs; [ - fzf - ]; - } + services.mpd-mpris.enable = true; + + services.mpd-discord-rpc.enable = true; + + programs.waybar.enable = true; + + programs.git = { + enable = true; + settings = { + user.name = vars.user; + user.email = (if vars.user == "alyx" then "alyxwren@proton.me" else "beanigit@protonmail.com"); + commit.gpgsign = true; + gpg.format = "ssh"; + user.signingKey = "~/.ssh/id_ed25519.pub"; + init.defaultBranch = "master"; + }; + }; + + xdg.configFile = { + "Kvantum/CyberHack".source = "${pkgs.mypackages.cyberhack}/share/Kvantum/CyberHack"; + "Kvantum/CyberHack-90".source = "${pkgs.mypackages.cyberhack}/share/Kvantum/CyberHack-90"; + "Kvantum/CyberHack-solid".source = "${pkgs.mypackages.cyberhack}/share/Kvantum/CyberHack-solid"; + "Kvantum/kvantum.kvconfig".text = '' + [General] + theme=CyberHack-90 + ''; + }; + + wayland.windowManager.sway.enable = true; + wayland.windowManager.sway.xwayland = true; + wayland.windowManager.sway.package = pkgs.swayfx; + wayland.windowManager.sway.config = null; + wayland.windowManager.sway.extraConfig = '' + include ~/.config/nixos/home/wms/sway + ''; + wayland.windowManager.sway.checkConfig = false; + + programs.obs-studio.enable = true; + home.packages = with pkgs; [ + fzf + libsForQt5.qt5ct + kdePackages.qt6ct + libsForQt5.qtstyleplugin-kvantum + kdePackages.qtstyleplugin-kvantum + mypackages.cyberhack + android-tools + blender + brightnessctl + bs-manager + clonehero + comma + fastfetch + gimp + hyfetch + inkscape + kanshi + libnotify + mpc + nemo + pavucontrol + playerctl + prismlauncher + swaybg + swaynotificationcenter + tetrio-desktop + transmission_4-qt + vesktop + wl-clipboard + wlr-randr + wttrbar + v4l-utils + ]; +} diff --git a/home/wms/sway b/home/wms/sway index 83892c4..b93e0d9 100644 --- a/home/wms/sway +++ b/home/wms/sway @@ -115,18 +115,6 @@ input "4152:6202:SteelSeries_SteelSeries_Aerox_3_Wireless" { pointer_accel 0.1 } -output "Dell Inc. DELL P2411H MGMHG1681VAU" { - pos 0 1050 -} - -output "LG Display 0x0437 Unknown" { - scale 1.25 -} - -output "Samsung Electric Company SyncMaster HMDQ202016" { - pos 75 0 -} - mode "resize" { bindsym Down resize grow height 10 px bindsym Escape mode default diff --git a/hosts/absolution/absolution.nix b/hosts/absolution/absolution.nix index 4186888..3170e35 100644 --- a/hosts/absolution/absolution.nix +++ b/hosts/absolution/absolution.nix @@ -18,6 +18,8 @@ nano = "nvim"; }; + services.displayManager.ly.enable = true; + services.printing.enable = true; services.printing.drivers = [pkgs.gutenprint]; diff --git a/hosts/generic.nix b/hosts/generic.nix index 42fcb3a..182296d 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -2,7 +2,7 @@ { imports = [ -# ../../pkgs + ../pkgs ]; nix.settings.experimental-features = "nix-command flakes"; @@ -37,6 +37,11 @@ gnupg.enable = true; }; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + systemd.user.services.polkit-gnome-authentication-agent-1 = { description = "polkit-gnome-authentication-agent-1"; wantedBy = [ "graphical-session.target" ]; @@ -89,6 +94,11 @@ variant = ""; }; + environment.sessionVariables = { + QT_STYLE_OVERRIDE="Kvantum"; + QT_QPA_PLATFORMTHEME="qt5ct"; + }; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -109,8 +119,17 @@ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - - + mypackages.cyberhack + catppuccin-cursors.mochaMauve + gsettings-desktop-schemas + adwaita-icon-theme + lact + neovim + libsecret + wget + pciutils + unzip + p7zip ]; fonts.packages = with pkgs; [ diff --git a/pkgs/cyberhack.nix b/pkgs/cyberhack.nix new file mode 100644 index 0000000..d351d2b --- /dev/null +++ b/pkgs/cyberhack.nix @@ -0,0 +1,24 @@ +# /etc/nixos/pkgs/gtk-theme.nix + +{ + stdenvNoCC, + pkgs, +}: +stdenvNoCC.mkDerivation { + pname = "cyberhack"; + version = "1.0"; + src = pkgs.fetchgit { + url = "https://git.disroot.org/eudaimon/CyberHack.git"; + rev = "master"; + sha256 = "17lh4flbsgh5ddr6la2vnj3pd0185a2d7cwakm5c4ac9glx0wx0b"; + }; + installPhase = '' + mkdir -p $out/share/themes + cp -rT $src $out/share/themes/CyberHack + + mkdir -p $out/share/Kvantum + cp -r $src/Kvantum/* $out/share/Kvantum/ + + ''; + dontBuild = true; +} diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..a72406a --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,10 @@ +# /etc/nixos/pkgs/default.nix +{pkgs, ...}: let + callPackage = pkgs.callPackage; +in { + nixpkgs.overlays = [(final: prev: { + mypackages = { + cyberhack = callPackage ./cyberhack.nix {}; + }; + })]; +}