diff --git a/hardware/zenix.nix b/hardware/zenix.nix index d76130a..7408fa1 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -73,8 +73,6 @@ in { hardware.cpu.amd.updateMicrocode = true; hardware.cpu.x86.msr.enable = true; - hardware.keyboard.zsa.enable = true; - networking.hostName = "zenix"; services.openssh.enable = true; diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index 107cb5e..8c68e01 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -6,12 +6,13 @@ ... }: let inherit (config.lib.cosmic) mkRON; - mkAction = variant: action: mkRON "enum" { - inherit variant; - value = [ - (mkRON "enum" action) - ]; - }; + mkAction = variant: action: + mkRON "enum" { + inherit variant; + value = [ + (mkRON "enum" action) + ]; + }; in { imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager]; wayland.desktopManager.cosmic = { @@ -35,8 +36,8 @@ in { autotile = true; focus_follows_cursor = true; focus_follows_cursor_delay = 25; - input_default = mkRON "optional" { - profile = (mkRON "optional" (mkRON "enum" "Flat")); + input_default.acceleration = mkRON "optional" { + profile = mkRON "optional" (mkRON "enum" "Flat"); speed = 0.0; }; keyboard_config.numlock_state = (mkRON "enum" "BootOn"); @@ -51,7 +52,7 @@ in { sampling_method = mkRON "enum" "Alphanumeric"; scaling_mode = mkRON "enum" "Zoom"; source = mkRON "enum" { - value = [ (toString config.stylix.image) ]; + value = [(toString config.stylix.image)]; variant = "Path"; }; } @@ -91,7 +92,5 @@ in { size = mkRON "enum" "XS"; } ]; - }; - } diff --git a/home/programs/git.nix b/home/programs/git.nix index 1e9f122..cc2b2ab 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -52,4 +52,8 @@ programs.lazygit = { enable = true; }; + + programs.jujutsu = { + enable = true; + }; } diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 334e4de..6620850 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -34,6 +34,7 @@ stylix = { enable = true; image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; polarity = "dark"; opacity = { terminal = 0.9; @@ -75,4 +76,10 @@ enable = true; indicator = true; }; + + hardware.keyboard.zsa.enable = true; + # enable keychron keyboard configuration + services.udev.extraRules = '' + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="3434", ATTRS{idProduct}=="0e60", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + ''; }