KaitoTLex/KaitoianOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed X-server conflict

Browse source
This commit is contained in:
KaitoTLex 2025-06-03 21:50:23 -07:00
parent 511afa919a
commit 8ded4506da
No known key found for this signature in database
GPG key ID: 8AB934746F475D0B
9 changed files with 78 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

90
flake.lock generated
View file

@ -37,11 +37,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736852337, "lastModified": 1748408240,
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +102,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744642301, "lastModified": 1748383148,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1747046372,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1743550720,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742649964, "lastModified": 1747372754,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748391243, "lastModified": 1748979197,
"narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f5b12be834874f7661db4ced969a621ab2d57971", "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,11 +319,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747763032, "lastModified": 1748737919,
"narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +335,11 @@
"hyprscroller-src": { "hyprscroller-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748269327, "lastModified": 1748498601,
"narHash": "sha256-UfkU8YJCIp5NwW6e+qoRgxZVJYcc6+aRVTdSaHvskTQ=", "narHash": "sha256-fz3e9Vf+UfP48bu8/J5LCcw9cijGRR6VoVdxEXrqkwM=",
"owner": "cpiber", "owner": "cpiber",
"repo": "hyprscroller", "repo": "hyprscroller",
"rev": "5b3cdd1fc26be1a0b1936fc36065b2eba84948f4", "rev": "2c72e35b985a275a02ec1fe79dea5b6e41cb2ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1748190013, "lastModified": 1748693115,
"narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746056780, "lastModified": 1748730660,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167", "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +600,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1748147548, "lastModified": 1748752728,
"narHash": "sha256-9IaAQkgyF4PFtVyui8vF6oJah0iVcO9DaOefjdTMthE=", "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "f0595e3b59260457042450749eaec00a5a47db35", "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +637,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1748376235, "lastModified": 1748970111,
"narHash": "sha256-LIQnskjlVHTJC5dW4xoWlMCtrKeWOPW7/8HYd8IruLA=", "narHash": "sha256-PmdrezN87CNzqTPnlC+YpLS7bZ0naeaD5d2eBFivXdY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e38a646e5cd3d000c8fffb14632f3bb8a45dd042", "rev": "82d9424fffa709e162364c1397f816d232e6e1d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -716,11 +716,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744974599, "lastModified": 1748180480,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -732,11 +732,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745111349, "lastModified": 1748740859,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748059546, "lastModified": 1748971473,
"narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=", "narHash": "sha256-0Xh6sZI86Ops6u7wyDQlVvV+MvRRXIDb1r3sMnLNk9M=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "716a5af28d686d67146d01b14112c919b6133a84", "rev": "5cc269976ca876674d8ccc7f40debb61e05583ab",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -92,6 +92,7 @@
{ {
wayland.windowManager.hyprland.settings.monitor = [ wayland.windowManager.hyprland.settings.monitor = [
"eDP-1,1920x1200@120,0x0,1" "eDP-1,1920x1200@120,0x0,1"
"DP-1, 1920x1080@75.03,3840, transform, 1"
"HDMI-A-1,1920x1080@165,1920x0,1" "HDMI-A-1,1920x1080@165,1920x0,1"
]; ];
programs.git.signing = { programs.git.signing = {

11
hosts/kuroko/configuration.nix
View file

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

20
hosts/kurokoNightly/configuration.nix
View file

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

3
hosts/shiroko/configuration.nix
View file

@ -36,6 +36,9 @@
enable = true; enable = true;
dockerCompat = true; dockerCompat = true;
}; };
nixpkgs.config.permittedInsecurePackages = [
"olm-3.2.16"
];
boot = { boot = {
# Bootloader. # Bootloader.
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;

4
users/kaitotlex/desktop-environment/hyprland/binds.nix
View file

@ -81,6 +81,10 @@ in
bindel = [ bindel = [
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-" ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
",XF86MonBrightnessUp, 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" ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5" ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
]; ];

2
users/kaitotlex/desktop-environment/hyprland/default.nix
View file

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

2
users/kaitotlex/desktop-environment/waybar/default.nix
View file

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

3
users/kaitotlex/home.nix
View file

@ -23,8 +23,9 @@
# here is some command line tools I use frequently # here is some command line tools I use frequently
# feel free to add your own or remove some of them # feel free to add your own or remove some of them
#gfortran1 #gfortran1
nheko
openvpn
tor-browser tor-browser
opera
bambu-studio bambu-studio
gimp3 gimp3
openssl openssl