max/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use unstable nixos

Browse Source
This commit is contained in:
Max Känner 2024-11-25 22:27:37 +01:00
parent aa819813ee
commit da10edad83
8 changed files with 52 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
flake.lock generated
View File

@ -7,30 +7,31 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725703823, "lastModified": 1732482255,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"musnix": { "musnix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1726204062, "lastModified": 1732139495,
"narHash": "sha256-1pzXZEASHnLvVvoowLn/u2ly6CakO6B7kBEC0+DCB+A=", "narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "7ba77e736ad74b8c942beb5382ff7d0248f68e0b", "rev": "996b38613a282299c852eca204a10914c6b0074d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,74 +42,40 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1732014248,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1725762081,
"narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"musnix": "musnix", "musnix": "musnix",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"unstable": "unstable"
} }
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1726218807, "lastModified": 1732186149,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,22 +83,6 @@
"repo": "sops-nix", "repo": "sops-nix",
"type": "github" "type": "github"
} }
},
"unstable": {
"locked": {
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

19
flake.nix
View File

@ -2,12 +2,10 @@
description = "Nixos config flake"; description = "Nixos config flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -16,26 +14,21 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
musnix = {url = "github:musnix/musnix";}; musnix = {
url = "github:musnix/musnix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
self,
nixpkgs, nixpkgs,
home-manager, home-manager,
sops-nix, sops-nix,
... ...
} @ inputs: let } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
unstable = final: prev: {
unstable = import inputs.unstable {
system = final.system;
config = final.config;
};
};
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [unstable];
config.allowUnfree = true; config.allowUnfree = true;
}; };
in { in {

15
hosts/MaxNixosLaptop/configuration.nix
View File

@ -24,7 +24,10 @@
networking.hostName = "MaxNixosLaptop"; # Define your hostname. networking.hostName = "MaxNixosLaptop"; # Define your hostname.
# NIXOS # NIXOS
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings = {
experimental-features = ["nix-command" "flakes"];
substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org"];
};
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.max = { users.users.max = {
@ -47,16 +50,16 @@
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bambu-studio bambu-studio
unstable.neovim neovim
wget wget
fprintd fprintd
qemu qemu
quickemu quickemu
home-manager home-manager
(let (let
base = pkgs.appimageTools.defaultFhsEnvArgs; base = appimageTools.defaultFhsEnvArgs;
in in
pkgs.buildFHSUserEnv (base buildFHSUserEnv (base
// { // {
name = "fhs"; name = "fhs";
targetPkgs = pkgs: ( targetPkgs = pkgs: (
@ -92,7 +95,7 @@
# }; # };
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = [
]; ];
programs.zsh.enable = true; programs.zsh.enable = true;
@ -116,7 +119,7 @@
ovmf = { ovmf = {
enable = true; enable = true;
packages = [ packages = [
(pkgs.unstable.OVMF.override { (pkgs.OVMF.override {
secureBoot = true; secureBoot = true;
tpmSupport = true; tpmSupport = true;
}) })

8
modules/home/programs/default.nix
View File

@ -26,8 +26,8 @@ in {
xournalpp xournalpp
prismlauncher prismlauncher
steam steam
unstable.blender blender
unstable.betaflight-configurator betaflight-configurator
loudgain loudgain
yt-dlp yt-dlp
dconf dconf
@ -37,14 +37,14 @@ in {
pwvucontrol pwvucontrol
qpwgraph qpwgraph
discord discord
libreoffice-fresh # libreoffice-fresh
mate.caja mate.caja
libsForQt5.okular libsForQt5.okular
mpv mpv
gimp gimp
freecad freecad
wine wine
gyroflow # gyroflow
prusa-slicer prusa-slicer
kicad kicad
element-desktop element-desktop

6
modules/home/programs/nextcloud.nix
View File

@ -1,7 +1,6 @@
{ {
lib, lib,
config, config,
pkgs,
... ...
}: let }: let
cfg = config.myConfig.programs.nextcloud; cfg = config.myConfig.programs.nextcloud;
@ -11,9 +10,6 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.nextcloud-client = { services.nextcloud-client.enable = true;
enable = true;
package = pkgs.unstable.nextcloud-client;
};
}; };
} }

5
modules/nixos/gpu/amd.nix
View File

@ -18,8 +18,9 @@ in {
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; ];
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
rocmPackages.clr.icd rocmPackages.clr.icd
amdvlk amdvlk
@ -27,8 +28,6 @@ in {
extraPackages32 = with pkgs; [ extraPackages32 = with pkgs; [
driversi686Linux.amdvlk driversi686Linux.amdvlk
]; ];
driSupport = true;
driSupport32Bit = true;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

8
modules/nixos/greetd.nix
View File

@ -26,10 +26,10 @@ in {
}; };
GTK = { GTK = {
application_prefer_dark_theme = true; application_prefer_dark_theme = true;
cursor_theme_name = "capitaine-cursors-white"; cursor_theme_name = lib.mkForce "capitaine-cursors-white";
font_name = "FiraCode Nerd Font 20"; font_name = lib.mkForce "FiraCode Nerd Font 20";
icon_theme_name = "WhiteSur-dark"; icon_theme_name = lib.mkForce "WhiteSur-dark";
theme_name = "WhiteSur-Dark"; theme_name = lib.mkForce "WhiteSur-Dark";
}; };
commands = { commands = {
reboot = ["systemctl" "reboot"]; reboot = ["systemctl" "reboot"];

13
modules/nixos/music.nix
View File

@ -11,15 +11,14 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
musnix = { # musnix = {
enable = true; # enable = true;
rtcqs.enable = true; # rtcqs.enable = true;
kernel.realtime = true; # kernel.realtime = true;
kernel.packages = pkgs.linuxPackages-rt_latest; # kernel.packages = pkgs.linuxPackages-rt_latest;
}; # };
users.users.max.extraGroups = ["audio"]; users.users.max.extraGroups = ["audio"];
sound.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;