merge
This commit is contained in:
commit
f7ffc5cdf9
4 changed files with 30 additions and 22 deletions
30
flake.lock
30
flake.lock
|
@ -20,11 +20,11 @@
|
||||||
"cask-fonts": {
|
"cask-fonts": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713817471,
|
"lastModified": 1714444667,
|
||||||
"narHash": "sha256-ap9Tq5WVukuOHDotvF+p0IQpcy8NsDORp1gQCcWvn4Q=",
|
"narHash": "sha256-eWM0uB/QiptHbIzH+8yzsXFOWRX48yooFWOreSDfv/g=",
|
||||||
"owner": "homebrew",
|
"owner": "homebrew",
|
||||||
"repo": "homebrew-cask-fonts",
|
"repo": "homebrew-cask-fonts",
|
||||||
"rev": "5dbe07c7e101165698b5f60ffb0b72d438410e7e",
|
"rev": "93bac1ec51db32b671b3c1cce12a4b9dfbd95652",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -128,11 +128,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713992342,
|
"lastModified": 1714430505,
|
||||||
"narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=",
|
"narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f072c127c041eec36621b8e38a531fe0fe07961",
|
"rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -144,11 +144,11 @@
|
||||||
"homebrew-cask": {
|
"homebrew-cask": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714023431,
|
"lastModified": 1714451093,
|
||||||
"narHash": "sha256-1Ab0LsCMiaGzgSXpzxW60GKkzQ94o8sasag11dMKnLE=",
|
"narHash": "sha256-eWF+DoscTe1q+V7AK+JyXyI78iPSoKC5YCHNA74e7vI=",
|
||||||
"owner": "homebrew",
|
"owner": "homebrew",
|
||||||
"repo": "homebrew-cask",
|
"repo": "homebrew-cask",
|
||||||
"rev": "8fb90cc5dd29e2003fa7a8be4cb9076da491e462",
|
"rev": "2645f5afac026403bc02596590f2fc56ede4df05",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -160,11 +160,11 @@
|
||||||
"homebrew-core": {
|
"homebrew-core": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714027916,
|
"lastModified": 1714451058,
|
||||||
"narHash": "sha256-fPPf74TVg5rLWYKx7P2dIV9tF9NBJOWtQ7X/spAHUVA=",
|
"narHash": "sha256-2OynGCZFa3HD3LizrcnGVa1voijuI9ZXK/iE3wLK5NM=",
|
||||||
"owner": "homebrew",
|
"owner": "homebrew",
|
||||||
"repo": "homebrew-core",
|
"repo": "homebrew-core",
|
||||||
"rev": "eb13b8fe3930f7e917904087f51f3b5afab8b6de",
|
"rev": "e071ff1388a74e9c978f361b6183c22fcf4c725b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -341,11 +341,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713895582,
|
"lastModified": 1714253743,
|
||||||
"narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
|
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "572af610f6151fd41c212f897c71f7056e3fb518",
|
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# optimize power usage
|
||||||
|
powerManagement.enable = true;
|
||||||
|
|
||||||
# optimize storage
|
# optimize storage
|
||||||
nix.optimise.automatic = true;
|
nix.optimise.automatic = true;
|
||||||
|
|
||||||
|
|
|
@ -8,10 +8,11 @@
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "amdgpu" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "amdgpu" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
boot.kernelParams = [ "video=DP-1:2560x1440@144" "video=HDMI-A-1:1920x1080@75" ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/2191540a-8cf9-400e-b4bc-9dbf71527b07";
|
{ device = "/dev/disk/by-uuid/2191540a-8cf9-400e-b4bc-9dbf71527b07";
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
workspace = [
|
workspace = [
|
||||||
"1, monitor:HDMI-A-3, default:true, persistent:true"
|
"1, monitor:HDMI-A-1, default:true, persistent:true"
|
||||||
"2, monitor:DP-3 , default:true, persistent:true"
|
"2, monitor:DP-1 , default:true, persistent:true"
|
||||||
"special:scratchpad, on-created-empty:foot"
|
"special:scratchpad, on-created-empty:foot"
|
||||||
];
|
];
|
||||||
monitor = [
|
monitor = [
|
||||||
"DP-3 , 2560x1440@144, 1920x0, 1"
|
"DP-1 , 2560x1440@144, 1920x0, 1"
|
||||||
"HDMI-A-5, 1920x1080@75 , 0x0 , 1"
|
"HDMI-A-1, 1920x1080@75 , 0x0 , 1"
|
||||||
];
|
];
|
||||||
input = {
|
input = {
|
||||||
kb_layout = "de";
|
kb_layout = "de";
|
||||||
|
@ -84,10 +84,14 @@
|
||||||
"$mod, 2, workspace, 2"
|
"$mod, 2, workspace, 2"
|
||||||
"$mod, 3, workspace, 3"
|
"$mod, 3, workspace, 3"
|
||||||
"$mod, 4, workspace, 4"
|
"$mod, 4, workspace, 4"
|
||||||
|
"$mod, 5, workspace, 5"
|
||||||
|
"$mod, 6, workspace, 6"
|
||||||
"$modd, 1, movetoworkspacesilent, 1"
|
"$modd, 1, movetoworkspacesilent, 1"
|
||||||
"$modd, 2, movetoworkspacesilent, 2"
|
"$modd, 2, movetoworkspacesilent, 2"
|
||||||
"$modd, 3, movetoworkspacesilent, 3"
|
"$modd, 3, movetoworkspacesilent, 3"
|
||||||
"$modd, 4, movetoworkspacesilent, 4"
|
"$modd, 4, movetoworkspacesilent, 4"
|
||||||
|
"$modd, 5, movetoworkspacesilent, 5"
|
||||||
|
"$modd, 6, movetoworkspacesilent, 6"
|
||||||
|
|
||||||
# fullscreen
|
# fullscreen
|
||||||
"$mod, F11, fullscreen, 0"
|
"$mod, F11, fullscreen, 0"
|
||||||
|
|
Loading…
Reference in a new issue