Compare commits

..

No commits in common. "d11d080c946853d24f36d9ca832c293d32a5f921" and "d8c016e933fd885bac2295c69200c5caf3b41231" have entirely different histories.

5 changed files with 67 additions and 134 deletions

176
flake.lock generated
View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1772290697, "lastModified": 1770327417,
"narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=", "narHash": "sha256-WNS+wDUeqfegOXf5emDRnNs2bPiJ7rhdARo4jyd3+Yw=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b", "rev": "26670347cca9feddb31e075d23b474149d8902e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +258,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1761588595,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,22 +271,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -295,11 +279,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772408722, "lastModified": 1769996383,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,11 +297,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1772408722, "lastModified": 1769996383,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,51 +364,6 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"nix-gaming",
"nixpkgs"
]
},
"locked": {
"lastModified": 1772893680,
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nix-gaming",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -496,11 +435,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773962693, "lastModified": 1770818644,
"narHash": "sha256-nf9pgktDE4E2TCavUT1vh3Nd/tfKixL1BK6P32Zp3hI=", "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9d3c1d636e7b8ab10f357cd9bee653cd400437de", "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +479,11 @@
"linux-tkg": { "linux-tkg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773696903, "lastModified": 1770607339,
"narHash": "sha256-OkKN/5waWcPNqq/9tWsR9q4oxSJeMCyeBl1RQGctq9Q=", "narHash": "sha256-/j7IEdwbaaN4SGKAl5gE3vRdKIdIw8f7RNMrM9Lc28M=",
"owner": "Frogging-Family", "owner": "Frogging-Family",
"repo": "linux-tkg", "repo": "linux-tkg",
"rev": "e4eabe3978f0e6ed967e5d969487f9335af8062f", "rev": "9498fb9bc0c3323d1c291667d8cb16cb2a37bcee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +501,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773965157, "lastModified": 1770857573,
"narHash": "sha256-u6Ceko/AQ30asd/P68Y7gD0x3LtsjiPwC31TlwVnsac=", "narHash": "sha256-pSeFA1qRAdivDrrKoybJ1DOcbkXx2v/ExIc6n0DbT4U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "7e711c5abd3b0ca9c0038606edeee6bcf09b055c", "rev": "31e79c73c444b2e51eb34f2305792809839c58e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +517,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773942472, "lastModified": 1770810897,
"narHash": "sha256-VRtGTA4WWgrVrjZg+XrnRgMcbAa0EkYkWV5Wcn76/0g=", "narHash": "sha256-6F/Z/UQxalaSoqewSQ4fL8zSws3Vy4wgA5DgyTaeqTo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "06befe1e348bf540bb04a8c0cafe116616e71715", "rev": "6b4ec2264e1d8ba027b85f3883d532c5068be92a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,15 +533,14 @@
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1773888274, "lastModified": 1770778188,
"narHash": "sha256-PujDYvxi8Hbm/EB706mi+UWRRzoBaAVhpJREH13Gepg=", "narHash": "sha256-KZHPn3L6veRgRwOyfhaeM5ZTJfpkoY9EICIzUcQn4w8=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "6e734655941171e75e64511c7c643f854753f52e", "rev": "59e3b8189047bc591635645d2c682020c13eeac5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -633,11 +571,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770841267, "lastModified": 1764242076,
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +587,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1772328832, "lastModified": 1769909678,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "rev": "72716169fe93074c333e8d0173151350670b824c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -680,11 +618,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1773507054, "lastModified": 1770537093,
"narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=", "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9", "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -696,11 +634,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1770562336,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,11 +818,11 @@
"nvim-treesitter": { "nvim-treesitter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773768003, "lastModified": 1770808440,
"narHash": "sha256-lQMRGqObOxoESWDD8+RSZAKmevVXzHS3IipBthvi3To=", "narHash": "sha256-paM9v2DKiHEwN0fTXuX9eY0KwVsB+9Bv6mOX9u/eyAI=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "2b50ab5ccbcd9e5708deb351308edd738adbf84c", "rev": "9f2dad22ef8bb14fd1e0a3aa8859cdc88170668b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -989,11 +927,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1770952264, "lastModified": 1764470739,
"narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1010,11 +948,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1773619901, "lastModified": 1770846656,
"narHash": "sha256-Br8CQy4ht+a2OxyzaRwuP5+oIFfoRvCxYgsmdrgid40=", "narHash": "sha256-wdYpo8++TqKp3GdRgLFykjuIVW1m9GlUnxID2FG74cE=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "6f06ff05cd536b790b7662550a10b61a1ac4619e", "rev": "40e65cfc4608402674e1efaac3fccce20d2a72d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1026,11 +964,11 @@
"spotify-adblock": { "spotify-adblock": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773417310, "lastModified": 1739206126,
"narHash": "sha256-nwiX2wCZBKRTNPhmrurWQWISQdxgomdNwcIKG2kSQsE=", "narHash": "sha256-nwiX2wCZBKRTNPhmrurWQWISQdxgomdNwcIKG2kSQsE=",
"owner": "abba23", "owner": "abba23",
"repo": "spotify-adblock", "repo": "spotify-adblock",
"rev": "813d3451c53126bf1941baaf8dd37f1152c3f412", "rev": "8e0312d6085a6e4f9afeb7c2457517a75e8b8f9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1042,11 +980,11 @@
"stevenblack-hosts": { "stevenblack-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773769816, "lastModified": 1770244988,
"narHash": "sha256-OSN3K2lSag5aA58UmfI1JMvmksuEVwlT7TOeBOsEmX8=", "narHash": "sha256-DT9HK9iYTmXUfjKcTxLRMZOeCLb9CAoFEpBiDpEku3g=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "5090055e2d36e9fc5539551656e1d8107a84ad7e", "rev": "7ea67ed353b27e1dbe36363074d1b6c3ca6be46b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1182,11 +1120,11 @@
"zsh-abbr": { "zsh-abbr": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773890443, "lastModified": 1770748719,
"narHash": "sha256-SVuwDeHIBg8yArKGzDEfsG3fz0UwABQoJkyKTQAPUiw=", "narHash": "sha256-RvdMEk1bQ/mCbcTneg8mMJJh6j60km0/wchBBQQ+Ugo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "889f4772c12b9dbe4965bbd56f2572af0a28fa3b", "rev": "2de4a08c5e0d9dbe8447e11e0a177b59b5b6d6ea",
"revCount": 1139, "revCount": 1137,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/olets/zsh-abbr" "url": "https://github.com/olets/zsh-abbr"

View file

@ -10,6 +10,7 @@
libva-vdpau-driver libva-vdpau-driver
libvdpau-va-gl libvdpau-va-gl
]; ];
programs.light.enable = true;
hardware.opentabletdriver.enable = true; hardware.opentabletdriver.enable = true;
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
programs.steam = { programs.steam = {

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
kblight = "brightnessctl -d ${config.me.kbBacklightDevice}"; kblight = "light -s sysfs/leds/${config.me.kbBacklightDevice}";
in in
{ {
home.packages = [ config.services.hypridle.package ]; home.packages = [ config.services.hypridle.package ];
@ -16,18 +16,18 @@ in
listener = lib.optionals (config.me.kbBacklightDevice != null) [ listener = lib.optionals (config.me.kbBacklightDevice != null) [
{ {
timeout = 120; timeout = 120;
on-timeout = "${kblight} -s && ${kblight} 0"; on-timeout = "${kblight} -O && ${kblight} -S 0";
on-resume = "${kblight} -r"; on-resume = "${kblight} -I";
} }
] ++ [ ] ++ [
{ {
timeout = 150; timeout = 150;
on-timeout = "brightnessctl -s && brightnessctl 50%-"; on-timeout = "light -O && light -T 0.5";
on-resume = "brightnessctl -r"; on-resume = "light -I";
} }
{ {
timeout = 180; timeout = 180;
on-timeout = "brightnessctl -r && loginctl lock-session"; on-timeout = "light -I && loginctl lock-session";
} }
{ {
timeout = 195; timeout = 195;

View file

@ -1,8 +1,8 @@
{ fetchFromGitHub, inputs, lib }: { fetchFromGitHub, inputs, lib }:
let let
version = "6.19.9"; version = "6.19";
kernelHash = "0mqka8ii7bvmx9hvfjdiyva9ib0j7m390gxhh8gki3qb4nl7jc1h"; kernelHash = "0mqka8ii7bvmx9hvfjdiyva9ib0j7m390gxhh8gki3qb4nl7jc1h";
kernelPatchHash = "19pwgvifkadsgfsx3w29mi0ks2vwwk88gw4jsya1gjy0jfk1h6qr"; kernelPatchHash = "0w36sxwwhfqpc1if9d52rg0g1k20xjl2cairlyiyk10ns17mjxlb";
mm = lib.versions.majorMinor version; mm = lib.versions.majorMinor version;
hasPatch = (builtins.length (builtins.splitVersion version)) == 3; hasPatch = (builtins.length (builtins.splitVersion version)) == 3;

View file

@ -26,7 +26,6 @@ in {
nodePackages_latest.pnpm nodePackages_latest.pnpm
] ++ lib.optionals config.me.gui [ ] ++ lib.optionals config.me.gui [
android-studio android-studio
brightnessctl
drawio drawio
element-desktop element-desktop
evince evince
@ -50,12 +49,7 @@ in {
# inputs.nix-gaming.packages.x86_64-linux.wine-osu # inputs.nix-gaming.packages.x86_64-linux.wine-osu
obsidian obsidian
pavucontrol pavucontrol
(prismlauncher.override { prismlauncher
jdks = [
jdk21
temurin-bin-25
];
})
qbittorrent qbittorrent
rivalcfg rivalcfg
screenkey screenkey