BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desktop-2024-09-20-19-56-58

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-09-20 19:56:58 +02:00
parent 8c02b5a943
commit 78d0773148
9 changed files with 66 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configs/browser.nix
View File

@ -2,9 +2,8 @@
{ {
environment.systemPackages = [ environment.systemPackages = [
pkgs.brave pkgs.brave
# pkgs.unstable.chromium pkgs.firefox
pkgs.unstable.firefox pkgs.librewolf
pkgs.unstable.librewolf pkgs.tor-browser-bundle-bin
pkgs.unstable.tor-browser-bundle-bin
]; ];
} }

2
configs/common.nix
View File

@ -58,7 +58,7 @@
networkmanager.dns = "none"; networkmanager.dns = "none";
}; };
environment.systemPackages = with pkgs.unstable; [ environment.systemPackages = with pkgs; [
ack ack
borgbackup borgbackup
borgmatic borgmatic

2
configs/develop.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs.unstable; [ environment.systemPackages = with pkgs; [
insomnia insomnia
meld meld
virt-manager virt-manager

2
configs/games.nix
View File

@ -28,7 +28,7 @@
}; };
}; };
environment.systemPackages = with pkgs.unstable; [ environment.systemPackages = with pkgs; [
# (lutris.override { # (lutris.override {
# extraPkgs = pkgs: [ # extraPkgs = pkgs: [
# pkgs.gamescope # pkgs.gamescope

6
configs/user-gui.nix
View File

@ -49,7 +49,7 @@
# }; # };
}; };
environment.systemPackages = with pkgs.unstable; [ environment.systemPackages = with pkgs; [
czkawka # fslint before czkawka # fslint before
grsync grsync
handbrake handbrake
@ -68,7 +68,7 @@
programs = { programs = {
vscode = { vscode = {
enable = true; enable = true;
package = pkgs.unstable.vscode; package = pkgs.vscode;
}; };
mpv = { mpv = {
@ -82,7 +82,7 @@
kitty = { kitty = {
enable = true; enable = true;
package = pkgs.unstable.kitty; package = pkgs.kitty;
extraConfig = '' extraConfig = ''
enable_audio_bell false enable_audio_bell false

7
configs/user.nix
View File

@ -45,9 +45,8 @@
home-manager.users.alex = { pkgs, ... }: { home-manager.users.alex = { pkgs, ... }: {
home = { home = {
stateVersion = "24.05"; stateVersion = "24.11";
packages = with pkgs.unstable; [ packages = with pkgs; [
# atop
broot broot
ffmpeg ffmpeg
git-secret git-secret
@ -139,7 +138,7 @@
plugins = [ plugins = [
{ {
name = "powerlevel10k"; name = "powerlevel10k";
src = pkgs.unstable.zsh-powerlevel10k; src = pkgs.zsh-powerlevel10k;
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
} }
{ {

39
flake.lock generated
View File

@ -125,16 +125,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725703823, "lastModified": 1726825546,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -186,11 +186,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726489388, "lastModified": 1726724509,
"narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,13 +232,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1726755586,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,22 +248,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"chaotic": "chaotic", "chaotic": "chaotic",
@ -271,7 +255,6 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },

11
flake.nix
View File

@ -2,11 +2,7 @@
description = "Your new nix config"; description = "Your new nix config";
inputs = { inputs = {
# Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
#nixos-hardware
nixos-hardware.url = "github:nixos/nixos-hardware/master"; nixos-hardware.url = "github:nixos/nixos-hardware/master";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
@ -18,7 +14,7 @@
# Home manager # Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -35,7 +31,7 @@
, home-manager , home-manager
, nixos-hardware , nixos-hardware
, nixpkgs , nixpkgs
, nixpkgs-unstable # , nixpkgs-unstable
, sops-nix , sops-nix
, ... , ...
} @ inputs: } @ inputs:
@ -64,6 +60,7 @@
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
modules = [ modules = [
./machine/desktop/configuration.nix ./machine/desktop/configuration.nix
chaotic.nixosModules.default # OUR DEFAULT MODULE
]; ];
}; };

88
machine/desktop/configuration.nix
View File

@ -1,18 +1,13 @@
{ config, pkgs, inputs, outputs, ... }: { config, pkgs, inputs, outputs, ... }:
let let
secrets = import ../../configs/secrets.nix;
be = import ../../configs/borg-exclude.nix; be = import ../../configs/borg-exclude.nix;
wireguard = import ../../configs/wireguard.nix;
in in
{ {
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
(self: super: { (self: super: {
linuxPackages_latest = super.linuxPackages_latest.extend (lpself: lpsuper: { linuxPackages_cachyos = super.linuxPackages_cachyos.extend (lpself: lpsuper: {
xone = super.linuxPackages_latest.xone.overrideAttrs (oldAttrs: rec { xone = super.linuxPackages_cachyos.xone.overrideAttrs (oldAttrs: rec {
version = "0-unstable-latest"; version = "0-unstable-latest";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "tskaar"; owner = "tskaar";
@ -83,8 +78,8 @@ in
efi = { canTouchEfiVariables = true; }; efi = { canTouchEfiVariables = true; };
}; };
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_cachyos;
extraModulePackages = with pkgs.linuxPackages_zen; [ it87 ]; extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ];
kernelModules = [ "it87" ]; kernelModules = [ "it87" ];
kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
}; };
@ -94,7 +89,7 @@ in
description = "AMDGPU Control Daemon"; description = "AMDGPU Control Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "multi-user.target" ]; after = [ "multi-user.target" ];
serviceConfig = { ExecStart = "${pkgs.unstable.lact}/bin/lact daemon"; }; serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; };
}; };
}; };
@ -105,7 +100,7 @@ in
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
environment.systemPackages = with pkgs.unstable; [ environment.systemPackages = with pkgs; [
lact lact
amdgpu_top amdgpu_top
@ -118,6 +113,10 @@ in
gimp gimp
clinfo clinfo
fan2go
unigine-superposition
]; ];
hardware = { hardware = {
@ -126,18 +125,9 @@ in
xone.enable = true; xone.enable = true;
bluetooth.enable = true; bluetooth.enable = true;
opengl = { graphics = {
driSupport = true; enable = true;
driSupport32Bit = true; enable32Bit = true;
# extraPackages = with pkgs; [
# # rocm-opencl-icd
# # rocm-opencl-runtime
# amdvlk
# rocmPackages.clr.icd
# ];
# extraPackages32 = with pkgs; [
# driversi686Linux.amdvlk
# ];
}; };
fancontrol = { fancontrol = {
@ -160,7 +150,7 @@ in
pulseaudio.enable = false; pulseaudio.enable = false;
}; };
sound.enable = true; programs.coolercontrol.enable = true;
services = { services = {
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
@ -177,30 +167,30 @@ in
pulse.enable = true; pulse.enable = true;
}; };
samba = { # samba = {
enable = true; # enable = true;
securityType = "user"; # securityType = "user";
extraConfig = '' # extraConfig = ''
workgroup = WORKGROUP # workgroup = WORKGROUP
server string = server # server string = server
netbios name = server # netbios name = server
security = user # security = user
guest account = nobody # guest account = nobody
map to guest = bad user # map to guest = bad user
logging = systemd # logging = systemd
max log size = 50 # max log size = 50
''; # '';
shares = { # shares = {
storage = { # storage = {
path = "/home/alex/shared/storage"; # path = "/home/alex/shared/storage";
browseable = "yes"; # browseable = "yes";
"read only" = "no"; # "read only" = "no";
"guest ok" = "no"; # "guest ok" = "no";
"create mask" = "0644"; # "create mask" = "0644";
"directory mask" = "0755"; # "directory mask" = "0755";
}; # };
}; # };
}; # };
tailscale.enable = true; tailscale.enable = true;
@ -226,5 +216,5 @@ in
}; };
}; };
system.stateVersion = "24.05"; system.stateVersion = "24.11";
} }