Merge branch 'main' of github.com:eRgo35/nixos

feat: added java and nix dev pkgs
fix: modified nvidia to nvidia-open
2026-02-04 11:46:12 +01:00 · 2025-01-12 18:38:53 +01:00 · 2025-01-12 18:38:46 +01:00 · 2025-01-12 18:38:33 +01:00 · 2025-01-11 12:39:40 +01:00 · 2025-01-11 12:25:35 +01:00
14 changed files with 409 additions and 206 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734906446,
-        "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=",
+        "lastModified": 1736102453,
+        "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091",
+        "rev": "4846091641f3be0ad7542086d52769bb7932bde6",
        "type": "github"
      },
      "original": {
@@ -107,11 +107,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1735943654,
-        "narHash": "sha256-rXmcRRQfXXYAKOa5IXlrMISTwgScA2Dx04JpONXRA+Q=",
+        "lastModified": 1736524793,
+        "narHash": "sha256-UEbNwGorRiNLtzhshxe/2J2BmwGI1cDCDhSYtY8qREU=",
        "owner": "chaotic-cx",
        "repo": "nyx",
-        "rev": "5edcf7fb24c73ff9665f299461af33fa6171836f",
+        "rev": "38844e9b3e17948a66b0dea0ce0bcc0355d6d876",
        "type": "github"
      },
      "original": {
@@ -142,6 +142,22 @@
        "type": "github"
      }
    },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734969791,
+        "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@@ -468,11 +484,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735774425,
-        "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
+        "lastModified": 1736421950,
+        "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
+        "rev": "d4aebb947a301b8da8654a804979a738c5c5da50",
        "type": "github"
      },
      "original": {
@@ -488,11 +504,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
        "type": "github"
      },
      "original": {
@@ -510,11 +526,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "lastModified": 1733572789,
+        "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
        "type": "github"
      },
      "original": {
@@ -569,11 +585,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734906236,
-        "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
+        "lastModified": 1736115290,
+        "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
+        "rev": "52202272d89da32a9f866c0d10305a5e3d954c50",
        "type": "github"
      },
      "original": {
@@ -598,11 +614,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1736008833,
-        "narHash": "sha256-3OvlurfefGSjT4E+qRvQNmqqRVlbHN8ifZy5C3uUZM8=",
+        "lastModified": 1736534546,
+        "narHash": "sha256-Y77gTdcuGy301EzVJnrxAuQxRnj39aoaJK1nfycoqr0=",
        "ref": "refs/heads/main",
-        "rev": "b0bae15499ad57bbfeae8be958df8c022201e583",
-        "revCount": 5628,
+        "rev": "a8b568c6c451cdce3c8d40ae010247be3f25728b",
+        "revCount": 5660,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -630,11 +646,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735838245,
-        "narHash": "sha256-dA2s+KFo6+TmYtQoXWfxQ8XukN6JQ0I0VoraG9zD7/I=",
+        "lastModified": 1736372092,
+        "narHash": "sha256-+uxeBRTrDZsH6HtVtlMuJLLPJw3usPpG2/pm/L30c3E=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "920af33577a889772e96a067130252df5674ca8a",
+        "rev": "b4c0fa3ebc6ccd1589dcd17904652223088efede",
        "type": "github"
      },
      "original": {
@@ -655,11 +671,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735734474,
-        "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=",
+        "lastModified": 1735774328,
+        "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7",
+        "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
        "type": "github"
      },
      "original": {
@@ -693,6 +709,57 @@
        "type": "github"
      }
    },
