Merge branch 'main' of github.com:GHOSCHT/nix-config

hosts/configuration.nix

@@ -16,7 +16,7 @@
     extraGroups = ["wheel" "video" "audio" "camera" "networkmanager" "lp" "scanner" "kvm" "libvirtd" "i2c" "tty" "dialout"];
   };
 
-  boot.supportedFilesystems = ["ntfs"];
+  boot.supportedFilesystems = ["ntfs" "exfat"];
 
   # Set default shell -> move to module
   users.defaultUserShell = pkgs.fish;
@@ -27,7 +27,12 @@
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 
-  programs.ssh.startAgent = true;
+  # programs.ssh.startAgent = true;
+
+  services.logind.extraConfig = ''
+    # don’t shutdown when power button is short-pressed
+    HandlePowerKey=ignore
+  '';
 
   # Enable the KDE Plasma Desktop Environment.
   services.xserver.displayManager.sddm.enable = true;
@@ -118,6 +123,7 @@
         lazygit
         fzf
         neofetch
+        jmtpfs # Android MTP
 
         # Video/Audio
         alsa-utils # Audio Control

hosts/desktop/default.nix

@@ -14,7 +14,9 @@
     ../../modules/virtualization/docker.nix
     ../../modules/virtualization/qemu.nix
     ../../modules/programs/games.nix
-    ../../modules/services/easyeffects.nix
+    ../../modules/secrets/gnome-keyring.nix
+    ../../modules/secrets/gpg.nix
+    # ../../modules/services/easyeffects.nix
   ];
 
   boot = {
@@ -39,16 +41,13 @@
       extraBackends = [unstable.utsushi];
     };
   };
-
   services.udev.packages = [unstable.utsushi];
 
-  # hyprland.enable = true;
-  kde.enable = true;
+  # Desktops
+  hyprland.enable = false;
+  kde.enable = false;
   awesome.enable = true;
-  # home-manager.users.${vars.user} = {
-  #   services.kdeconnect.enable = true;
-  # };
-  nixpkgs.config.librewolf.enablePlasmaBrowserIntegration = true;
+
   programs.kdeconnect.enable = true;
   environment = {
     systemPackages = with pkgs;

modules/coding/android-studio.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  pkgs,
+  unstable,
+  vars,
+  ...
+}: let
+in {
+  home-manager.users.${vars.user} = {
+  };
+
+  programs.adb.enable = true;
+  users.users.${vars.user}.extraGroups = ["adbusers"];
+
+  environment.systemPackages = with unstable; [
+    android-studio
+  ];
+}

modules/coding/default.nix

@@ -2,4 +2,5 @@
   ./nvim.nix
   ./vscode.nix
   ./intellij.nix
+  ./android-studio.nix
 ]

modules/coding/intellij.nix

@@ -11,6 +11,6 @@ in {
   };
 
   environment.systemPackages = with unstable; [
-    (jetbrains.plugins.addPlugins jetbrains.idea-ultimate ["github-copilot" "ideavim"])
+    (jetbrains.plugins.addPlugins jetbrains.idea-ultimate ["ideavim"])
   ];
 }

modules/desktops/awesome.nix

@@ -29,44 +29,6 @@ with lib; {
         modules = [pkgs.xf86_input_wacom];
         wacom.enable = true;
         windowManager.awesome.enable = true;
-        # deviceSection = ''
-        #   Identifier     "Device0"
-        #   Driver         "nvidia"
-        #   VendorName     "NVIDIA Corporation"
-        #   BoardName      "NVIDIA GeForce RTX 2070 SUPER"
-        # '';
-
-    #     serverLayoutSection = ''
-    #       Identifier     "Mouse0"
-    #       Driver         "mouse"
-    #       Option         "Protocol" "auto"
-    #       Option         "Device" "/dev/input/mice"
-    #       Option         "Emulate3Buttons" "no"
-    #       Option         "ZAxisMapping" "4 5"
-    #     '';
-    #     monitorSection = ''
-    #       Identifier     "Monitor0"
-    #       VendorName     "Unknown"
-    #       ModelName      "Acer XF270HU"
-    #       HorizSync       222.0 - 222.0
-    #       VertRefresh     40.0 - 144.0
-    #       Option         "DPMS"
-    #     '';
-    #     screenSection = ''
-    # Identifier     "Screen0"
-    # Device         "Device0"
-    # Monitor        "Monitor0"
-    # DefaultDepth    24
-    # Option         "Stereo" "0"
-    # Option         "nvidiaXineramaInfoOrder" "DFP-5"
-    # Option         "metamodes" "DP-4: 2560x1440_144 +1920+0, DP-0: 1920x1080_75 +0+0"
-    # Option         "SLI" "Off"
-    # Option         "MultiGPU" "Off"
-    # Option         "BaseMosaic" "off"
-    # SubSection     "Display"
-    #     Depth       24
-    # EndSubSection
-    #     '';
       };
     };
 
@@ -108,5 +70,11 @@ with lib; {
         ]
         ++ (with unstable; []);
     };
+    # Flatpak
+    xdg.portal.enable = true;
+    xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-kde];
+
+    # Networking
+    networking.networkmanager.enable = true;
   };
 }

modules/programs/librewolf.nix

@@ -5,6 +5,8 @@
   vars,
   ...
 }: {
+  nixpkgs.config.librewolf.enablePlasmaBrowserIntegration = true;
+
   home-manager.users.${vars.user} = {
     programs.librewolf = {
       enable = true;

modules/secrets/gnome-keyring.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  pkgs,
+  vars,
+  ...
+}: {
+  security.pam.services.${vars.user}.enableGnomeKeyring = true;
+  services.gnome.gnome-keyring.enable = true;
+  programs.seahorse.enable = true;
+}

modules/secrets/gpg.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  vars,
+  ...
+}: {
+  home-manager.users.${vars.user} = {
+    programs.gpg = {
+      enable = true;
+    };
+    services.gpg-agent = {
+      enable = true;
+      enableSshSupport = true;
+      enableFishIntegration = true;
+      enableZshIntegration = true;
+      pinentryFlavor = "gnome3";
+    };
+  };
+}

modules/shell/fish.nix

@@ -16,6 +16,10 @@
         lzg = "lazygit";
         lzd = "lazydocker";
         batt = ''upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep -e "percentage" -e "state"'';
+        hxoff = "~/Documents/heliox-cli/target/debug/heliox-cli --mode off";
+        hxson = "~/Documents/heliox-cli/target/debug/heliox-cli --mode son";
+        slp = "systemctl suspend";
+        sdn = "shutdown 0";
       };
     };
   };

modules/shell/git.nix

@@ -18,7 +18,7 @@
 
       extraConfig = {
         # Sign all commits using ssh key
-        commit.gpgsign = true;
+        commit.gpgsign = false;
         gpg.format = "ssh";
         gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
         user.signingkey = "~/.ssh/git.pub";