diff options
| -rw-r--r-- | flake.lock | 379 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | modules/nixosModules/desktop/gaming.nix | 8 | ||||
| -rw-r--r-- | modules/packages/environment.nix | 1 | ||||
| -rw-r--r-- | modules/packages/eza.nix | 33 | ||||
| -rw-r--r-- | modules/packages/fish.nix | 5 | ||||
| -rw-r--r-- | modules/packages/niri/settings.nix | 2 |
7 files changed, 401 insertions, 28 deletions
@@ -1,5 +1,56 @@ { "nodes": { + "abseil-src": { + "flake": false, + "locked": { + "lastModified": 1722535511, + "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", + "owner": "abseil", + "repo": "abseil-cpp", + "rev": "4447c7562e3bc702ade25105912dce503f0c4010", + "type": "github" + }, + "original": { + "owner": "abseil", + "ref": "20240722.0", + "repo": "abseil-cpp", + "type": "github" + } + }, + "asio-src": { + "flake": false, + "locked": { + "lastModified": 1702548444, + "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", + "owner": "chriskohlhoff", + "repo": "asio", + "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", + "type": "github" + }, + "original": { + "owner": "chriskohlhoff", + "ref": "asio-1-30-0", + "repo": "asio", + "type": "github" + } + }, + "curl-src": { + "flake": false, + "locked": { + "lastModified": 1743572790, + "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", + "owner": "curl", + "repo": "curl", + "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", + "type": "github" + }, + "original": { + "owner": "curl", + "ref": "curl-8_13_0", + "repo": "curl", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -55,6 +106,23 @@ "type": "github" } }, + "fmt-src": { + "flake": false, + "locked": { + "lastModified": 1758127535, + "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", + "owner": "fmtlib", + "repo": "fmt", + "rev": "e424e3f2e607da02742f73db84873b8084fc714c", + "type": "github" + }, + "original": { + "owner": "fmtlib", + "ref": "12.0.0", + "repo": "fmt", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -62,11 +130,11 @@ ] }, "locked": { - "lastModified": 1775900011, - "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", + "lastModified": 1776562531, + "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", + "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", "type": "github" }, "original": { @@ -83,11 +151,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -111,6 +179,195 @@ "type": "github" } }, + "incbin-src": { + "flake": false, + "locked": { + "lastModified": 1748303270, + "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", + "owner": "graphitemaster", + "repo": "incbin", + "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "type": "github" + }, + "original": { + "owner": "graphitemaster", + "repo": "incbin", + "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "type": "github" + } + }, + "json-src": { + "flake": false, + "locked": { + "lastModified": 1744360948, + "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", + "owner": "nlohmann", + "repo": "json", + "rev": "55f93686c01528224f448c19128836e7df245f72", + "type": "github" + }, + "original": { + "owner": "nlohmann", + "ref": "v3.12.0", + "repo": "json", + "type": "github" + } + }, + "libgit2-src": { + "flake": false, + "locked": { + "lastModified": 1749227175, + "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.9.1", + "repo": "libgit2", + "type": "github" + } + }, + "luajit-src": { + "flake": false, + "locked": { + "lastModified": 1763177035, + "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", + "owner": "SteamClientHomebrew", + "repo": "LuaJIT", + "rev": "89550023569c3e195e75e12951c067fe5591e0d2", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "ref": "v2.1", + "repo": "LuaJIT", + "type": "github" + } + }, + "luajson-src": { + "flake": false, + "locked": { + "lastModified": 1763065879, + "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", + "owner": "SteamClientHomebrew", + "repo": "LuaJSON", + "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "repo": "LuaJSON", + "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "type": "github" + } + }, + "millennium": { + "inputs": { + "abseil-src": "abseil-src", + "asio-src": "asio-src", + "curl-src": "curl-src", + "fmt-src": "fmt-src", + "incbin-src": "incbin-src", + "json-src": "json-src", + "libgit2-src": "libgit2-src", + "luajit-src": "luajit-src", + "luajson-src": "luajson-src", + "millennium-src": "millennium-src", + "minhook-src": "minhook-src", + "mini-src": "mini-src", + "minizip-src": "minizip-src", + "nixpkgs": "nixpkgs", + "re2-src": "re2-src", + "websocketpp-src": "websocketpp-src", + "zlib-src": "zlib-src" + }, + "locked": { + "dir": "packages/nix", + "lastModified": 1776469299, + "narHash": "sha256-6KV0OgBCKrbVP4EM9hqcospkoPImbt6VZ18Mbgi9bqY=", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "19741152e4237810141a0f18868a6993939e556a", + "type": "github" + }, + "original": { + "dir": "packages/nix", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "type": "github" + } + }, + "millennium-src": { + "flake": false, + "locked": { + "lastModified": 1770463863, + "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "type": "github" + } + }, + "minhook-src": { + "flake": false, + "locked": { + "lastModified": 1743163800, + "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", + "owner": "TsudaKageyu", + "repo": "minhook", + "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", + "type": "github" + }, + "original": { + "owner": "TsudaKageyu", + "ref": "v1.3.4", + "repo": "minhook", + "type": "github" + } + }, + "mini-src": { + "flake": false, + "locked": { + "lastModified": 1743356736, + "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", + "owner": "metayeti", + "repo": "mINI", + "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", + "type": "github" + }, + "original": { + "owner": "metayeti", + "ref": "0.9.18", + "repo": "mINI", + "type": "github" + } + }, + "minizip-src": { + "flake": false, + "locked": { + "lastModified": 1746408966, + "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", + "owner": "zlib-ng", + "repo": "minizip-ng", + "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", + "type": "github" + }, + "original": { + "owner": "zlib-ng", + "ref": "4.0.10", + "repo": "minizip-ng", + "type": "github" + } + }, "mnw": { "locked": { "lastModified": 1770419553, @@ -181,15 +438,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", - "owner": "NixOS", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -212,6 +469,22 @@ }, "nixpkgs_2": { "locked": { + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { "lastModified": 1775579569, "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=", "owner": "NixOS", @@ -226,7 +499,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -254,11 +527,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1775892726, - "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", + "lastModified": 1776539146, + "narHash": "sha256-zuaO3Gi+HUf4Udv6wiCsK29SKh/Q6kwacpTn8gIwyZY=", "owner": "NotAShelf", "repo": "nvf", - "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", + "rev": "2809f4d43071e124f316ecf6dd0c68302f1078af", "type": "github" }, "original": { @@ -267,14 +540,32 @@ "type": "github" } }, + "re2-src": { + "flake": false, + "locked": { + "lastModified": 1762353507, + "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", + "owner": "google", + "repo": "re2", + "rev": "927f5d53caf8111721e734cf24724686bb745f55", + "type": "github" + }, + "original": { + "owner": "google", + "ref": "2025-11-05", + "repo": "re2", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", "home-manager": "home-manager", "import-tree": "import-tree", + "millennium": "millennium", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nvf": "nvf", "wrapper-modules": "wrapper-modules", "wrappers": "wrappers", @@ -296,16 +587,33 @@ "type": "github" } }, + "websocketpp-src": { + "flake": false, + "locked": { + "lastModified": 1587320717, + "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", + "owner": "zaphoyd", + "repo": "websocketpp", + "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", + "type": "github" + }, + "original": { + "owner": "zaphoyd", + "ref": "0.8.2", + "repo": "websocketpp", + "type": "github" + } + }, "wrapper-modules": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1775940860, - "narHash": "sha256-8Jxnn2uoFhm2H579ycVxFWDtrywJ6Mc8RmqWbZwk5So=", + "lastModified": 1776464146, + "narHash": "sha256-XwLFfJDz71vIF7BAhnbLhrzQjmDC2uXdo7N0oHUrYzA=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "fb62851ffc5f6a4d53ebc00b93743e29b41e6224", + "rev": "75febede14a0845f4ef429da692a0698bf433600", "type": "github" }, "original": { @@ -316,14 +624,14 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1775600302, - "narHash": "sha256-2fgKImv78CXIcfo1RsY7EI4uMZ84x/MggA5rrusYc7c=", + "lastModified": 1776505856, + "narHash": "sha256-VbnOijrn4EdYYJwiNQFxQNXECKBa60U66UPxUQAGkBE=", "owner": "Lassulus", "repo": "wrappers", - "rev": "9d8397d8ef1ac35763085f3338589f558128f7db", + "rev": "738d4bf81cbf306f6917c540a5b798110e3cf1e8", "type": "github" }, "original": { @@ -340,11 +648,11 @@ ] }, "locked": { - "lastModified": 1775933978, - "narHash": "sha256-I1ju8FT1J9nNUSw8DDMGCLLUweDAkr45D2HQn3bW43o=", + "lastModified": 1776538405, + "narHash": "sha256-qjo8xO4p/Kn4OrtVwkW8XPH0xaHq5QLu6MMhSf+gJ/w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d1c71822cb8e861345c7ab6a9f841ac99d59d74a", + "rev": "179a2e63531541cb009208c913d7ddf7046ea2b6", "type": "github" }, "original": { @@ -352,6 +660,23 @@ "repo": "zen-browser-flake", "type": "github" } + }, + "zlib-src": { + "flake": false, + "locked": { + "lastModified": 1754565515, + "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", + "owner": "zlib-ng", + "repo": "zlib-ng", + "rev": "425439062b114a0f6cf625022c41d929c7e879f9", + "type": "github" + }, + "original": { + "owner": "zlib-ng", + "ref": "2.2.5", + "repo": "zlib-ng", + "type": "github" + } } }, "root": "root", @@ -22,6 +22,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-flatpak.url = "github:gmodena/nix-flatpak"; + millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; }; outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); diff --git a/modules/nixosModules/desktop/gaming.nix b/modules/nixosModules/desktop/gaming.nix index 7b2016d..c841528 100644 --- a/modules/nixosModules/desktop/gaming.nix +++ b/modules/nixosModules/desktop/gaming.nix @@ -4,10 +4,16 @@ lib, ... }: { - imports = [inputs.nix-flatpak.nixosModules.nix-flatpak]; + imports = [ + inputs.nix-flatpak.nixosModules.nix-flatpak + ]; + + nixpkgs.overlays = [ inputs.millennium.overlays.default ]; programs.steam = { enable = true; + package = pkgs.millennium-steam; + protontricks.enable = true; extest.enable = true; diff --git a/modules/packages/environment.nix b/modules/packages/environment.nix index bcffd98..cfdd46e 100644 --- a/modules/packages/environment.nix +++ b/modules/packages/environment.nix @@ -30,6 +30,7 @@ pkgs.bluetui pkgs.brightnessctl pkgs.btop + pkgs.killall pkgs.lazygit pkgs.p7zip pkgs.rsync diff --git a/modules/packages/eza.nix b/modules/packages/eza.nix new file mode 100644 index 0000000..ba79c67 --- /dev/null +++ b/modules/packages/eza.nix @@ -0,0 +1,33 @@ +{inputs, ...}: { + perSystem = {pkgs, ...}: let + eza-theme = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/eza-community/eza-themes/main/themes/gruvbox-dark.yml"; + hash = "sha256-6vxzSQw2mq8oh0Es1LYmbbavuN0LFOg4Ch6u1G9dv4w="; + }; + + eza-config-dir = pkgs.runCommand "eza-config-dir" {} '' + mkdir -p $out + cp ${eza-theme} $out/theme.yml + ''; + in { + packages.eza = inputs.wrappers.lib.wrapPackage { + inherit pkgs; + package = pkgs.eza; + flags = { + "--git" = true; + "--icons" = "auto"; + "--color" = "always"; + "--octal-permissions" = true; + "--group-directories-first" = true; + "--header" = true; + "--total-size" = true; + "--time-style" = "long-iso"; + "--no-permissions" = true; + "--long" = true; + }; + env = { + EZA_CONFIG_DIR = "${eza-config-dir}"; + }; + }; + }; +} diff --git a/modules/packages/fish.nix b/modules/packages/fish.nix index 7ca7bb8..f4a6627 100644 --- a/modules/packages/fish.nix +++ b/modules/packages/fish.nix @@ -16,6 +16,10 @@ fish_vi_key_bindings ${lib.getExe pkgs.zoxide} init fish | source + + alias ls="${lib.getExe self'.packages.eza}" + alias cd="z" + alias cdi="zi" ''; in { packages.fish = inputs.wrappers.lib.wrapPackage { @@ -23,6 +27,7 @@ package = pkgs.fish; runtimeInputs = [ pkgs.zoxide + self'.packages.eza ]; flags = { "-C" = "source ${fishConf}"; diff --git a/modules/packages/niri/settings.nix b/modules/packages/niri/settings.nix index eeba0c8..1ada95e 100644 --- a/modules/packages/niri/settings.nix +++ b/modules/packages/niri/settings.nix @@ -111,6 +111,8 @@ "XF86MonBrightnessUp".spawn-sh = "${noctaliaExe} brightness increase"; "XF86MonBrightnessDown".spawn-sh = "${noctaliaExe} brightness decrease"; + + "Print".screenshot = {}; }; spawn-at-startup = [ |