+    "hyprland-qt-support": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprpolkitagent",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprpolkitagent",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736374981,
+        "narHash": "sha256-DI/ZjoOIpKiZSLxAZ406bon68jtfKMlkNrmOSqi86lU=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "d4615b8e40dcdfc11b6020d3e022f8744843a9f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qt-support_2": {
+      "inputs": {
+        "hyprlang": "hyprlang_2",
+        "nixpkgs": [
+          "hyprsysteminfo",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsysteminfo",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736458345,
+        "narHash": "sha256-VtnTAUKPjV4XstRmO417GqSMUhTrMPqJDfxkJCMyUSk=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "16c35452e45631bb40097e6e66370b174c0298eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
    "hyprland-qtutils": {
      "inputs": {
        "hyprutils": [
@@ -709,11 +776,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734906472,
-        "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=",
+        "lastModified": 1736114838,
+        "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=",
        "owner": "hyprwm",
        "repo": "hyprland-qtutils",
-        "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152",
+        "rev": "6997fe382dcf396704227d2b98ffdd5066da6959",
        "type": "github"
      },
      "original": {
@@ -738,11 +805,39 @@
        ]
      },
      "locked": {
-        "lastModified": 1734906259,
-        "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=",
+        "lastModified": 1735393019,
+        "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "0404833ea18d543df44df935ebf1b497310eb046",
+        "rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprlang_2": {
+      "inputs": {
+        "hyprutils": "hyprutils_4",
+        "nixpkgs": [
+          "hyprsysteminfo",
+          "hyprland-qt-support",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsysteminfo",
+          "hyprland-qt-support",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735393019,
+        "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
        "type": "github"
      },
      "original": {
@@ -753,16 +848,17 @@
    },
    "hyprpolkitagent": {
      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
        "hyprutils": "hyprutils_2",
        "nixpkgs": "nixpkgs_3",
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1735946714,
-        "narHash": "sha256-1kcSHRLdp9wEZdrdfh4h3VNzHIupON9gf4FtqMz4+54=",
+        "lastModified": 1736524507,
+        "narHash": "sha256-K1nSPFlh5VBWNagcaZ/157gfifAXTH8lzeyfYt/UEX8=",
        "owner": "hyprwm",
        "repo": "hyprpolkitagent",
-        "rev": "08cab3a4d9277687562702ae2db56305f9165081",
+        "rev": "0f0d412d4f8479c6f67f39bd6941b2f07343ff66",
        "type": "github"
      },
      "original": {
@@ -795,16 +891,17 @@
    },
    "hyprsysteminfo": {
      "inputs": {
-        "hyprutils": "hyprutils_4",
+        "hyprland-qt-support": "hyprland-qt-support_2",
+        "hyprutils": "hyprutils_5",
        "nixpkgs": "nixpkgs_5",
        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1735826012,
-        "narHash": "sha256-F/Yfn43SisTV2AUErkXToaFCOwryMcmaiz4Tw3VSpSk=",
+        "lastModified": 1736524390,
+        "narHash": "sha256-KDxT9B+1SATWiZdUBAQvZu17vk3xmyXcw2Zy56bdWbY=",
        "owner": "hyprwm",
        "repo": "hyprsysteminfo",
-        "rev": "3498fad4c4b9c161fd78896ef583f492c93c7859",
+        "rev": "17f041e2d539bd63ec116a77236ea37a17c6b3e6",
        "type": "github"
      },
      "original": {
@@ -825,11 +922,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735316583,
-        "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=",
+        "lastModified": 1736164519,
+        "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8",
+        "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
        "type": "github"
      },
      "original": {
@@ -850,11 +947,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732288281,
-        "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
+        "lastModified": 1736164519,
+        "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
+        "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
        "type": "github"
      },
      "original": {
@@ -889,6 +986,35 @@
      }
    },
    "hyprutils_4": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprsysteminfo",
+          "hyprland-qt-support",
+          "hyprlang",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprsysteminfo",
+          "hyprland-qt-support",
+          "hyprlang",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734796073,
+        "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprutils_5": {
      "inputs": {
        "nixpkgs": [
          "hyprsysteminfo",
@@ -900,11 +1026,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727300645,
-        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
+        "lastModified": 1736164519,
+        "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
+        "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
        "type": "github"
      },
      "original": {
@@ -925,11 +1051,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734793513,
-        "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=",
+        "lastModified": 1735493474,
+        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61",
+        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
        "type": "github"
      },
      "original": {
@@ -972,11 +1098,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735330405,
-        "narHash": "sha256-MhXgu1oymyjhhZGY9yewNonJknNAjilzMGPY1FfMR7s=",
+        "lastModified": 1736409493,
+        "narHash": "sha256-XezBEaGENmXgndx2gsVxQ0JoHUeQs9OSUZvVx/GDqyQ=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "a86d9cf841eff8b33a05d2bf25788abd8e018dbd",
+        "rev": "9a958cc0aa5241ea3badf44a063a4b0389dc0110",
        "type": "github"
      },
      "original": {
@@ -1110,11 +1236,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
        "type": "github"
      },
      "original": {
@@ -1124,35 +1250,20 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
        "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs_10": {
@@ -1173,11 +1284,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1735291276,
-        "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
        "type": "github"
      },
      "original": {
@@ -1189,11 +1300,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1732014248,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
        "type": "github"
      },
      "original": {
@@ -1221,11 +1332,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1728492678,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
        "type": "github"
      },
      "original": {
@@ -1253,26 +1364,27 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1735922141,
-        "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=",
+        "lastModified": 1736200483,
+        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a",
+        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
        "ref": "nixos-24.11",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1735834308,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
        "type": "github"
      },
      "original": {
@@ -1305,11 +1417,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1736095314,
-        "narHash": "sha256-HEGbYi2QfGTcy2TsEy1gDsbXuA/IaN5d5IZj2XJfAys=",
+        "lastModified": 1736538354,
+        "narHash": "sha256-qPgUE5K/qcgzpQRHzruAgwT/7SCSAOUOyK1qyofe0TY=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "cef9be6b71dfda87045ee9a83be7fb96ee545133",
+        "rev": "80b24eed6e716dc5a31a360f8465636a7a2a990f",
        "type": "github"
      },
      "original": {
@@ -1325,15 +1437,14 @@
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        ]
      },
      "locked": {
-        "lastModified": 1734797603,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
        "type": "github"
      },
      "original": {
@@ -1415,11 +1526,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736044260,
-        "narHash": "sha256-DTAr0mAd8AZwWgRtU9ZZFPz3DwNeoH/Oi/1QMSqc9YQ=",
+        "lastModified": 1736476219,
+        "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "c8ed24cc104ebbc218d992e208131e9f024b69f0",
+        "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9",
        "type": "github"
      },
      "original": {
@@ -1436,11 +1547,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736050526,
-        "narHash": "sha256-wscvKDsyIES59ltENnOw7Hz8WKU8hg5m7dYbcJN2u6A=",
+        "lastModified": 1736482561,
+        "narHash": "sha256-f4hvN4MF26NIYeFA/H1sVW6KU5X9/jy9l95WrMsNUIU=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "78c9ace8b9e1d7b64b4d797a066047c2332d24f6",
+        "rev": "77fb1ae39e0f5c60a7d0bd6ce078b9c56e3356cb",
        "type": "github"
      },
      "original": {
@@ -1476,6 +1587,7 @@
        "base16-fish": "base16-fish",
        "base16-helix": "base16-helix",
        "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
        "flake-compat": "flake-compat_5",
        "flake-utils": "flake-utils_4",
        "git-hooks": "git-hooks",
@@ -1490,11 +1602,11 @@
        "tinted-tmux": "tinted-tmux"
      },
      "locked": {
-        "lastModified": 1736019457,
-        "narHash": "sha256-MWe3RXEV9dov1wFZraWagVAxynPo/VceStIYfNRgqG4=",
+        "lastModified": 1736381946,
+        "narHash": "sha256-k66y4eMHZiJO3N43wuZOdoRmGmNwIj3EZq6NGK+AEM8=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "5204b085385c0bfaa1eb1bb0f8dc81922012128d",
+        "rev": "c62df1918d178ade64dc8a2df99e78a5d5f20514",
        "type": "github"
      },
      "original": {
@@ -1741,11 +1853,11 @@
        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
-        "lastModified": 1735242487,
-        "narHash": "sha256-7FxtrGA/iZ+TBcycnSr16hkKraACvNk/kFu3RzT137U=",
+        "lastModified": 1736541771,
+        "narHash": "sha256-aSK2t8/ZktVvRUlvxT7oXoxn8CmGYpW0PgcP4tAUktw=",
        "owner": "eRgo35",
        "repo": "zen-browser-flake",
-        "rev": "2f42f4b677dbec541aff3f7b6bed50725d11087c",
+        "rev": "d5ad11d442dcc79b4265b4010cb0ffa515b44c3f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
  description = "Mike's Flake";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
    nur.url = "github:nix-community/NUR";
    nix-alien.url = "github:thiagokokada/nix-alien";
--- a/home-manager/dwm/.xinitrc
+++ b/home-manager/dwm/.xinitrc
@@ -68,10 +68,43 @@ setxkbmap pl &
 # xset s on &
 # xset -dpms &
 # xset s 900 &
-xset +dpms &
-xset dpms 1200 1800 2100 &
-xset s on &
-xset s 900 &
+# Host-specific rules
+if [ "$(hostname)" = "zion" ]; then
+    # Zion rules (Desktop)
+    # Enable DPMS and set longer timeouts for desktop
+    # xset +dpms
+    # xset dpms 1200 2400 3600  # Standby: 20 min, Suspend: 40 min, Off: 60 min
+
+    # Enable screen blanking and set timeout to 20 minutes
+    # xset s on
+    # xset s 1200
+
+    xidlehook \
+        --not-when-fullscreen \
+        --not-when-audio \
+        --timer 600 "xset dpms force standby" "" \
+        --timer 1800 "xset dpms force suspend" "" \
+        --timer 3600 "xset dpms force off" "" &
+
+elif [ "$(hostname)" = "thor" ]; then
+    # Thor rules (Laptop)
+    # Enable DPMS and set shorter timeouts for laptop
+    # xset +dpms
+    # xset dpms 300 600 900  # Standby: 5 min, Suspend: 10 min, Off: 15 min
+
+    # Enable screen blanking and set timeout to 10 minutes
+    # xset s on
+    # xset s 600
+
+    # Laptop-specific xidlehook rules
+    xidlehook \
+        --not-when-fullscreen \
+        --not-when-audio \
+        --timer 450 "brightnessctl -s set 5%" "brightnessctl -s set 100%" \
+        --timer 600 "loginctl lock-session" "" \
+        --timer 750 "xset dpms force standby" "" \
+        --timer 900 "systemctl suspend" "" &
+fi

 # auths
 # /usr/lib/mate-polkit/polkit-mate-authentication-agent-1 &
--- a/home-manager/dwm/bar.sh
+++ b/home-manager/dwm/bar.sh
@@ -22,8 +22,10 @@ HIGHLIGHT_HIGH=#524f67

 # Function to get CPU usage
 get_cpu_usage() {
-    cpu_usage=$(grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {printf "%.0f%%\n", usage}')
-    echo "^c$FOAM^CPU: $cpu_usage"
+    cpu_usage=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print int(($2+$4-u1) * 100 / (t-t1)); }' \
+    <(grep 'cpu ' /proc/stat) <(sleep 1; grep 'cpu ' /proc/stat))
+    
+    echo "^c$FOAM^CPU: $cpu_usage%"
 }

 # Function to get memory usage
@@ -66,16 +68,65 @@ get_volume() {
    echo "^c$PINE^VOL: $volume MIC: $mic_level"
 }

+# Function to get brightness percentage
+get_brightness() {
+    # Get the current brightness level (adjust path if needed)
+    brightness=$(cat /sys/class/backlight/intel_backlight/brightness)
+    max_brightness=$(cat /sys/class/backlight/intel_backlight/max_brightness)
+    
+    # Calculate brightness percentage
+    brightness_percent=$(awk "BEGIN {printf \"%.0f%%\", ($brightness / $max_brightness) * 100}")
+    
+    # Output the result with color
+    echo "^c$ROSE^BRT: $brightness_percent"
+}
+
+# Function to get weighted average battery level
+get_battery_level() {
+    # Get battery levels (adjust paths if needed)
+    battery0_level=$(cat /sys/class/power_supply/BAT0/capacity)
+    battery1_level=$(cat /sys/class/power_supply/BAT1/capacity)
+
+    battery0_energy_full=$(cat /sys/class/power_supply/BAT0/energy_full)
+    battery1_energy_full=$(cat /sys/class/power_supply/BAT1/energy_full)
+    
+    # Calculate weights based on energy capacity 
+    weight0=$(awk "BEGIN {printf \"%.2f\", $battery0_energy_full / ($battery0_energy_full + $battery1_energy_full)}")
+    weight1=$(awk "BEGIN {printf \"%.2f\", $battery1_energy_full / ($battery0_energy_full + $battery1_energy_full)}")
+    
+    # Calculate weighted average
+    weighted_avg=$(awk "BEGIN {printf \"%.0f%%\", ($battery0_level * $weight0 + $battery1_level * $weight1)}")
+    
+    # Output the result with color
+    echo "^c$LOVE^BAT: $weighted_avg"
+}
+
 # Function to get date and time in American 12-hour format
 get_datetime() {
    datetime=$(date +"%a %d %b %I:%M %p")
    echo "^c$GOLD^$datetime"
 }

+# Function to detect if the system is a laptop
+is_laptop() {
+    # Check if battery and brightness files exist
+    if [ -d /sys/class/power_supply/BAT0 ] && [ -d /sys/class/backlight/intel_backlight ]; then
+        return 0  # Laptop
+    else
+        return 1  # PC
+    fi
+}
+
 # Main loop to update xsetroot
 while true; do
    # Combine all status components
-    status="$(get_volume) ^c$TEXT^| $(get_cpu_usage) ^c$TEXT^| $(get_memory_usage) ^c$TEXT^| $(get_datetime)"
+    if is_laptop; then
+        # Include battery and brightness for laptops
+        status="$(get_volume) ^c$TEXT^| $(get_cpu_usage) ^c$TEXT^| $(get_memory_usage) ^c$TEXT^| $(get_brightness) ^c$TEXT^| $(get_battery_level) ^c$TEXT^| $(get_datetime)"
+    else
+        # Exclude battery and brightness for PCs
+        status="$(get_volume) ^c$TEXT^| $(get_cpu_usage) ^c$TEXT^| $(get_memory_usage) ^c$TEXT^| $(get_datetime)"
+    fi

    # Update the root window name with a darker background
    xsetroot -name "$status"
--- a/home-manager/dwm/default.nix
+++ b/home-manager/dwm/default.nix
@@ -33,6 +33,9 @@
    xorg.xinit
    xorg.xinput
    brightnessctl
+    playerctl
+    qt6ct
+    xautolock
    xclip
    # gnome.gnome-keyring
    feh
@@ -64,6 +67,7 @@
    virt-manager
    xfce.thunar
    dconf
+    xidlehook
  ];

  home.file = {
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -39,8 +39,8 @@
    # ./configs/keys.nix

    ./system/dunst.nix
-    ./system/hypr.nix
-    ./system/hyprland.nix
+    # ./system/hypr.nix
+    # ./system/hyprland.nix
    ./system/rofi.nix
    ./system/stylix.nix
    ./system/theme.nix
--- a/home-manager/programs/vscodium.nix
+++ b/home-manager/programs/vscodium.nix
@@ -13,62 +13,62 @@
        ]
    );

-    extensions = with pkgs.vscode-extensions; [
-      ms-python.python
-      ms-python.debugpy
-      jnoortheen.nix-ide
-      mkhl.direnv
-      arrterian.nix-env-selector
-      mvllow.rose-pine
-      github.copilot
-      # github.copilot-chat
-      ms-vsliveshare.vsliveshare
-      rust-lang.rust-analyzer
-    ];
-
-    userSettings = {
-      "editor.fontSize" = 16;
-      "editor.fontFamily" = "FiraCode Nerd Font";
-      "explorer.confirmDelete" = false;
-      "disable-hardware-acceleration" = true;
-      "explorer.confirmDragAndDrop" = true;
-      "git.openRepositoryInParentFolders" = "never";
-
-      "[python]" = {
-        "editor.defaultFormatter" = "ms-python.black-formatter";
-        "editor.formatOnSave" = true;
-      };
-
-      "nix.enableLanguageServer" = true;
-      "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
-      "nix.serverSettings" = {
-        "nixd" = {
-          "formatting" = {
-            "command" = ["${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"];
-          };
-          "nixpkgs" = {
-            "expr" = "import <nixpkgs> { }";
-            "options" = {
-              "nixos" = {
-                "expr" = ''(builtins.getFlake "/home/mike/.files").nixosConfigurations.zion.options'';
-              };
-            };
-          };
-        };
-      };
-
-      "editor.formatOnSave" = true;
-
-      "editor.fontLigatures" = true;
-      "editor.formatOnPaste" = true;
-      "editor.minimap.enabled" = false;
-
-      # "symbols.hidesExplorerArrows" = false;
-
-      "workbench.iconTheme" = "rose-pine-icons";
-      "workbench.colorTheme" = "Rosé Pine";
-      "workbench.preferredDarkColorTheme" = "Rosé Pine";
-      "workbench.preferredHighContrastColorTheme" = "Rosé Pine";
-    };
+    # extensions = with pkgs.vscode-extensions; [
+    #   ms-python.python
+    #   ms-python.debugpy
+    #   jnoortheen.nix-ide
+    #   mkhl.direnv
+    #   arrterian.nix-env-selector
+    #   mvllow.rose-pine
+    #   github.copilot
+    #   # github.copilot-chat
+    #   ms-vsliveshare.vsliveshare
+    #   rust-lang.rust-analyzer
+    # ];
+    #
+    # userSettings = {
+    #   "editor.fontSize" = 16;
+    #   "editor.fontFamily" = "FiraCode Nerd Font";
+    #   "explorer.confirmDelete" = false;
+    #   "disable-hardware-acceleration" = true;
+    #   "explorer.confirmDragAndDrop" = true;
+    #   "git.openRepositoryInParentFolders" = "never";
+    #
+    #   "[python]" = {
+    #     "editor.defaultFormatter" = "ms-python.black-formatter";
+    #     "editor.formatOnSave" = true;
+    #   };
+    #
+    #   "nix.enableLanguageServer" = true;
+    #   "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
+    #   "nix.serverSettings" = {
+    #     "nixd" = {
+    #       "formatting" = {
+    #         "command" = ["${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"];
+    #       };
+    #       "nixpkgs" = {
+    #         "expr" = "import <nixpkgs> { }";
+    #         "options" = {
+    #           "nixos" = {
+    #             "expr" = ''(builtins.getFlake "/home/mike/.files").nixosConfigurations.zion.options'';
+    #           };
+    #         };
+    #       };
+    #     };
+    #   };
+    #
+    #   "editor.formatOnSave" = true;
+    #
+    #   "editor.fontLigatures" = true;
+    #   "editor.formatOnPaste" = true;
+    #   "editor.minimap.enabled" = false;
+    #
+    #   # "symbols.hidesExplorerArrows" = false;
+    #
+    #   "workbench.iconTheme" = "rose-pine-icons";
+    #   "workbench.colorTheme" = "Rosé Pine";
+    #   "workbench.preferredDarkColorTheme" = "Rosé Pine";
+    #   "workbench.preferredHighContrastColorTheme" = "Rosé Pine";
+    # };
  };
 }
--- a/home-manager/system/hyprland.nix
+++ b/home-manager/system/hyprland.nix
@@ -6,7 +6,7 @@
  ...
 }: let
  hostname = "zion";
-in  {
+in {
  # ------------------------------------------------
  # Needed Packages
  # ------------------------------------------------
--- a/hosts/modules/development.nix
+++ b/hosts/modules/development.nix
@@ -62,9 +62,17 @@
    cachix
    lorri
    niv
+    nixd
    nixfmt-classic
    statix
    vulnix
    haskellPackages.dhall-nix
+
+    # java
+    jdk
+    jdk8
+    jdk17
+    maven
+    gradle
  ];
 }
--- a/hosts/modules/nvidia.nix
+++ b/hosts/modules/nvidia.nix
@@ -7,8 +7,8 @@
  services.xserver.videoDrivers = ["nvidia"];

  boot = {
-    kernelModules = ["nvidia-uvm"];
-    kernelParams = ["nvidia-drm.fbdev=1"];
+    kernelModules = ["nvidia" "nvidia-uvm"];
+    kernelParams = ["nvidia-drm.fbdev=1" "nvidia-drm.modeset=1"];
  };

  hardware = {
@@ -24,8 +24,8 @@
    };

    nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      open = false;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      open = true;

      nvidiaSettings = true;

--- a/hosts/modules/tlp.nix
+++ b/hosts/modules/tlp.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  hostname,
-  ...
-}: {
+{config, ...}: {
  boot = {
    kernelModules = ["acpi_call"];
    extraModulePackages = with config.boot.kernelPackages; [acpi_call];
@@ -12,15 +8,9 @@
    enable = true;

    settings = {
-      TLP_DEFAULT_MODE =
-        if hostname == "laptop"
-        then "BAT"
-        else "AC";
+      TLP_DEFAULT_MODE = "BAT";

-      TLP_PERSISTENT_DEFAULT =
-        if hostname == "laptop"
-        then 0
-        else 1;
+      TLP_PERSISTENT_DEFAULT = 0;

      CPU_BOOST_ON_AC = 1;
      CPU_BOOST_ON_BAT = 0;
--- a/hosts/modules/xserver.nix
+++ b/hosts/modules/xserver.nix
@@ -78,7 +78,7 @@
            owner = "eRgo35";
            repo = "dwm";
            rev = "main";
-            hash = "sha256-Fq6FhrUYzQ6yiAAVstZkTZV6/80xIToZirDtJTBDRHQ=";
+            hash = "sha256-sMw4TvuuBlKV4Qb77gyNWRQr1VXX1dEiBUlWusKNgDQ=";
          };
        };
      };
--- a/hosts/thor/configuration.nix
+++ b/hosts/thor/configuration.nix
@@ -29,12 +29,12 @@
    ../modules/ananicy.nix
    ../modules/bluetooth.nix
    ../modules/boot.nix
-    ../modules/configuration.nix
+    ../modules/common.nix
    ../modules/development.nix
    ../modules/distributed-builds.nix
    ../modules/fstrim.nix
    ../modules/gaming.nix
-    ../modules/greetd.nix
+    # ../modules/greetd.nix
    ../modules/gsettings.nix
    # ../modules/kde.nix
    # ../modules/lanzaboot.nix
@@ -45,11 +45,14 @@
    ../modules/packages.nix
    ../modules/pipewire.nix
    ../modules/printing.nix
+    # ../modules/remote-builder.nix
    ../modules/security.nix
    ../modules/ssh.nix
+    #  ../modules/steam.nix
    ../modules/tlp.nix
    ../modules/users.nix
    ../modules/vm.nix
+    ../modules/xserver.nix
  ];

  networking.hostName = "thor";
--- a/hosts/zion/configuration.nix
+++ b/hosts/zion/configuration.nix
@@ -31,6 +31,7 @@
    ../modules/boot.nix
    ../modules/common.nix
    ../modules/development.nix
+    # ../modules/distributed-builds.nix
    ../modules/fstrim.nix
    ../modules/gaming.nix
    # ../modules/greetd.nix
@@ -48,6 +49,7 @@
    ../modules/security.nix
    ../modules/ssh.nix
    ../modules/steam.nix
+    #   ../modules/tlp.nix
    ../modules/users.nix
    ../modules/vm.nix
    ../modules/xserver.nix
Author	SHA1	Message	Date
Michał Czyż	a1241fd833	Merge branch 'main' of github.com:eRgo35/nixos	2025-01-12 18:38:53 +01:00
Michał Czyż	b1da20e832	feat: added java and nix dev pkgs	2025-01-12 18:38:46 +01:00
Michał Czyż	9fa2da65f3	fix: modified nvidia to nvidia-open	2025-01-12 18:38:33 +01:00
Michał Czyż	3aa43f8a07	hyprland commented out	2025-01-11 12:39:40 +01:00
Michał Czyż	edc6aecb09	fix: merged xidlehook rules	2025-01-11 12:25:35 +01:00
Michał Czyż	38c84946c5	feat: changed xset to xidlehook	2025-01-11 12:16:07 +01:00
Michał Czyż	11d3b28513	chore: system update	2025-01-10 21:47:12 +01:00
Michał Czyż	e375c19c7d	fix: reformatted config	2025-01-09 10:38:46 +01:00
Michał Czyż	e2886da8d6	fix: added commented out modules for easier cmp	2025-01-09 10:38:15 +01:00
Michał Czyż	1d68abb4c5	feat: free vscode and better xorg powersave	2025-01-09 10:34:03 +01:00
Michał Czyż	6189e52e4d	feat: expanded bar for laptop utils	2025-01-09 10:14:03 +01:00
Michał Czyż	c57a67a6d0	chore: system upgrade	2025-01-08 16:58:12 +01:00
Michał Czyż	b7d8c84b4b	fix: laptop typos adjustments	2025-01-08 16:58:00 +01:00
Michał Czyż	3b2cbc6e04	chore: bumped dwm version hash	2025-01-07 11:55:56 +01:00
Michał Czyż	7c030a594b	fix: fixed cpu utilization	2025-01-07 11:48:48 +01:00
Michał Czyż	6be617f26a	fix: added modeset to nvidia	2025-01-07 11:21:08 +01:00