Compare commits

..
3 Commits
Author SHA1 Message Date
chris dc6ba6a82d Update files 2026-08-21 23:26:28 +01:00
chris 152a3c192e Update 2026-08-17 21:08:56 +01:00
chris bf35d77d66 Downgrade nextcloud 2026-08-17 21:02:43 +01:00
6 changed files with 60 additions and 17 deletions
Generated
+17
View File
@@ -302,6 +302,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1786943417,
"narHash": "sha256-b4qgjdFtlz5TAZ1Hi7DFJeqX3sjaDUnrwr9OO+O1rM0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0dd31db7e6dbf9ce05697c4545f6fe01accec994",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1764242076,
@@ -423,6 +439,7 @@
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable",
"psysonic": "psysonic", "psysonic": "psysonic",
"try-cli": "try-cli", "try-cli": "try-cli",
"voxtype": "voxtype", "voxtype": "voxtype",
+9
View File
@@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";
disko.url = "github:nix-community/disko/latest"; disko.url = "github:nix-community/disko/latest";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
@@ -45,6 +46,7 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
nixpkgs-stable,
nix-gaming, nix-gaming,
impermanence, impermanence,
disko, disko,
@@ -59,6 +61,10 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-stable = import nixpkgs-stable {
inherit system;
config.allowUnfree = true;
};
nix-gaming = inputs.nix-gaming.packages.${system}; nix-gaming = inputs.nix-gaming.packages.${system};
mkHost = hostname: nixpkgs.lib.nixosSystem { mkHost = hostname: nixpkgs.lib.nixosSystem {
@@ -74,6 +80,7 @@
users.chris = import ./home; users.chris = import ./home;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-stable;
inherit impermanence; inherit impermanence;
inherit hostname; inherit hostname;
}; };
@@ -82,6 +89,7 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-stable;
inherit impermanence; inherit impermanence;
inherit disko; inherit disko;
inherit hostname; inherit hostname;
@@ -100,6 +108,7 @@
inherit pkgs; inherit pkgs;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs-stable;
inherit impermanence; inherit impermanence;
}; };
modules = [ modules = [
+14 -14
View File
@@ -5,18 +5,18 @@
./nas-mounts.nix ./nas-mounts.nix
]; ];
# fileSystems = { fileSystems = {
# "/home/chris/Games" = { "/home/chris/Games" = {
# device = "/dev/disk/by-label/Games"; device = "/dev/disk/by-label/Games";
# fsType = "ext4"; fsType = "ext4";
# options = [ options = [
# "defaults" "defaults"
# "x-systemd.mount-timeout=5" "x-systemd.mount-timeout=5"
# "user" "user"
# "exec" "exec"
# "x-systemd.automount" "x-systemd.automount"
# "noauto" "noauto"
# ]; ];
# }; };
# }; };
} }
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, inputs, nix-direnv, ... }: { pkgs, pkgs-stable, inputs, nix-direnv, ... }:
let let
# krita-appimage = pkgs.callPackage ../packages/krita.nix { }; # krita-appimage = pkgs.callPackage ../packages/krita.nix { };
@@ -43,7 +43,7 @@ in
atlauncher # Minecraft launcher atlauncher # Minecraft launcher
mpv # Video player mpv # Video player
nautilus # Document viewer nautilus # Document viewer
nextcloud-client # Nextcloud sync client pkgs-stable.nextcloud-client # Nextcloud sync client
obsidian # Notes software obsidian # Notes software
inputs.psysonic.packages.${pkgs.system}.default # Music player inputs.psysonic.packages.${pkgs.system}.default # Music player
signal-desktop # Messaging signal-desktop # Messaging
-1
View File
@@ -57,7 +57,6 @@ in
"splash" "splash"
"video=DP-1:3840x2160@60" "video=DP-1:3840x2160@60"
"video=DP-2:3840x2160@60" "video=DP-2:3840x2160@60"
"amdgpu.pcie_gen_cap=0x40000"
]; ];
resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root"; resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root";
kernel.sysctl = { kernel.sysctl = {
+18
View File
@@ -7,5 +7,23 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
wireplumber.extraConfig."99-default-audio" = {
"monitor.alsa.rules" = [
{
matches = [
{
"node.name" = "alsa_output.usb-ACTIONS_Pebble_V3-00.analog-stereo";
}
];
actions = {
update-props = {
"priority.driver" = 2000;
"priority.sessions" = 2000;
}
}
}
]
}
}; };
} }