Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

marmo: add config

Browse source
This commit is contained in:
DashieTM 2024-05-08 16:08:46 +02:00
parent 7040d943cb
commit 45f6ade78c
6 changed files with 99 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
nix/flake.lock generated
View file

@ -124,11 +124,11 @@
]
},
"locked": {
"lastModified": 1714900398,
"narHash": "sha256-H7XYHpjk1G6dkA3AnbYrKtaTFjcCE7ul6nUVlVQxtsA=",
"lastModified": 1715077503,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fdaaf543bad047639ef0b356ea2e6caec2f1215c",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"type": "github"
},
"original": {
@ -176,11 +176,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1714915839,
"narHash": "sha256-HwrMGeMtYD2AXanipPSSzmc8IGZQsFVDotScXYztHNg=",
"lastModified": 1715171420,
"narHash": "sha256-eMkwxLtoVHrIAJlb+xjA0jlFGqEweKwpzqY5uGhc2xA=",
"ref": "refs/heads/main",
"rev": "589f758d947cb4e8b888d2da00076a9fb0a6d521",
"revCount": 4614,
"rev": "36d32973ddc1bd1d4096ec36f3b8cb507009eba4",
"revCount": 4635,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -255,11 +255,11 @@
]
},
"locked": {
"lastModified": 1714755542,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"lastModified": 1715090986,
"narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b",
"type": "github"
},
"original": {
@ -276,11 +276,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1714908696,
"narHash": "sha256-lNzG4jjWmo6zr3ZsurDGOf8PplzuKFYxR65sWZ+CkKY=",
"lastModified": 1715072077,
"narHash": "sha256-5QA9qCtxW6uikNI1+qaWALaf6gRhkHCCoVLthJMviIY=",
"owner": "JakeStanger",
"repo": "ironbar",
"rev": "c08441eff44ede4febc28aafc306f1e9bede52b4",
"rev": "4695279d6927d05b6d3ed5a930e53f04d797c379",
"type": "github"
},
"original": {
@ -386,11 +386,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1714763106,
"narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
"lastModified": 1714906307,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
"owner": "NixOs",
"repo": "nixpkgs",
"rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
"type": "github"
},
"original": {
@ -456,8 +456,8 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1714875369,
"narHash": "sha256-dyyJEHKbnz2sZcz9yVxOCE/085covNljWKeTCIcBfL0=",
"lastModified": 1715134005,
"narHash": "sha256-oujsCgNiQnZoQntNkkNkA7BhCmUvf9FLWj+2oGT2Jvc=",
"type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/master.tar.gz"
},

5
nix/flake.nix
View file

@ -53,13 +53,14 @@
];
in
{
homeConfigurations."marmo" = inputs.home-manager.lib.homeManagerConfiguration {
nixosConfigurations."marmo" = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs pkgs;
mod = ./hardware/overheating/base_config.nix;
mod = ./hardware/marmo/base_config.nix;
};
modules = [
./hardware/marmo/default.nix
./programs/gaming/default.nix
] ++ base_imports;
};
nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem {

13
nix/hardware/marmo/base_config.nix
View file

@ -1 +1,12 @@
{ }
{
imports = [
../../modules
];
wayland.windowManager.hyprland.settings.monitor = [
# default
"DP-1,1920x1080@144,0x0,1"
# all others
",highrr,auto,1"
];
programs.ironbar.monitor = "DP-1";
}

10
nix/hardware/marmo/configuration.nix
View file

@ -1 +1,9 @@
{ }
{ pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages_zen;
boot.kernelParams = [
"amdgpu.ppfeaturemask=0xffffffff"
];
networking.hostName = "marmo";
}

57
nix/hardware/marmo/marmo.nix
View file

@ -1 +1,56 @@
{ }
{ config, lib, modulesPath, ... }:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-label/ROOT";
fsType = "btrfs";
options = [
"noatime"
"nodiratime"
"discard"
];
};
fileSystems."/boot" =
{
device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
options = [ "rw" "fmask=0022" "dmask=0022" "noatime" ];
};
fileSystems."/home" =
{
device = "/dev/disk/by-label/HOME";
fsType = "btrfs";
options = [
"noatime"
"nodiratime"
"discard"
];
};
swapDevices =
[{ device = "/dev/disk/by-label/SWAP"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp15s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.fstrim.enable = lib.mkDefault true;
nix.settings.auto-optimise-store = true;
}

2
nix/programs/hyprland/config.nix
View file

@ -168,7 +168,7 @@
swallow_regex = "^(.*)(kitty)(.*)$";
# conversion seems to be borked right now, i want a smooth bibata :(
enable_hyprcursor = false;
initial_workspace_tracking = 2;
initial_workspace_tracking = 1;
};
gestures = {