flake.nix

@@ -32,6 +32,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # lesbian the nix
+    lix-module = {
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # public in nix store, but not here :3<
     private-config.url = "git+ssh://git@git.catgirl.dog/etwas/private-nix-configs";
   };
@@ -45,6 +51,7 @@
       agenix-rekey,
       spicetify-nix,
       nix-index-database,
+      lix-module,
       private-config,
       ...
     }@inputs:
@@ -65,6 +72,7 @@
           agenix.nixosModules.default
           agenix-rekey.nixosModules.default
           nixos-hardware.nixosModules.framework-13-7040-amd
+          lix-module.nixosModules.default
           nix-index-database.nixosModules.nix-index
           ./modules/utils/agenix/agenix.nix
           ./modules

home/default.nix

@@ -40,7 +40,7 @@
         [
           inputs.catppuccin.homeModules.catppuccin
           inputs.spicetify-nix.homeManagerModules.default
-          inputs.nix-index-database.homeModules.nix-index
+          inputs.nix-index-database.hmModules.nix-index
           # inputs.agenix.homeManagerModules.age
           inputs.private-config.homeManagerModules.default
         ]

home/essentials/ssh.nix

@@ -1,20 +1,5 @@
 {
   programs.ssh = {
     enable = true;
-
-    enableDefaultConfig = false;
-
-    matchBlocks."*" = {
-      forwardAgent = false;
-      addKeysToAgent = "no";
-      compression = false;
-      serverAliveInterval = 0;
-      serverAliveCountMax = 3;
-      hashKnownHosts = false;
-      userKnownHostsFile = "~/.ssh/known_hosts";
-      controlMaster = "no";
-      controlPath = "~/.ssh/master-%r@%n:%p";
-      controlPersist = "no";
-    };
   };
 }

home/misc_pkgs/packages.nix

@@ -31,8 +31,8 @@
 
     # Desktop Media things
     mpv-unwrapped
-    kdePackages.gwenview
-    krita
+    libsForQt5.gwenview
+    davinci-resolve
 
     # Desktop game things
     openttd-jgrpp
@@ -54,7 +54,6 @@
     killall
     hyprsunset
     mitmproxy
-    libqalculate
 
     # For Hyprland hotkeys:
     brightnessctl
@@ -85,12 +84,11 @@
     android-studio
     jetbrains.datagrip
     jetbrains.idea-ultimate
+    jetbrains.jdk
     jetbrains.pycharm-professional
     jetbrains.rust-rover
     jetbrains.webstorm
     jetbrains.goland
-
-    #jetbrains.jdk
     wireshark
     devenv
     filezilla

home/wm/catppuccin.nix

@@ -1,10 +1,10 @@
 {
   catppuccin = {
-    #gtk = {
-    #  enable = true;
-    #  size = "compact";
-    #  tweaks = [ "rimless" ];
-    #};
+    gtk = {
+      enable = true;
+      size = "compact";
+      tweaks = [ "rimless" ];
+    };
 
     btop.enable = true;
 

modules/misc_hardware/networking.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   networking = {
     hostName = "rhea-laptop";
@@ -8,9 +8,6 @@
       enable = true;
       wifi.powersave = true;
       wifi.macAddress = "random";
-      plugins = with pkgs; [
-        networkmanager-openvpn
-      ];
     };
 
     # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -29,7 +26,6 @@
       ];
       allowedTCPPorts = [
         8080 # Mitmproxy
-        8000 # HTTP Server
       ];
 
       allowedUDPPortRanges = [
@@ -44,6 +40,4 @@
       ];
     };
   };
-
-  programs.wireshark.enable = true;
 }

modules/misc_hardware/power_settings.nix

@@ -1,7 +1,5 @@
 {
-  services.logind.settings.Login = {
-    HandlePowerKey = "suspend";
-  };
+  services.logind.powerKey = "suspend";
 
   services.power-profiles-daemon = {
     enable = true;

modules/utils/auth.nix

@@ -12,7 +12,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet -t -g \"Hello there (^^)/\" --cmd 'Hyprland'";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -g \"Hello there (^^)/\" --cmd 'Hyprland'";
         user = "rhea";
       };
     };

modules/utils/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./agenix
     ./auth.nix
-    ./docker.nix
     ./gnome.nix
     ./niri.nix
     ./printing.nix

modules/utils/docker.nix

@@ -1,6 +0,0 @@
-{
-  virtualisation.docker = {
-    enable = true;
-    enableOnBoot = true;
-  };
-}