Compare commits

..

20 Commits

Author SHA1 Message Date
jay
57a8e90361 Added a note. 2025-07-19 09:23:59 -04:00
jay
62e535f344 Set hyprland fps to 60 for battery saving. 2025-07-19 00:45:58 -04:00
jay
7fa73b8cb8 Set brightness changes from 10% to 5%. 2025-07-18 14:22:01 -04:00
jay
8a2e4e275f Flake update. 2025-07-18 09:41:19 -04:00
jay
85e8feda05 Add brightnessctl for framework screen. 2025-07-18 09:28:38 -04:00
jay
6e75d84e0a Add powertop.
Compile fix.
2025-07-18 01:10:25 -04:00
jay
54934453ac Added powertop. 2025-07-18 01:06:45 -04:00
jay
1aa107ed6c Disable wake up on keyboard so that Framework doesn't wake up within a backpack. 2025-07-18 00:40:32 -04:00
jay
2655e9982c Set up power profiles for Framework. 2025-07-18 00:35:41 -04:00
jay
557e0f0bd0 Flake update. 2025-07-18 00:35:32 -04:00
jay
91bd15c5c6 Framework specific kernel module and disable color dimming in lower power. 2025-07-18 00:25:56 -04:00
jay
a70c1a3654 Add Framework fwupd. 2025-07-17 20:52:21 -04:00
jay
6d7e3af100 Hyprland resolution change, hostname change. 2025-07-17 20:37:41 -04:00
jay
586ad8519e Update zen dotfiles. 2025-07-17 20:25:12 -04:00
jay
7173535d77 Merge branch 'main' of https://git.zerojay.com/jay/nixverse 2025-07-17 20:22:33 -04:00
jay
8c721c7d30 Compilation fix. 2025-07-17 21:35:04 +00:00
jay
5809269e0d Compilation fix. 2025-07-17 21:34:12 +00:00
jay
d2eb0e542f Compilation fix. 2025-07-17 21:33:08 +00:00
jay
eb4887b75c Compilation fix. 2025-07-17 21:27:57 +00:00
jay
8cee898866 Add fingerprint reader stuff and framework default hardware profile. 2025-07-17 21:21:23 +00:00
15 changed files with 50 additions and 39 deletions

View File

@@ -16,7 +16,7 @@ Machines
To-Do List
[ ] Finish porting features from nixy's previous setup and get them working on lappy: impermanence.
[ ] Set up declarative Discord setup with nixcord and plugins.
[ ] Set up declarative Discord setup with nixcord and plugins (broken upstream currently).
[ ] Figure out how to set up sops-nix with user passwords properly.
[X] Fully setup private git repository for secrets.
[X] Integrate private git repository into nixverse setup.

41
flake.lock generated
View File

