Merge remote-tracking branch 'origin/nixos' into nixos

modules/profiles/desktop.nix

@@ -75,11 +75,9 @@ with lib; {
       git.signing = true;
       gpg.enable = true;
       hub.enable = true;
-      kitty.enable = true;
       ledger.enable = true;
       logseq.enable = true;
-      python.enable = true;
+      python.versions."311".enable = true;
-      rofi.enable = true;
       ssh = {
         enable = true;
         includeSecrets = [ ../../secrets/ssh-home.age ];

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
   ];
 }

modules/programs/hyprland/config.nix

@@ -141,6 +141,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

modules/programs/hyprland/default.nix

@@ -28,6 +28,13 @@ in
   };
 
   config = mkIf cfg.enable {
+    my = {
+      programs = {
+        kitty.enable = true;
+        rofi.enable = true;
+      };
+      services.dunst.enable = true;
+    };
 
     # enable nix module
     programs.hyprland = {
@@ -35,6 +42,7 @@ in
       package = null; # because we use the home-manager module
     };
 
+
     # enable home-manager module
     home-manager.users.moritz = {
       # import home-manager module
@@ -169,7 +177,6 @@ in
       } // (optionalAttrs cfg.nvidiaSupport
         {
           LIBVA_DRIVER_NAME = "nvidia";
-          XDG_SESSION_TYPE = "wayland";
           GBM_BACKEND = "nvidia-drm";
           __GLX_VENDOR_LIBRARY_NAME = "nvidia";
           WLR_NO_HARDWARE_CURSORS = "1";

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
+    ];
+  };
+}

modules/programs/python.nix

@@ -8,40 +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 = [
+  pythonPackages = version: attrNames pkgs."python${version}Packages";
-    "python311"
-    "python310"
-    "python39"
-    "python38"
-  ];
 
-  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 = genAttrs pythonVersions versionOpts;
-    versions = mkOption {
+    defaultPackages = mkOption {
-      default = [ "python310" ];
+      default = [ ];
-      type = with types; nonEmptyListOf (enum pythonVersions);
-      example = [ "python39" ];
-    };
-    packages = mkOption {
-      default = [
-        "flake8"
-        "isort"
-        "mypy"
-        "pytest"
-      ];
       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 {
+  config = {
-    users.users.moritz.packages = map (mkPython cfg.packages) cfg.versions
+    users.users.moritz.packages =
-      ++ [ pkgs.poetry pkgs.nodePackages.pyright ];
+      (
+        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;
   };
 }

modules/virtualisation/podman.nix

@@ -15,6 +15,7 @@ in
     virtualisation.podman = {
       enable = true;
       dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
     };
   };
 }