From 6b5ebd18c543b00060101d7222cb389945055481 Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 27 May 2025 21:36:11 -0700 Subject: [PATCH 1/3] Greetd Fix --- flake.lock | 6 +++--- modules/wm/default.nix | 2 +- users/kaitotlex/home.nix | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 1d23824..01b927a 100644 --- a/flake.lock +++ b/flake.lock @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1748227609, - "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", "type": "github" }, "original": { diff --git a/modules/wm/default.nix b/modules/wm/default.nix index 8aa658f..31fc0a1 100644 --- a/modules/wm/default.nix +++ b/modules/wm/default.nix @@ -4,7 +4,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --asterisks --remember"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --asterisks --remember --greeting 'Access for those who don't touch grass'"; # --remember tuigreet --time --cmd Hyprland --remember --asterisks --greeting 'Access granted for those who don't touch grass' user = "greeter"; }; diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix index e1a829f..ff4d276 100644 --- a/users/kaitotlex/home.nix +++ b/users/kaitotlex/home.nix @@ -23,6 +23,8 @@ # here is some command line tools I use frequently # feel free to add your own or remove some of them #gfortran1 + tor-browser + opera bambu-studio gimp3 openssl @@ -228,7 +230,7 @@ programs.git = { enable = true; userName = "KaitoTLex"; - userEmail = "wlin@kaitotlex.systems"; + userEmail = "renl@kaitotlex.systems"; }; programs.neovim.defaultEditor = true; From 511afa919a0c49f16e91cdaa17a8e6b61ba81444 Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 27 May 2025 21:55:15 -0700 Subject: [PATCH 2/3] Completed Massive Update: Kernel6.12 -> 6.14; NixOS Victuna -> NixOS Xantusia; Msc. Package Upgrade; Nvidia Works on Kuroko; etc. --- modules/wm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/wm/default.nix b/modules/wm/default.nix index 31fc0a1..6ab06fb 100644 --- a/modules/wm/default.nix +++ b/modules/wm/default.nix @@ -4,7 +4,9 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --asterisks --remember --greeting 'Access for those who don't touch grass'"; + command = '' + ${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --remember --asterisks --greeting "Welcome, generation $(readlink /nix/var/nix/profiles/system | grep -o '[0-9]*'). Access is restricted to authorized personnel only." + ''; # --remember tuigreet --time --cmd Hyprland --remember --asterisks --greeting 'Access granted for those who don't touch grass' user = "greeter"; }; From 8ded4506daf94eb7f7a7237f32995dcf8799ff01 Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Tue, 3 Jun 2025 21:50:23 -0700 Subject: [PATCH 3/3] fixed X-server conflict --- flake.lock | 90 +++++++++---------- flake.nix | 1 + hosts/kuroko/configuration.nix | 13 ++- hosts/kurokoNightly/configuration.nix | 20 ++--- hosts/shiroko/configuration.nix | 3 + .../desktop-environment/hyprland/binds.nix | 4 + .../desktop-environment/hyprland/default.nix | 2 +- .../desktop-environment/waybar/default.nix | 2 +- users/kaitotlex/home.nix | 3 +- 9 files changed, 78 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 01b927a..f4a5ce6 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1748391243, - "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", + "lastModified": 1748979197, + "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f5b12be834874f7661db4ced969a621ab2d57971", + "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3", "type": "github" }, "original": { @@ -319,11 +319,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "hyprscroller-src": { "flake": false, "locked": { - "lastModified": 1748269327, - "narHash": "sha256-UfkU8YJCIp5NwW6e+qoRgxZVJYcc6+aRVTdSaHvskTQ=", + "lastModified": 1748498601, + "narHash": "sha256-fz3e9Vf+UfP48bu8/J5LCcw9cijGRR6VoVdxEXrqkwM=", "owner": "cpiber", "repo": "hyprscroller", - "rev": "5b3cdd1fc26be1a0b1936fc36065b2eba84948f4", + "rev": "2c72e35b985a275a02ec1fe79dea5b6e41cb2ea8", "type": "github" }, "original": { @@ -421,11 +421,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -600,11 +600,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1748147548, - "narHash": "sha256-9IaAQkgyF4PFtVyui8vF6oJah0iVcO9DaOefjdTMthE=", + "lastModified": 1748752728, + "narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "f0595e3b59260457042450749eaec00a5a47db35", + "rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240", "type": "github" }, "original": { @@ -637,11 +637,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748376235, - "narHash": "sha256-LIQnskjlVHTJC5dW4xoWlMCtrKeWOPW7/8HYd8IruLA=", + "lastModified": 1748970111, + "narHash": "sha256-PmdrezN87CNzqTPnlC+YpLS7bZ0naeaD5d2eBFivXdY=", "owner": "danth", "repo": "stylix", - "rev": "e38a646e5cd3d000c8fffb14632f3bb8a45dd042", + "rev": "82d9424fffa709e162364c1397f816d232e6e1d1", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -732,11 +732,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -824,11 +824,11 @@ ] }, "locked": { - "lastModified": 1748059546, - "narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=", + "lastModified": 1748971473, + "narHash": "sha256-0Xh6sZI86Ops6u7wyDQlVvV+MvRRXIDb1r3sMnLNk9M=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "716a5af28d686d67146d01b14112c919b6133a84", + "rev": "5cc269976ca876674d8ccc7f40debb61e05583ab", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6f8262e..37ee088 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,7 @@ { wayland.windowManager.hyprland.settings.monitor = [ "eDP-1,1920x1200@120,0x0,1" + "DP-1, 1920x1080@75.03,3840, transform, 1" "HDMI-A-1,1920x1080@165,1920x0,1" ]; programs.git.signing = { diff --git a/hosts/kuroko/configuration.nix b/hosts/kuroko/configuration.nix index 2b3c4d4..c09f380 100644 --- a/hosts/kuroko/configuration.nix +++ b/hosts/kuroko/configuration.nix @@ -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,7 +110,9 @@ 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 = { @@ -148,6 +150,10 @@ }; }; + #Asus Specific Packages + services.asusd.enable = true; + programs.rog-control-center.enable = true; + #System specific packages to install environment.systemPackages = with pkgs; [ # nvtop @@ -155,6 +161,9 @@ davinci-resolve wacomtablet obs-studio + asusctl + supergfxctl + thinkfan ]; # List services that you want to enable: diff --git a/hosts/kurokoNightly/configuration.nix b/hosts/kurokoNightly/configuration.nix index bc40d07..9b58dcc 100644 --- a/hosts/kurokoNightly/configuration.nix +++ b/hosts/kurokoNightly/configuration.nix @@ -161,16 +161,16 @@ events = [ "key" ]; command = "pamixer -d 5"; } - { - 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 = [ 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 = [ ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; } #{ keys = [ ]; events = [ "key" ]; command = "brightnessctl -d amdgpu_bl2 set +10%"; } diff --git a/hosts/shiroko/configuration.nix b/hosts/shiroko/configuration.nix index 724f932..7084d6e 100644 --- a/hosts/shiroko/configuration.nix +++ b/hosts/shiroko/configuration.nix @@ -36,6 +36,9 @@ enable = true; dockerCompat = true; }; + nixpkgs.config.permittedInsecurePackages = [ + "olm-3.2.16" + ]; boot = { # Bootloader. loader.systemd-boot.enable = true; diff --git a/users/kaitotlex/desktop-environment/hyprland/binds.nix b/users/kaitotlex/desktop-environment/hyprland/binds.nix index 2b40153..6886fe4 100644 --- a/users/kaitotlex/desktop-environment/hyprland/binds.nix +++ b/users/kaitotlex/desktop-environment/hyprland/binds.nix @@ -81,6 +81,10 @@ 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" ]; diff --git a/users/kaitotlex/desktop-environment/hyprland/default.nix b/users/kaitotlex/desktop-environment/hyprland/default.nix index 04dd0c2..ddd9dde 100644 --- a/users/kaitotlex/desktop-environment/hyprland/default.nix +++ b/users/kaitotlex/desktop-environment/hyprland/default.nix @@ -114,7 +114,7 @@ in natural_scroll = true; disable_while_typing = true; clickfinger_behavior = true; - tap-to-click = false; + tap-to-click = true; scroll_factor = 0.15; }; diff --git a/users/kaitotlex/desktop-environment/waybar/default.nix b/users/kaitotlex/desktop-environment/waybar/default.nix index 6c776a0..e8b9def 100644 --- a/users/kaitotlex/desktop-environment/waybar/default.nix +++ b/users/kaitotlex/desktop-environment/waybar/default.nix @@ -70,7 +70,7 @@ in "clock" ]; clock = { - format = " {:%a, %d %b, %I:%M %p}"; + format = " {:%a, %D, %T}"; tooltip = "true"; tooltip-format = "{:%Y %B}\n{calendar}"; format-alt = " {:%d/%m}"; diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix index ff4d276..394d57b 100644 --- a/users/kaitotlex/home.nix +++ b/users/kaitotlex/home.nix @@ -23,8 +23,9 @@ # here is some command line tools I use frequently # feel free to add your own or remove some of them #gfortran1 + nheko + openvpn tor-browser - opera bambu-studio gimp3 openssl