Compare commits
5 Commits
standalone
...
master
Author | SHA1 | Date | |
---|---|---|---|
569141d227 | |||
48edbfdc4b | |||
50c62a4d3f | |||
f4b518f806 | |||
7fffa45e4e |
@@ -13,9 +13,9 @@ set $term alacritty
|
|||||||
set $menu wofi --term '$term'
|
set $menu wofi --term '$term'
|
||||||
|
|
||||||
### Output configuration
|
### Output configuration
|
||||||
output DP-3 pos 3840 0 res 1920x1080@59Hz
|
output DP-3 pos 1920 0 res 1920x1080@60Hz
|
||||||
output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
|
output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
|
||||||
output DP-2 pos 1920 0 res 1920x1080@60Hz
|
output DP-2 pos 3840 0 res 1920x1080@60Hz
|
||||||
|
|
||||||
### Wallpaper
|
### Wallpaper
|
||||||
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
||||||
@@ -25,19 +25,19 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
|
|||||||
### Workspace binding
|
### Workspace binding
|
||||||
|
|
||||||
## DP-3 bindings
|
## DP-3 bindings
|
||||||
workspace 1 output DP-2
|
workspace 1 output DP-3
|
||||||
workspace 2 output DP-2
|
workspace 2 output DP-3
|
||||||
workspace 4 output DP-2
|
workspace 4 output DP-3
|
||||||
workspace 5 output DP-2
|
workspace 5 output DP-3
|
||||||
|
|
||||||
## HDMI-A-1 bindings
|
## HDMI-A-1 bindings
|
||||||
workspace 3 output HDMI-A-1
|
workspace 3 output HDMI-A-1
|
||||||
workspace 9 output HDMI-A-1
|
workspace 9 output HDMI-A-1
|
||||||
|
|
||||||
## DP-2 bindings
|
## DP-2 bindings
|
||||||
workspace 6 output DP-3
|
workspace 6 output DP-2
|
||||||
workspace 7 output DP-3
|
workspace 7 output DP-2
|
||||||
workspace 8 output DP-3
|
workspace 8 output DP-2
|
||||||
|
|
||||||
### Colour options
|
### Colour options
|
||||||
set $bg #24283b
|
set $bg #24283b
|
||||||
|
34
flake.lock
generated
34
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757432263,
|
"lastModified": 1759509947,
|
||||||
"narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
|
"narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
|
"rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -64,11 +64,11 @@
|
|||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759330332,
|
"lastModified": 1760808459,
|
||||||
"narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
|
"narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
|
"rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -116,15 +116,15 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748189127,
|
"lastModified": 315532800,
|
||||||
"narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
|
"narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
|
||||||
"rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
|
"rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
|
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
@@ -142,11 +142,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759281824,
|
"lastModified": 1760580664,
|
||||||
"narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
|
"narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
|
"rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -196,11 +196,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748261582,
|
"lastModified": 1760401936,
|
||||||
"narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
|
"narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
|
||||||
"owner": "mitchellh",
|
"owner": "mitchellh",
|
||||||
"repo": "zig-overlay",
|
"repo": "zig-overlay",
|
||||||
"rev": "aafb1b093fb838f7a02613b719e85ec912914221",
|
"rev": "365085b6652259753b598d43b723858184980bbe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(import ../../apps/flatpak.nix {
|
(import ../../apps/flatpak.nix {
|
||||||
inherit lib pkgs flatpakPackages;
|
inherit lib pkgs flatpakPackages userName;
|
||||||
})
|
})
|
||||||
../../apps/gaming.nix
|
../../apps/gaming.nix
|
||||||
../../apps/appimage.nix
|
../../apps/appimage.nix
|
||||||
|
@@ -12,24 +12,24 @@
|
|||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||||
boot.initrd.kernelModules = [];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-label/COMPUTER";
|
device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-label/BOOT";
|
device = "/dev/disk/by-uuid/B72F-087F";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0022" "dmask=0022"];
|
options = ["fmask=0022" "dmask=0022"];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{device = "/dev/disk/by-label/SWAP";}
|
{device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
@@ -1,7 +1,16 @@
|
|||||||
{pkgs, ...}: {
|
{ lib, pkgs, userName, ...}: {
|
||||||
services.shairport-sync = {
|
services.shairport-sync = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
openFirewall = pkgs.stdenv.isLinux;
|
openFirewall = pkgs.stdenv.isLinux;
|
||||||
arguments = "-v -o pw";
|
# arguments = "-v -o pa";
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.shairport-sync = {
|
||||||
|
serviceConfig = {
|
||||||
|
User = lib.mkForce "${userName}";
|
||||||
|
};
|
||||||
|
environment = {
|
||||||
|
XDG_RUNTIME_DIR = "/run/user/1000";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user