Merge remote-tracking branch 'origin/main'

This commit is contained in:
willifan 2024-05-23 18:21:56 +02:00
commit 6a5c76d2ca
7 changed files with 29 additions and 15 deletions

24
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716126753, "lastModified": 1716291492,
"narHash": "sha256-fdodsQ2AWreGj4arHk6cKcnqlWrNiLb64eRrHtMZ5cw=", "narHash": "sha256-Qvfoa99WdYIneGrrLFIKQCevLgB5vnxvwJe5aWbGYZY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "601be8412d2ab72f752448766fe0fb2f00d5c40c", "rev": "f1654e07728008d354c704d265fc710e3f5f42ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1716141623, "lastModified": 1716173274,
"narHash": "sha256-4NEvf7sULDyYoXIgeXHWGe7mXlr7+UL7TvgDkMqpbPY=", "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f0cf56878046c42ec2096a2ade89203e7348917b", "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715961556, "lastModified": 1716137900,
"narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1716218643,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
hosts/Puenktchen/amd.nix Normal file
View file

@ -0,0 +1,4 @@
{ pkgs, ... }:
{
boot.initrd.kernelModules = [ "amdgpu" ];
}

View file

@ -1,6 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./amd.nix
./hardware-configuration.nix ./hardware-configuration.nix
./disko.nix ./disko.nix
]; ];

View file

@ -7,6 +7,7 @@
./printers.nix ./printers.nix
]; ];
hardware.bluetooth.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
console.keyMap = "de"; console.keyMap = "de";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -2,7 +2,7 @@
{ {
home-manager.users.willifan = { home-manager.users.willifan = {
services.kanshi = { services.kanshi = {
enable = true; enable = false;
settings = [ settings = [
{ {
@ -42,6 +42,9 @@
scale = 1.0; scale = 1.0;
transform = "270"; transform = "270";
} }
{
criteria = "*";
}
]; ];
profile.exec = "$XDG_CONFIG_HOME/eww/scripts/monitors.sh"; profile.exec = "$XDG_CONFIG_HOME/eww/scripts/monitors.sh";
} }

View file

@ -13,11 +13,12 @@
monitor = [ monitor = [
", preffered, auto, 1" ", preffered, auto, 1"
"eDP-1, preferred, 0x0, 1.6" "eDP-1, preferred, 0x0, 1.6"
"desc:ViewSonic Corporation VX2705-2KP W6Z205100250, 2560x1440@144Hz, 0x384, 1.25"
"desc:ViewSonic Corporation VX2705-2KP W6Z210400766, 2560x1440@144Hz, 2048x384, 1.25"
"desc:BNQ BenQ BL2283 CAM01567019, 1920x1080@60Hz, 4096x0, 1.0, transform, 3"
]; ];
# Execute your favorite apps at launch # Execute your favorite apps at launch
exec-once = [ exec-once = [
''kanshi &''
''hyprctl dispatch exec "[workspace 1 silent] kitty"'' ''hyprctl dispatch exec "[workspace 1 silent] kitty"''
''hyprctl dispatch exec "[workspace 2 silent] firefox"'' ''hyprctl dispatch exec "[workspace 2 silent] firefox"''
#''hyprctl dispatch exec "[workspace 3 silent] "'' #''hyprctl dispatch exec "[workspace 3 silent] "''

View file

@ -3,4 +3,8 @@
programs.steam.enable = true; programs.steam.enable = true;
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
services.udev.extraRules = ''
SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
'';
} }