diff --git a/flake.lock b/flake.lock index eb3cc76..d06e3b4 100644 --- a/flake.lock +++ b/flake.lock @@ -400,22 +400,6 @@ "type": "github" } }, - "nixpkgs-working-jetbrains": { - "locked": { - "lastModified": 1753384556, - "narHash": "sha256-oRNcEk/Dsns534HkPSCDTFLpSXJfGts9RDLfDkBt5U8=", - "owner": "Janrupf", - "repo": "nixpkgs", - "rev": "50fbd3334953a47b0bae0c9f88b98432c735fcfe", - "type": "github" - }, - "original": { - "owner": "Janrupf", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-working-xrdp": { "locked": { "lastModified": 1750030408, @@ -534,7 +518,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-working-jetbrains": "nixpkgs-working-jetbrains", "nixpkgs-working-xrdp": "nixpkgs-working-xrdp", "nixvim": "nixvim", "nur": "nur", diff --git a/flake.nix b/flake.nix index 9f96ce1..c1da5f3 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ }; nixpkgs-working-xrdp.url = "github:NixOS/nixpkgs/b26c89e6aa1d7731d5e267656207f2e1c2f37f1d"; #nixpkgs-working-jetbrains.url = "github:symphorien/nixpkgs/jdk_structured_attrs"; - nixpkgs-working-jetbrains.url = "github:Janrupf/nixpkgs/master"; + #nixpkgs-working-jetbrains.url = "github:Janrupf/nixpkgs/master"; # cosmic testing #nixos-cosmic = { # url = "github:lilyinstarlight/nixos-cosmic"; diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index cec4d6c..a89742d 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -265,7 +265,7 @@ in "$mainMod, mouse_down, workspace, e+1" "$mainMod, mouse_up, workspace, e-1" - # "ALT, Tab, cyclenext," + "ALT, Tab, cyclenext," # "ALT, Tab, bringactivetotop," ]; diff --git a/overlays.nix b/overlays.nix index 818f564..e249f8d 100644 --- a/overlays.nix +++ b/overlays.nix @@ -44,20 +44,20 @@ in config.allowUnfree = true; }).xrdp; - jetbrains = prev.jetbrains // { - jdk = (import inputs.nixpkgs-working-jetbrains { - system = prev.stdenv.hostPlatform.system; - config.allowUnfree = true; - }).jetbrains.jdk; - jdk-no-jcef = (import inputs.nixpkgs-working-jetbrains { - system = prev.stdenv.hostPlatform.system; - config.allowUnfree = true; - }).jetbrains.jdk-no-jcef; - jdk-no-jcef-17 = (import inputs.nixpkgs-working-jetbrains { - system = prev.stdenv.hostPlatform.system; - config.allowUnfree = true; - }).jetbrains.jdk-no-jcef-17; - }; + #jetbrains = prev.jetbrains // { + # jdk = (import inputs.nixpkgs-working-jetbrains { + # system = prev.stdenv.hostPlatform.system; + # config.allowUnfree = true; + # }).jetbrains.jdk; + # jdk-no-jcef = (import inputs.nixpkgs-working-jetbrains { + # system = prev.stdenv.hostPlatform.system; + # config.allowUnfree = true; + # }).jetbrains.jdk-no-jcef; + # jdk-no-jcef-17 = (import inputs.nixpkgs-working-jetbrains { + # system = prev.stdenv.hostPlatform.system; + # config.allowUnfree = true; + # }).jetbrains.jdk-no-jcef-17; + #}; hyprshade = prev.hyprshade.overrideAttrs { version = "4.0.0"; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index dcd9eba..a517e93 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -180,10 +180,10 @@ # Enable CUPS to print documents. # disable until CVE-2024-47176, CVE-2024-47076, CVE-2024-47175, and CVE-2024-47177 is fixed # http://localhost:631 - services.printing.enable = false; + services.printing.enable = true; services.printing.drivers = [ pkgs.brlaser ]; services.avahi = { - enable = false; + enable = true; nssmdns4 = true; openFirewall = true; };