tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Compare commits

base: tristan:e3c79188d379fd3ab5f90462a0ad2098dacecfd4
Branches Tags
tristan:zenix/master
tristan:alpine/master
tristan:framework/master
...
compare: tristan:dc5ad3733a87f30664028a2fb0b239a9653953d2
Branches Tags
tristan:alpine/master
tristan:framework/master
tristan:zenix/master

5 commits
e3c79188d3 ... dc5ad3733a

Author SHA1 Message Date
Tristan
dc5ad3733a zenix: update 2026-02-09 21:47:35 +00:00
Tristan
a80c95bc62 framework: change hotkeys and add brave 
zen has real perf issues.
 2026-01-27 13:47:03 +00:00
Tristan
9af12342ac merge framework and zenix 2026-01-16 16:13:24 +00:00
Tristan
2d24a1e8e1 framework: update 2026-01-05 10:09:30 +00:00
Tristan
58057b499f framework: update 2025-12-15 14:36:51 +00:00
6 changed files with 113 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

132
flake.lock generated
View file

@ -95,11 +95,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764724327, "lastModified": 1764873433,
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765835352, "lastModified": 1768135262,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9", "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -158,11 +158,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763759067, "lastModified": 1767609335,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,11 +209,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.gnome.org", "host": "gitlab.gnome.org",
"lastModified": 1764524476, "lastModified": 1767737596,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767280655, "lastModified": 1770260404,
"narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d49d2543f02dbd789ed032188c84570d929223cb", "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1764554060, "lastModified": 1767232402,
"narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "599562080b2901046829ca69e0d1461041d27b32", "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1767257541, "lastModified": 1770493836,
"narHash": "sha256-eAZD0o5eC85jES3k8S0e1NlJJv+rTgofhl0QajhFjyM=", "narHash": "sha256-UPG9xFnVkqHF5e2GOucQO8BXXzwp8BwwON2g+WBXLMA=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "0eb70f38f02923ff59743a0978fed88f04c98c7d", "rev": "a17befde0c0ca25617fb3da505294deb45cef170",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767160009, "lastModified": 1770394936,
"narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=", "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3", "rev": "549148d27779d024255a84535b42b947f1c2a113",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1766902085,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +367,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1767047869, "lastModified": 1770464364,
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +383,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767047869, "lastModified": 1770464364,
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1766070988, "lastModified": 1770197578,
"narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,11 +422,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1766849711, "lastModified": 1769049374,
"narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764773531, "lastModified": 1767886815,
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1d9616689e98beded059ad0384b9951e967a17fa", "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,11 +471,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761730856, "lastModified": 1768249818,
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766894905, "lastModified": 1770526836,
"narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,11 +538,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1766603740, "lastModified": 1770308890,
"narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -633,11 +633,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763914658, "lastModified": 1767817087,
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "rev": "bd99656235aab343e3d597bf196df9bc67429507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764465359, "lastModified": 1767489635,
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -665,11 +665,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764464512, "lastModified": 1767488740,
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,11 +698,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1766429945, "lastModified": 1770167989,
"narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -716,11 +716,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1767307876, "lastModified": 1770438797,
"narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=", "narHash": "sha256-pwnQTmZswF6bu2/Ie7ajOo8w6rXQwVI954S9WX1UG3w=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "c5bffaf433e6137fe80cd1930584836f11119b26", "rev": "d396599774bdbafeb86c122dc2c422c7084ea390",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -67,7 +67,7 @@
./hardware/framework-13.nix ./hardware/framework-13.nix
./nixos/workstation.nix ./nixos/workstation.nix
./nixos/modules/work.nix ./nixos/modules/work.nix
./nixos/programs/niri.nix ./nixos/programs/hyprland.nix
]; ];
home-modules = [ home-modules = [
./home/programs/work.nix ./home/programs/work.nix

68
hardware/framework-13.nix
View file

@ -80,40 +80,40 @@
''; '';
}; };
programs.niri.settings.outputs = { # programs.niri.settings.outputs = {
# Laptop display # # Laptop display
"eDP-1" = { # "eDP-1" = {
mode = { # mode = {
width = 2256; # width = 2256;
height = 1504; # height = 1504;
refresh = 59.999; # refresh = 59.999;
}; # };
}; # };
"HP Inc. HP 24x 1CR9500W9Q" = { # "HP Inc. HP 24x 1CR9500W9Q" = {
mode = { # mode = {
width = 1920; # width = 1920;
height = 1080; # height = 1080;
refresh = 144.001; # refresh = 144.001;
}; # };
scale = 1.0; # scale = 1.0;
position = { # position = {
x = 2256; # x = 2256;
y = 0; # y = 0;
}; # };
}; # };
"Ancor Communications Inc ASUS VS228 F3LMTF154813" = { # "Ancor Communications Inc ASUS VS228 F3LMTF154813" = {
mode = { # mode = {
width = 1920; # width = 1920;
height = 1080; # height = 1080;
refresh = 60.0; # refresh = 60.0;
}; # };
scale = 1.0; # scale = 1.0;
position = { # position = {
x = 2256 + 1920; # x = 2256 + 1920;
y = 0; # y = 0;
}; # };
}; # };
}; # };
} }
]; ];

11
home/desktop/hyprland/default.nix
View file

@ -38,6 +38,9 @@ in {
numlock_by_default = true; numlock_by_default = true;
accel_profile = "flat"; accel_profile = "flat";
}; };
gesture = [
"3, horizontal, workspace"
];
decoration = { decoration = {
rounding = 0; rounding = 0;
}; };
@ -63,9 +66,9 @@ in {
"${modifier}_SHIFT, space, cyclenext, floating" "${modifier}_SHIFT, space, cyclenext, floating"
# window management # window management
"${modifier}, F, fullscreen," "${modifier}, M, fullscreen,"
"${modifier}, V, togglefloating," "${modifier}, G, togglefloating,"
"${modifier}_SHIFT, X, killactive" "${modifier}, Q, killactive"
# master layout # master layout
"${modifier}, j, layoutmsg, rollnext" "${modifier}, j, layoutmsg, rollnext"
@ -82,7 +85,7 @@ in {
"${modifier}_SHIFT, l, moveintogroup, r" "${modifier}_SHIFT, l, moveintogroup, r"
# scratch buffer # scratch buffer
"${modifier}, Y, togglespecialworkspace" "${modifier}, Y, togglespecialworkspace"
"${modifier}_SHIFT, Y, movetoworkspace, special" "${modifier}_SHIFT, Y, movetoworkspace, special"
# applications # applications

1
home/programs/graphical.nix
View file

@ -31,6 +31,7 @@
bitwarden-desktop bitwarden-desktop
inputs.zen-browser.packages.x86_64-linux.default inputs.zen-browser.packages.x86_64-linux.default
brave
]; ];
programs.obs-studio = { programs.obs-studio = {

4
home/programs/scripts.nix
View file

@ -102,6 +102,10 @@ in {
modifier = "${modifier}_SHIFT"; modifier = "${modifier}_SHIFT";
key = "S"; key = "S";
} }
{
modifier = "";
key = "Print";
}
]; ];
} }
{ {