From 6eeabb35be4362f51248a270d085d99332941926 Mon Sep 17 00:00:00 2001 From: Adrian Gunnar Lauterer Date: Fri, 31 May 2024 12:12:19 +0200 Subject: [PATCH] home canges --- home/sway.nix | 84 ++++++++++++++++++++++++++++ machines/elrond/configuration.nix | 4 +- machines/galadriel/configuration.nix | 6 +- profiles/desktop.nix | 7 +++ 4 files changed, 95 insertions(+), 6 deletions(-) create mode 100644 home/sway.nix diff --git a/home/sway.nix b/home/sway.nix new file mode 100644 index 0000000..d6f34c3 --- /dev/null +++ b/home/sway.nix @@ -0,0 +1,84 @@ +{ config, pkgs, lib, ... }: +{ +imports = + [ + + ]; + + environment.systemPackages = with pkgs; [ + libsForQt5.qt5ct + qt6Packages.qt6ct + + waybar + networkmanagerapplet + networkmanager + libsForQt5.networkmanager-qt + + wdisplays + + swaylock-effects + #swaylock-fancy #migth change to this default may look prettier. + + foot + ## possible other options + #kitty + #alacrity + + wofi + wofi-emoji + bemoji + + brightnessctl + + pavucontrol + + #screenshots + grim + slurp + + swaybg + + workstyle + #swayest-workstyle #migth switch to this. + autotiling-rs + wleave + + pass-wayland + + ]; + + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + dina-font + proggyfonts + nerdfonts + ubuntu_font_family + zpix-pixel-font + + font-awesome + font-awesome_5 + font-awesome_4 + + ]; + + services.xserver.displayManager.sddm.enable = true; + + qt.platformTheme = "qt5c"; + + # Configure keymap in X11 + services.xserver = { + layout = "no"; + xkbVariant = ""; + }; + + + #TODO: add sway config with home manager to get proper dotfiles. + + + +} diff --git a/machines/elrond/configuration.nix b/machines/elrond/configuration.nix index d7f5cb4..d1db66b 100644 --- a/machines/elrond/configuration.nix +++ b/machines/elrond/configuration.nix @@ -19,8 +19,8 @@ # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. - networking.useDHCP = false; - networking.interfaces.ens3.useDHCP = true; # Interface is not constant. I really only want to use dhcp att all so could remove this in favor of the old way. + networking.useDHCP = true; + # networking.interfaces.ens3.useDHCP = true; # Interface is not constant. I really only want to use dhcp att all so could remove this in favor of the old way. networking.hostName = "elrond"; # Define your hostname. boot.kernel.sysctl = { diff --git a/machines/galadriel/configuration.nix b/machines/galadriel/configuration.nix index 31f7102..fd896bf 100644 --- a/machines/galadriel/configuration.nix +++ b/machines/galadriel/configuration.nix @@ -32,6 +32,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + networking.hostName = "galadriel"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -92,10 +93,7 @@ #services.polaris.enable = true; #services.navidrome.enable = true; - - #services.podgrab.enable = true; - #services.podgrab.port = 4242; - + #services.calibre-web.enable = true; #services.calibre-server.enable = true; diff --git a/profiles/desktop.nix b/profiles/desktop.nix index e3d16ae..7721db4 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -9,6 +9,7 @@ imports = ../packages/vim.nix #../home/home-full.nix + ../home/sway.nix ../packages/steam.nix ]; @@ -21,6 +22,9 @@ imports = prusa-slicer pdfslicer + + libsForQt5.qt5ct + qt6Packages.qt6ct ]; fonts.packages = with pkgs; [ @@ -35,6 +39,7 @@ imports = proggyfonts nerdfonts ubuntu_font_family + ]; # Enable CUPS to print documents. @@ -43,6 +48,8 @@ imports = services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; + qt.platformTheme = "qt5c"; + # Configure keymap in X11 services.xserver = { layout = "no";