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

Merge branch 'framework/master' into zenix/master

Browse source
This commit is contained in:
tristan 2025-07-15 23:40:39 +01:00
commit bbfa0261f2
4 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hardware/zenix.nix
View file

@ -73,8 +73,6 @@ in {
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
hardware.cpu.x86.msr.enable = true; hardware.cpu.x86.msr.enable = true;
hardware.keyboard.zsa.enable = true;
networking.hostName = "zenix"; networking.hostName = "zenix";
services.openssh.enable = true; services.openssh.enable = true;

21
home/desktop/cosmic/default.nix
View file

@ -6,12 +6,13 @@
... ...
}: let }: let
inherit (config.lib.cosmic) mkRON; inherit (config.lib.cosmic) mkRON;
mkAction = variant: action: mkRON "enum" { mkAction = variant: action:
inherit variant; mkRON "enum" {
value = [ inherit variant;
(mkRON "enum" action) value = [
]; (mkRON "enum" action)
}; ];
};
in { in {
imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager]; imports = [inputs.cosmic-manager.homeManagerModules.cosmic-manager];
wayland.desktopManager.cosmic = { wayland.desktopManager.cosmic = {
@ -35,8 +36,8 @@ in {
autotile = true; autotile = true;
focus_follows_cursor = true; focus_follows_cursor = true;
focus_follows_cursor_delay = 25; focus_follows_cursor_delay = 25;
input_default = mkRON "optional" { input_default.acceleration = mkRON "optional" {
profile = (mkRON "optional" (mkRON "enum" "Flat")); profile = mkRON "optional" (mkRON "enum" "Flat");
speed = 0.0; speed = 0.0;
}; };
keyboard_config.numlock_state = (mkRON "enum" "BootOn"); keyboard_config.numlock_state = (mkRON "enum" "BootOn");
@ -51,7 +52,7 @@ in {
sampling_method = mkRON "enum" "Alphanumeric"; sampling_method = mkRON "enum" "Alphanumeric";
scaling_mode = mkRON "enum" "Zoom"; scaling_mode = mkRON "enum" "Zoom";
source = mkRON "enum" { source = mkRON "enum" {
value = [ (toString config.stylix.image) ]; value = [(toString config.stylix.image)];
variant = "Path"; variant = "Path";
}; };
} }
@ -91,7 +92,5 @@ in {
size = mkRON "enum" "XS"; size = mkRON "enum" "XS";
} }
]; ];
}; };
} }

4
home/programs/git.nix
View file

@ -52,4 +52,8 @@
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
}; };
programs.jujutsu = {
enable = true;
};
} }

7
nixos/workstation.nix
View file

@ -34,6 +34,7 @@
stylix = { stylix = {
enable = true; enable = true;
image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"; image = "${pkgs.cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg";
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
polarity = "dark"; polarity = "dark";
opacity = { opacity = {
terminal = 0.9; terminal = 0.9;
@ -75,4 +76,10 @@
enable = true; enable = true;
indicator = 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"
'';
} }