@@ -381,11 +381,11 @@
]
},
"locked": {
"lastModified": 1752890591,
"narHash": "sha256-zvJs+RxrYWoPt4w3+e4H9PGOvsKVgqGDMpmZjZStLVw=",
"lastModified": 1752832532,
"narHash": "sha256-YvQ6sjTxS+cw+w8fhEL41vAC28q4sB0vT77uhzQ1eOA=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "e68cf458c6644ad07a8fc9d762b843e192efe966",
"rev": "4e113d7f833a78a54a35dfc5514a89e5e7c78d4f",
"type": "github"
},
"original": {
@@ -549,29 +549,13 @@
"type": "github"
}
},
"nixpkgs-unstable-nixos": {
"locked": {
"lastModified": 1752900028,
"narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1752900028,
"narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
"lastModified": 1752747119,
"narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
"rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec",
"type": "github"
},
"original": {
@@ -588,11 +572,11 @@
]
},
"locked": {
"lastModified": 1752926550,
"narHash": "sha256-ueLoy/+iEWji4gSkUa31Me/Qxes4Iq5fCWieU3WhLwQ=",
"lastModified": 1751773294,
"narHash": "sha256-7SOb5tc8FARZHUBr8HeCO5016lpiG+S1qugQQdXzF/w=",
"owner": "hgl",
"repo": "nixverse",
"rev": "9052dd42c579657cd89a8c26316424cd77488ace",
"rev": "084a07f43829857fc760e70212c497d2f40eaa3c",
"type": "github"
},
"original": {
@@ -638,7 +622,6 @@
"nixos-hardware-stable-nixos": "nixos-hardware-stable-nixos",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
"nixpkgs-unstable-nixos": "nixpkgs-unstable-nixos",
"nixverse": "nixverse",
"sops-nix-stable-nixos": "sops-nix-stable-nixos",
"stylix-stable-nixos": "stylix-stable-nixos",
@@ -686,11 +669,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1752962561,
"narHash": "sha256-45R7e+u63LcrSuq/zseu6aWdzwmxr06pR89JRJ0XJdM=",
"lastModified": 1752752240,
"narHash": "sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u+uxM=",
"owner": "danth",
"repo": "stylix",
"rev": "249f2686ea8a3452ec102f3754f97e238e55af18",
"rev": "40f40bda4269f6e5490c25975069dc61aede6d52",
"type": "github"
},
"original": {

View File

@@ -2,7 +2,6 @@
inputs = {
self.submodules = true;
nixpkgs-stable-nixos.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable-nixos.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixverse = {
url = "github:hgl/nixverse";
inputs.nixpkgs.follows = "nixpkgs-stable-nixos";

View File

@@ -88,8 +88,8 @@
",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
",XF86MonBrightnessUp, exec, brightnessctl s 10%+"
",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
",XF86MonBrightnessUp, exec, brightnessctl s 5%+"
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
];
bindl = [

View File

@@ -11,7 +11,6 @@
pkgs.protonup-qt
pkgs.wineWowPackages.stable
pkgs.winetricks
pkgs-unstable.nero-umu
];
}

View File

@@ -9,8 +9,10 @@
[ # Include the results of the hardware scan.
./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.framework-16-7040-amd
./programs/brightnessctl.nix
./programs/fwupd.nix
./programs/powertop.nix
./programs/sof-firmware.nix
# Not working yet.
./services/fprintd.nix
./services/touchpad.nix
./system/bootloader.nix

View File

@@ -1,7 +1,7 @@
{ ... }: {
wayland.windowManager.hyprland = {
settings = {
"monitor" = "eDP-1, 2880x1800@120, 0x0, 1";
"monitor" = "eDP-1, 2560x1600@60, 0x0, 1";
};
};
}

View File

@@ -0,0 +1,6 @@
{ pkgs, ... }: {
environment.systemPackages = [
pkgs.brightnessctl
];
}

View File

@@ -0,0 +1,4 @@
{ ... }: {
services.fwupd.enable = true;
}

View File

@@ -0,0 +1,6 @@
{ pkgs, ... }: {
environment.systemPackages = [
pkgs.powertop
];
}

View File

@@ -0,0 +1,3 @@
{ ... }: {
services.power-profiles-daemon.enable = true;
}

View File

@@ -0,0 +1,6 @@
{ ... }: {
services.udev.extraRules = ''
SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0014", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
'';
}

View File

@@ -7,6 +7,7 @@
kernelModules = [ "kvm-intel" ];
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
extraModprobeConfig = '' options bluetooth disable_ertm=1 '';
kernelParams = [ "amdgpu.abmlevel=0" ];
initrd = {
@@ -48,5 +49,7 @@
};
};
hardware.framework.enableKmod = true;
}

View File

@@ -1,4 +1,4 @@
{ ... }: {
networking.hostName = "lappy"; # Define your hostname.
networking.hostName = "nixwork"; # Define your hostname.
}

Submodule private updated: 7d635d0d2f...c91ae3eb5c