diff --git a/common.nix b/common.nix index 3a14546..d011905 100644 --- a/common.nix +++ b/common.nix @@ -56,12 +56,9 @@ with builtins; { iw btop nodejs - - maven - jetbrains.idea-ultimate - jetbrains.rust-rover + jdk8 + jdk11 jdk - libsecret fzf ripgrep @@ -98,7 +95,6 @@ with builtins; { }; services = { - systemd-lock-handler.enable = true; openssh = { enable = true; # settings.PasswordAuthentication = false; diff --git a/flake.lock b/flake.lock index b11db88..44fb045 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1729273024, - "narHash": "sha256-Mb5SemVsootkn4Q2IiY0rr9vrXdCCpQ9HnZeD/J3uXs=", + "lastModified": 1728344376, + "narHash": "sha256-lxTce2XE6mfJH8Zk6yBbqsbu9/jpwdymbSH5cCbiVOA=", "owner": "ipetkov", "repo": "crane", - "rev": "fa8b7445ddadc37850ed222718ca86622be01967", + "rev": "fd86b78f5f35f712c72147427b1eb81a9bd55d0b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1729578683, - "narHash": "sha256-h0Wmvrkadbyi3IJXFLPi+QyYjCAKDr2xQ6dLxlQ8cXY=", + "lastModified": 1728714564, + "narHash": "sha256-CciuT/8HI/BR+y+W2/FyHRDpchbKQ9wA8ABJiio0CE8=", "owner": "nix-community", "repo": "fenix", - "rev": "d66cda53e8193a878742dcadb5bb75f4df7c3c0a", + "rev": "ea96690b28eb5a859d28bcf02887a26e3854e4f3", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729477666, - "narHash": "sha256-ri40XjKyZIMH5wBCFNa50dq5wTBPF5qH/NVDo+syhNM=", + "lastModified": 1728632301, + "narHash": "sha256-R20bJbGcjku/AZHZOkza1HLHRIA+6eCMrE+/fzjDToA=", "owner": "helix-editor", "repo": "helix", - "rev": "6d64e6288add793caf1c841ea295518414c04ea0", + "rev": "a7651f5bf027ec98645d571ab05a685d97e1b772", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1729551526, - "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", + "lastModified": 1728726232, + "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", + "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1729577921, - "narHash": "sha256-bxktXyAj3818+okqwaR9L/F4UREnry0OEjnYqwYVdkc=", + "lastModified": 1728709450, + "narHash": "sha256-QToJSkKLD7g9g2lSbqJ7D01uUv7Iv0+ToTUNQMU+r1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29dccd64f527eebafce219e7ca2bfda5fee75456", + "rev": "162ee4189cf5c0449a642f3f5aa7566faac77476", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1729533545, - "narHash": "sha256-A/AuEWcGwwjpfBCZqWDNNg5GwYrJduzLvlMe+A7xG5U=", + "lastModified": 1728505432, + "narHash": "sha256-QFPMazeiGLo7AGy4RREmTgko0Quch/toMVKhGUjDEeo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "de2ff17bc513807412d7bbaba1d995a774938583", + "rev": "0fb804acb375b02a3beeaceeb75b71969ef37b15", "type": "github" }, "original": { @@ -276,17 +276,21 @@ }, "rust-overlay": { "inputs": { + "flake-utils": [ + "helix-inline-diags", + "flake-utils" + ], "nixpkgs": [ "helix-inline-diags", "nixpkgs" ] }, "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "lastModified": 1709604635, + "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", "type": "github" }, "original": { diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index 97881a3..471c1a9 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -61,8 +61,6 @@ zenmonitor tea blender-hip - jdk8 - jdk11 ]; programs = { wireshark.enable = true; diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index e93e9b7..2a2bee3 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -20,10 +20,6 @@ services.swayidle = { enable = true; events = [ - { - event = "before-sleep"; - command = "${pkgs.swaylock}/bin/swaylock -fF -c 442244"; - } { event = "lock"; command = "swaylock -c 441144";