Compare commits

..

1 commit

Author SHA1 Message Date
d560869c62
Partially revert "imma cry"
This reverts commit 2d1517e710.

This introduced a regression that was patched incorrectly in 7cef671cb1
2025-05-28 00:43:04 -07:00
11 changed files with 81 additions and 261 deletions

225
flake.lock generated
View file

@ -37,11 +37,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1748408240,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
"lastModified": 1736852337,
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
"type": "github"
},
"original": {
@ -102,11 +102,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1748383148,
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
"lastModified": 1744642301,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
"type": "github"
},
"original": {
@ -133,11 +133,11 @@
},
"flake-compat_2": {
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@ -175,11 +175,11 @@
]
},
"locked": {
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
@ -188,24 +188,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -235,11 +217,11 @@
]
},
"locked": {
"lastModified": 1747372754,
"narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
@ -316,11 +298,11 @@
]
},
"locked": {
"lastModified": 1749400020,
"narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=",
"lastModified": 1748391243,
"narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f",
"rev": "f5b12be834874f7661db4ced969a621ab2d57971",
"type": "github"
},
"original": {
@ -337,11 +319,11 @@
]
},
"locked": {
"lastModified": 1748737919,
"narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
"lastModified": 1747763032,
"narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5675a9686851d9626560052a032c4e14e533c1fa",
"rev": "29dda415f5b2178278283856c6f9f7b48a2a4353",
"type": "github"
},
"original": {
@ -353,11 +335,11 @@
"hyprscroller-src": {
"flake": false,
"locked": {
"lastModified": 1749141212,
"narHash": "sha256-YC9WEi74d9L1rjVnjNXqWCUPhHgCj6npQWZ0KT6l2nA=",
"lastModified": 1748269327,
"narHash": "sha256-UfkU8YJCIp5NwW6e+qoRgxZVJYcc6+aRVTdSaHvskTQ=",
"owner": "cpiber",
"repo": "hyprscroller",
"rev": "80f9a9c6ec9423cfd3f17e801e92934ffc5d52d2",
"rev": "5b3cdd1fc26be1a0b1936fc36065b2eba84948f4",
"type": "github"
},
"original": {
@ -366,52 +348,14 @@
"type": "github"
}
},
"iamb": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1749177992,
"narHash": "sha256-B72RIr6pbf9kW0JhcbsgUhLSw22BxxODoKIdPd2YWFY=",
"owner": "ulyssa",
"repo": "iamb",
"rev": "33d3407694c9dece0f3e59aa577eda98c9384ea1",
"type": "github"
},
"original": {
"owner": "ulyssa",
"repo": "iamb",
"type": "github"
}
},
"jkernel": {
"flake": false,
"locked": {
"lastModified": 1733188630,
"narHash": "sha256-TlUFZOqFsTXh97vRpNeyoJJ+WNOwxgvu7u3JcLGN7iU=",
"owner": "tweag",
"repo": "jupyenv",
"rev": "55e42c3dea87d3c1e3e9dfde28df637e88d6bd39",
"type": "github"
},
"original": {
"owner": "tweag",
"repo": "jupyenv",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_2"
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1737639419,
@ -445,16 +389,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1736320768,
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
"lastModified": 1731919951,
"narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
"rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
@ -477,27 +421,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1731919951,
"narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1749285348,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"lastModified": 1748190013,
"narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
"type": "github"
},
"original": {
@ -507,7 +435,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1741462378,
"narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=",
@ -526,7 +454,7 @@
"nixvim": {
"inputs": {
"nixCats": "nixCats",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"plugins-blink-ripgrep": "plugins-blink-ripgrep",
"plugins-pomo-nvim": "plugins-pomo-nvim"
},
@ -557,11 +485,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1748730660,
"narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
"lastModified": 1746056780,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
"type": "github"
},
"original": {
@ -633,10 +561,8 @@
"inputs": {
"home-manager": "home-manager",
"hyprscroller-src": "hyprscroller-src",
"iamb": "iamb",
"jkernel": "jkernel",
"lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"spicetify": "spicetify",
"stylix": "stylix",
@ -646,24 +572,6 @@
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1736994333,
"narHash": "sha256-v4Jrok5yXsZ6dwj2+2uo5cSyUi9fBTurHqHvNHLT1XA=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "848db855cb9e88785996e961951659570fc58814",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"lanzaboote",
@ -689,14 +597,14 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1749357231,
"narHash": "sha256-AbrPgGFVYR45TlYLHYTppayG0xzOG9XXhi+1j3Klbw8=",
"lastModified": 1748147548,
"narHash": "sha256-9IaAQkgyF4PFtVyui8vF6oJah0iVcO9DaOefjdTMthE=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "03783416f7416715c52166d4e8ba0492a7149397",
"rev": "f0595e3b59260457042450749eaec00a5a47db35",
"type": "github"
},
"original": {
@ -721,7 +629,7 @@
"nixpkgs"
],
"nur": "nur",
"systems": "systems_3",
"systems": "systems_2",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@ -729,11 +637,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1749398498,
"narHash": "sha256-Usx6sGnT/D8ZnWiZg+J1OY3dp4ZssMQiN1XeXcsL/cs=",
"lastModified": 1748376235,
"narHash": "sha256-LIQnskjlVHTJC5dW4xoWlMCtrKeWOPW7/8HYd8IruLA=",
"owner": "danth",
"repo": "stylix",
"rev": "5869510e48e64d916dc6905dc664a02b0f85f1bd",
"rev": "e38a646e5cd3d000c8fffb14632f3bb8a45dd042",
"type": "github"
},
"original": {
@ -772,21 +680,6 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
@ -823,11 +716,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1748180480,
"narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
"lastModified": 1744974599,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
"type": "github"
},
"original": {
@ -839,11 +732,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1748740859,
"narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
"lastModified": 1745111349,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
"type": "github"
},
"original": {
@ -911,11 +804,11 @@
"wallpapers": {
"flake": false,
"locked": {
"lastModified": 1749185371,
"narHash": "sha256-M6QK9qLgyvFaM6gF9qH1d6su254cWfw/+1aO3nxeBmQ=",
"lastModified": 1745796213,
"narHash": "sha256-op3AWIjxLTLEOY+AFGWdmxS+BVhPn3F4TXvr9e+7Vjc=",
"owner": "kaitotlex",
"repo": "wallpaper",
"rev": "f1d9cf6f2d16b25ca57e684e1d20124e75413f7c",
"rev": "6cfb73683b4027b3a17dde128f924e817131b760",
"type": "github"
},
"original": {
@ -931,11 +824,11 @@
]
},
"locked": {
"lastModified": 1748971473,
"narHash": "sha256-0Xh6sZI86Ops6u7wyDQlVvV+MvRRXIDb1r3sMnLNk9M=",
"lastModified": 1748059546,
"narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "5cc269976ca876674d8ccc7f40debb61e05583ab",
"rev": "716a5af28d686d67146d01b14112c919b6133a84",
"type": "github"
},
"original": {

View file

@ -36,14 +36,6 @@
url = "github:cpiber/hyprscroller";
flake = false;
};
jkernel = {
url = "github:tweag/jupyenv";
flake = false;
};
iamb = {
url = "github:ulyssa/iamb";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
@ -100,7 +92,6 @@
{
wayland.windowManager.hyprland.settings.monitor = [
"eDP-1,1920x1200@120,0x0,1"
"DP-1, 1920x1080@75.03,3840x0,1,transform, 1"
"HDMI-A-1,1920x1080@165,1920x0,1"
];
programs.git.signing = {

View file

@ -18,7 +18,7 @@
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
#boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
# boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
virtualisation.waydroid.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
#systemdefaults
@ -110,9 +110,7 @@
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
nixpkgs.config.permittedInsecurePackages = [
"olm-3.2.16"
];
services.keyd = {
enable = true;
keyboards.default = {
@ -150,10 +148,6 @@
};
};
#Asus Specific Packages
services.asusd.enable = true;
programs.rog-control-center.enable = true;
#System specific packages to install
environment.systemPackages = with pkgs; [
# nvtop
@ -161,9 +155,6 @@
davinci-resolve
wacomtablet
obs-studio
asusctl
supergfxctl
thinkfan
];
# List services that you want to enable:

View file

@ -161,16 +161,16 @@
events = [ "key" ];
command = "pamixer -d 5";
}
# {
# keys = [ 237 ];
# events = [ "key" ];
# command = "${pkgs.brightnessctl} -d asus::kbd_backlight set 1-";
# }
# {
# keys = [ 238 ];
# events = [ "key" ];
# command = "${pkgs.brightnessctl} -d asus::kbd_backlight set +1";
# }
{
keys = [ 237 ];
events = [ "key" ];
command = "brightnessctl -d asus::kbd_backlight set 1-";
}
{
keys = [ 238 ];
events = [ "key" ];
command = "brightnessctl -d asus::kbd_backlight set +1";
}
#{ keys = [ ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; }
#{ keys = [ ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; }

View file

@ -36,9 +36,6 @@
enable = true;
dockerCompat = true;
};
nixpkgs.config.permittedInsecurePackages = [
"olm-3.2.16"
];
boot = {
# Bootloader.
loader.systemd-boot.enable = true;
@ -114,9 +111,9 @@
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_SCALING_GOVERNOR_ON_BAT = "performance";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_BAT = "performance";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;

View file

@ -6,7 +6,7 @@
stylix = {
enable = true;
image = "${inputs.wallpapers}/anime/N25/mafuAura.png";
image = "${inputs.wallpapers}/anime/mafuyuMum.jpg";
polarity = "dark";
base16Scheme = "${pkgs.base16-schemes}/share/themes/heetch.yaml";

View file

@ -1,11 +1,10 @@
{
lib,
fetchFromGitHub,
hyprland,
pkg-config,
cmake,
unstableGitUpdater,
...
version,
src,
}:
let
mkHyprlandPlugin =
@ -27,29 +26,18 @@ let
);
in
mkHyprlandPlugin hyprland {
inherit version src;
pluginName = "hyprscroller";
version = "0-unstable-2025-05-16";
src = fetchFromGitHub {
owner = "cpiber";
repo = "hyprscroller";
rev = "de97924b6d1086d84939b6f6688637f7b21d8d80";
hash = "sha256-m9689UH+w8Z/qP/DKYtzQfIGfiE4jgBAfO+uH34cfNs=";
};
nativeBuildInputs = [ cmake ];
installPhase = ''
runHook preInstall
mkdir -p $out/lib
mv hyprscroller.so $out/lib/libhyprscroller.so
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
homepage = "https://github.com/cpiber/hyprscroller";
description = "Hyprland layout plugin providing a scrolling layout like PaperWM";

View file

@ -81,10 +81,6 @@ in
bindel = [
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%+"
",XF86KbdBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl -d asus::kbd_backlight set 1-"
",XF86KbdBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl -d asus::kbd_backlight set 1-"
",XF86Launch1, exec, ${pkgs.supergfxctl}/bin/supergfxctl --mode Hybrid"
",XF86Launch4, exec, ${pkgs.supergfxctl}/bin/supergfxctl --mode Integrated"
",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
];

View file

@ -114,7 +114,7 @@ in
natural_scroll = true;
disable_while_typing = true;
clickfinger_behavior = true;
tap-to-click = true;
tap-to-click = false;
scroll_factor = 0.15;
};

View file

@ -70,7 +70,7 @@ in
"clock"
];
clock = {
format = " {:%a, %D, %T}";
format = " {:%a, %d %b, %I:%M %p}";
tooltip = "true";
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
format-alt = " {:%d/%m}";

View file

@ -23,13 +23,8 @@
# here is some command line tools I use frequently
# feel free to add your own or remove some of them
#gfortran1
gqrx
urh
rtl_433
rng-tools
nheko
openvpn
tor-browser
opera
bambu-studio
gimp3
openssl
@ -247,38 +242,7 @@
enableBashIntegration = true;
enableFishIntegration = true;
};
programs.iamb = {
enable = true;
package = inputs.iamb.packages.${pkgs.stdenv.targetPlatform.system}.default;
settings = {
profiles."matrix.org".user_id = "@kaitotlex:matrix.org";
settings = {
image_preview = { };
notifications = {
enabled = true;
show_message = true;
};
};
};
};
# programs.iamb = {
# enable = true;
# packages = inputs.iamb.packages.${pkgs.stdenv.targetPlatform.system}.default;
# settings = {
# profiles."matrix.org" = {
# user_id = "@kaitotlex:matrix.org";
# style = "restore";
# };
# settings = {
# image_preview = { };
# image_preview.protocol.type = "kitty";
# notifications = {
# enabled = true;
# show_message = true;
# };
# };
# };
# };
programs.kitty = {
enable = true;
settings = {