From d1466bbba38c99180608ce1b164e71677bb64d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 26 Jan 2023 10:54:34 +0100 Subject: [PATCH 1/4] add miracast module --- modules/programs/default.nix | 3 ++- modules/programs/miracast.nix | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 modules/programs/miracast.nix diff --git a/modules/programs/default.nix b/modules/programs/default.nix index abc4c23..d7e92ff 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -18,10 +18,12 @@ ./gpg.nix ./helix.nix ./hub.nix + ./hyprland ./kakoune.nix ./kitty.nix ./ledger ./logseq.nix + ./miracast.nix ./python.nix ./rofi ./spotify.nix @@ -32,6 +34,5 @@ ./xmonad ./zathura.nix ./zsh.nix - ./hyprland ]; } diff --git a/modules/programs/miracast.nix b/modules/programs/miracast.nix new file mode 100644 index 0000000..6181a88 --- /dev/null +++ b/modules/programs/miracast.nix @@ -0,0 +1,23 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; +let + cfg = config.my.programs.miracast; +in +{ + options.my.programs.miracast.enable = mkEnableOption "miracast"; + + config = mkIf cfg.enable { + networking.firewall = { + allowedTCPPorts = [ 7236 7250 ]; + allowedUDPPorts = [ 7236 5353 ]; + }; + users.users.moritz.packages = with pkgs; [ + gnome-network-displays + ]; + }; +} From eb101fbcf2d91ab14d310abc380cc1a00175335b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 26 Jan 2023 10:55:27 +0100 Subject: [PATCH 2/4] small improvements --- modules/profiles/desktop.nix | 2 -- modules/programs/hyprland/config.nix | 2 ++ modules/programs/hyprland/default.nix | 17 +++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index cc97e51..687fd40 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -76,11 +76,9 @@ with lib; { git.signing = true; gpg.enable = true; hub.enable = true; - kitty.enable = true; ledger.enable = true; logseq.enable = true; python.enable = true; - rofi.enable = true; ssh = { enable = true; includeSecrets = [ ../../secrets/ssh-home.age ]; diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 0ffe5d1..2a0d355 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -127,6 +127,8 @@ in # Fullscreen Applications # ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]} + ${mkRules ["opaque" "noblur" "noshadow"] ["class:^jetbrains-pycharm$"]} + # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER $windowMod = ALT diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index f869398..f8c9d8d 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -18,6 +18,14 @@ in }; config = mkIf cfg.enable { + my = { + programs = { + kitty.enable = true; + rofi.enable = true; + }; + services.dunst.enable = true; + }; + home-manager.users.moritz = { imports = [ inputs.hyprland.homeManagerModules.default ]; @@ -33,11 +41,6 @@ in layer = "top"; position = "top"; height = 30; - output = [ - "eDP-1" - "HDMI-A-1" - "HDMI-A-2" - ]; modules-left = [ "wlr/workspaces" ]; modules-center = [ "hyprland/window" ]; modules-right = [ "network" "memory" "cpu" "battery" "clock" ]; @@ -110,7 +113,10 @@ in playerctl brightnessctl grimblast + slurp + grim wl-clipboard + wdisplays ]; security.pam.services.swaylock = { }; @@ -134,7 +140,6 @@ in (if cfg.nvidiaSupport then { LIBVA_DRIVER_NAME = "nvidia"; - XDG_SESSION_TYPE = "wayland"; GBM_BACKEND = "nvidia-drm"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; WLR_NO_HARDWARE_CURSORS = "1"; From c78d9e9e24f57cb45100516d2e4ace1c42dce36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 26 Jan 2023 10:55:47 +0100 Subject: [PATCH 3/4] rework python module --- modules/profiles/desktop.nix | 2 +- modules/programs/python.nix | 66 ++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 687fd40..ffdd4e6 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -78,7 +78,7 @@ with lib; { hub.enable = true; ledger.enable = true; logseq.enable = true; - python.enable = true; + python.versions."311".enable = true; ssh = { enable = true; includeSecrets = [ ../../secrets/ssh-home.age ]; diff --git a/modules/programs/python.nix b/modules/programs/python.nix index f0dadfb..adecd55 100644 --- a/modules/programs/python.nix +++ b/modules/programs/python.nix @@ -8,41 +8,55 @@ with lib; let cfg = config.my.programs.python; - mkPython = packages: version: pkgs.${version}.withPackages (ps: map (flip getAttr ps) packages); + pythonVersions = map (version: "3${toString version}") (range 8 11); + enabledVersions = filterAttrs (name: value: value.enable) cfg.versions; - pythonVersions = [ - "python311" - "python310" - "python39" - "python38" - ]; + pythonPackages = version: attrNames pkgs."python${version}Packages"; - packageLists = map (version: attrNames pkgs."${version}Packages") cfg.versions; + commonPackages = + let + packageLists = map pythonPackages (attrNames enabledVersions); + in + foldl' intersectLists (head packageLists) (tail packageLists); - commonPackages = foldl' intersectLists (head packageLists) (tail packageLists); + versionOpts = version: { + enable = mkEnableOption (toString version); + pythonPackages = mkOption { + default = [ ]; + type = with types; listOf (enum (pythonPackages version)); + }; + }; in { options.my.programs.python = { - enable = mkEnableOption "python"; - versions = mkOption { - default = [ "python310" ]; - type = with types; nonEmptyListOf (enum pythonVersions); - example = [ "python39" ]; - }; - packages = mkOption { - default = [ - "flake8" - "isort" - "mypy" - "poetry" - "pytest" - "python-lsp-server" - ]; + versions = genAttrs pythonVersions versionOpts; + defaultPackages = mkOption { + default = [ ]; type = with types; listOf (enum commonPackages); }; + extraPackages = mkOption { + default = with pkgs; [ + poetry + ruff + python310Packages.python-lsp-server + ]; + type = with types; listOf package; + }; }; - config = mkIf cfg.enable { - users.users.moritz.packages = map (mkPython cfg.packages) cfg.versions; + config = { + users.users.moritz.packages = + ( + let + mkPython = version: + let + package = pkgs."python${version}"; + finalPythonPackages = cfg.versions.${version}.pythonPackages ++ cfg.defaultPackages; + getPythonPackages = ps: map (flip getAttr ps) finalPythonPackages; + in + package.withPackages getPythonPackages; + in + map mkPython (attrNames enabledVersions) + ) ++ cfg.extraPackages; }; } From 9f89c0d9a18057dcdac12f84517e3792a8993c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 26 Jan 2023 10:57:16 +0100 Subject: [PATCH 4/4] add podman settings --- modules/virtualisation/podman.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/virtualisation/podman.nix b/modules/virtualisation/podman.nix index f3fdf35..1698fe3 100644 --- a/modules/virtualisation/podman.nix +++ b/modules/virtualisation/podman.nix @@ -15,6 +15,7 @@ in virtualisation.podman = { enable = true; dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; }; }; }