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

lol

Browse Source
This commit is contained in:
Martin Benonisen 2024-12-04 16:27:03 +01:00
parent 977e20f19f
commit 87bb70fbcd
Signed by: mbeno
SSH Key Fingerprint: SHA256:iAzOA1WUAxocdh/WRWXcSg5nw2dJ1aDCvPuT+3ZjkwI
28 changed files with 299 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -14,16 +14,16 @@
}; };
# ... # ...
# Optional - updates underlying without waiting for nix-citizen to update # Optional - updates underlying without waiting for nix-citizen to update
}; };
outputs = outputs =
{ self {
, nixpkgs self,
, home-manager nixpkgs,
, ... home-manager,
...
}@inputs: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
@ -32,7 +32,6 @@
{ {
nixosConfigurations = { nixosConfigurations = {
zedd = nixpkgs.lib.nixosSystem { zedd = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs self user; }; specialArgs = { inherit inputs self user; };

46
hosts/zedd/configuration.nix
View File

@ -1,4 +1,9 @@
{ config, pkgs,lib, ... }: {
config,
pkgs,
lib,
...
}:
{ {
# Enable OpenGL # Enable OpenGL
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
@ -23,12 +28,10 @@
"vm.max_map_count" = 2147483642; "vm.max_map_count" = 2147483642;
"fs.file-max" = 524288; "fs.file-max" = 524288;
}; };
networking.extraHosts = networking.extraHosts = ''
'' 127.0.0.1 zedd zedd.local
127.0.0.1 zedd zedd.local
''; '';
networking.hostName = "zedd"; # Define your hostname. networking.hostName = "zedd"; # Define your hostname.
time.timeZone = "Europe/Oslo"; time.timeZone = "Europe/Oslo";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@ -46,27 +49,32 @@
device = "/dev/data/data"; device = "/dev/data/data";
fsType = "ext4"; fsType = "ext4";
}; };
xdg.portal = xdg.portal = {
{ enable = true;
enable = true; xdgOpenUsePortal = true;
xdgOpenUsePortal = true; config = {
config = { common = {
common = { default = [
default = [ "*"
"*" ];
];
};
}; };
extraPortals = (with pkgs; [ };
extraPortals = (
with pkgs;
[
# unstable.xdg-desktop-portal-hyprland # unstable.xdg-desktop-portal-hyprland
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
]); ]
);
}; };
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.liveRestore = false; virtualisation.docker.liveRestore = false;
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?

8
hosts/zedd/default.nix
View File

@ -1,4 +1,10 @@
{ inputs, self, pks, ... }: { {
inputs,
self,
pks,
...
}:
{
imports = [ imports = [
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

44
hosts/zedd/hardware-configuration.nix
View File

@ -1,31 +1,41 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/installer/scan/not-detected.nix") ];
];
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"vmd"
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/d05743bb-9448-483b-8002-caa0da402820";
device = "/dev/disk/by-uuid/d05743bb-9448-483b-8002-caa0da402820"; fsType = "ext4";
fsType = "ext4"; };
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/4B24-7005";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/4B24-7005";
fsType = "vfat";
};
# 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
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

11
system/default.nix
View File

@ -1 +1,10 @@
{ imports = [ ./users.nix ./services ./hardware.nix ./fonts.nix ./security.nix ./programs.nix ]; } {
imports = [
./users.nix
./services
./hardware.nix
./fonts.nix
./security.nix
./programs.nix
];
}

3
system/fonts.nix
View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
environment.systemPackages = with pkgs; [ twemoji-color-font ]; environment.systemPackages = with pkgs; [ twemoji-color-font ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
fira-code fira-code

45
system/hardware.nix
View File

@ -1,36 +1,33 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; }; environment.sessionVariables = {
LIBVA_DRIVER_NAME = "nvidia";
};
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
}; };
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
cpu.intel.updateMicrocode = true; cpu.intel.updateMicrocode = true;
pulseaudio = { graphics = {
enable =true; enable = true;
support32Bit = true; enable32Bit = true;
}; extraPackages = with pkgs; [
graphics = vaapiVdpau
{ mangohud
enable = true; nvidia-vaapi-driver
enable32Bit = true; intel-media-driver
extraPackages = with pkgs; [ intel-vaapi-driver
vaapiVdpau libvdpau-va-gl
mangohud ];
nvidia-vaapi-driver extraPackages32 = with pkgs.pkgsi686Linux; [
intel-media-driver mangohud
intel-vaapi-driver intel-media-driver
libvdpau-va-gl intel-vaapi-driver
]; ];
extraPackages32 = with pkgs.pkgsi686Linux; [
mangohud
intel-media-driver
intel-vaapi-driver
];
}; };
nvidia = { nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = false;

8
system/nix-alien.nix
View File

@ -1,10 +1,8 @@
{ ... }: { ... }:
let let
nix-alien-pkgs = import nix-alien-pkgs =
( import (builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master")
builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master" { };
)
{ };
in in
{ {
environment.systemPackages = with nix-alien-pkgs; [ environment.systemPackages = with nix-alien-pkgs; [

17
system/programs.nix
View File

@ -1,4 +1,10 @@
{ config, pkgs, inputs, ... }: { {
config,
pkgs,
inputs,
...
}:
{
services.flatpak.enable = true; services.flatpak.enable = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = [ programs.nix-ld.libraries = [
@ -7,20 +13,19 @@
]; ];
programs.steam = { programs.steam = {
enable = true; enable = true;
extraPackages = [ extraPackages = [
pkgs.mangohud pkgs.mangohud
]; ];
package = pkgs.steam.override { package = pkgs.steam.override {
extraLibraries = pkgs: [ extraLibraries = pkgs: [
pkgs.mangohud pkgs.mangohud
]; ];
extraEnv = { extraEnv = {
MANGOHUD=true; MANGOHUD = true;
}; };
}; };
}; };
programs.thunar.enable = true; programs.thunar.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {

3
system/security.nix
View File

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
# Enable sudo # Enable sudo
security.sudo = { security.sudo = {
enable = true; enable = true;

20
system/services/audio.nix
View File

@ -1,12 +1,12 @@
{ config, pkgs, ... }:
{ config, pkgs, ... }: { {
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
}; };
} }

12
system/services/default.nix
View File

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
services.fwupd.enable = true; services.fwupd.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
@ -15,10 +16,9 @@
enable = true; enable = true;
settings.PasswordAuthentication = true; settings.PasswordAuthentication = true;
}; };
imports = imports = [
[ ./networking.nix ./networking.nix
./audio.nix ./audio.nix
./xserver.nix ./xserver.nix
./vscode.nix
]; ];
} }

30
system/services/networking.nix
View File

@ -1,19 +1,19 @@
{ config, pkgs, ... }:
{ config, pkgs, ... }: { {
networking = { networking = {
wireless = { wireless = {
enable = false; enable = false;
networks = { networks = {
# "bennynet" = { # "bennynet" = {
# pskRaw = "85e8f17e02f4b4df5ddc9b95d1a4256b3c2608fcc8dfa1860b693d06c2a0bf1f"; # pskRaw = "85e8f17e02f4b4df5ddc9b95d1a4256b3c2608fcc8dfa1860b693d06c2a0bf1f";
# }; # };
};
};
firewall = {
enable = true;
allowedTCPPorts = [ 22 ];
extraCommands = "iptables -A INPUT -s 192.168.0.0/16 -j ACCEPT";
}; };
}; };
firewall = {
enable = true;
allowedTCPPorts = [ 22 ];
extraCommands = "iptables -A INPUT -s 192.168.0.0/16 -j ACCEPT";
};
};
} }

26
system/services/xserver.nix
View File

@ -1,13 +1,12 @@
{ config, pkgs, ... }:
{ config, pkgs, ... }: { {
services = { services = {
displayManager = displayManager = {
{ defaultSession = "none+i3";
defaultSession = "none+i3"; autoLogin.enable = true;
autoLogin.enable = true; autoLogin.user = "mbeno";
autoLogin.user = "mbeno";
}; };
logind.extraConfig = "IdleAction=ignore"; logind.extraConfig = "IdleAction=ignore";
xserver = { xserver = {
exportConfiguration = true; exportConfiguration = true;
@ -44,18 +43,17 @@
"; ";
} }
]; ];
screenSection = screenSection = ''
'' Option "metamodes" "DP-2: 2560x1440_144 +0+0, DP-0: 1920x1080_144 +2560+0"
Option "metamodes" "DP-2: 2560x1440_144 +0+0, DP-0: 1920x1080_144 +2560+0" '';
'';
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
dmenu #application launcher most people use dmenu # application launcher most people use
i3status # gives you the default i3 status bar i3status # gives you the default i3 status bar
i3lock i3lock
# i3lock #default i3 screen locker # i3lock #default i3 screen locker
i3blocks #if you are planning on using i3blocks over i3status i3blocks # if you are planning on using i3blocks over i3status
polybar polybar
rofi rofi
nitrogen nitrogen

10
system/users.nix
View File

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
programs.zsh.enable = true; programs.zsh.enable = true;
environment.shells = with pkgs; [ zsh ]; environment.shells = with pkgs; [ zsh ];
@ -6,7 +7,12 @@
shell = pkgs.zsh; shell = pkgs.zsh;
isNormalUser = true; isNormalUser = true;
description = "Martin"; description = "Martin";
extraGroups = [ "networkmanager" "wheel" "docker" "audio" ]; extraGroups = [
"networkmanager"
"wheel"
"docker"
"audio"
];
packages = with pkgs; [ packages = with pkgs; [
alacritty alacritty
mumble mumble

90
user/default.nix
View File

@ -1,50 +1,58 @@
{ pkgs, inputs, user, ... }: { {
pkgs,
inputs,
user,
...
}:
{
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
extraSpecialArgs = { inherit pkgs inputs user; }; extraSpecialArgs = { inherit pkgs inputs user; };
users.${user} = { pkgs, ... }: { users.${user} =
imports = [ { pkgs, ... }:
./programs/neovim {
# ./programs/firefox imports = [
./programs/tmux ./programs/neovim
./programs/dunst # ./programs/firefox
./programs/rofi ./programs/tmux
./programs/obs-studio ./programs/dunst
./programs/vscode ./programs/rofi
# ./programs/games ./programs/obs-studio
./scripts ./programs/vscode
./zsh # ./programs/games
./ssh ./scripts
./services/ssh-office.nix ./zsh
./packages ./ssh
]; ./services/ssh-office.nix
tmux.enable = true; ./packages
# firefox.enable = true; ];
xdg.enable = true; tmux.enable = true;
services.picom = { # firefox.enable = true;
enable = true; xdg.enable = true;
settings = { services.picom = {
unredir-if-possible = false; enable = true;
backend = "xrender"; # try "glx" if xrender doesn't help settings = {
vsync = true; unredir-if-possible = false;
backend = "xrender"; # try "glx" if xrender doesn't help
vsync = true;
};
}; };
}; services.gnome-keyring.enable = true;
services.gnome-keyring.enable = true; home = {
home = { username = "${user}";
username = "${user}"; homeDirectory = "/home/${user}";
homeDirectory = "/home/${user}"; stateVersion = "23.11";
stateVersion = "23.11"; };
}; programs.home-manager.enable = true;
programs.home-manager.enable = true; programs.direnv = {
programs.direnv = { enable = true;
enable = true; enableZshIntegration = true;
enableZshIntegration = true; nix-direnv.enable = true;
nix-direnv.enable = true; };
}; programs.firefox.enable = true;
programs.firefox.enable = true;
}; };
}; };
} }

5
user/packages/default.nix
View File

@ -1,4 +1,5 @@
{ pkgs, inputs, ... }: { { pkgs, inputs, ... }:
{
home.packages = with pkgs; [ home.packages = with pkgs; [
# Generic tools # Generic tools
age age
@ -76,6 +77,7 @@
nodejs nodejs
nodePackages.pnpm nodePackages.pnpm
typescript typescript
nixfmt-rfc-style
# Py stuff # Py stuff
(python312.withPackages ( (python312.withPackages (
@ -98,6 +100,5 @@
gcc gcc
gnumake gnumake
]; ];
} }

13
user/programs/dunst/default.nix
View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
services.dunst = { services.dunst = {
@ -36,7 +41,7 @@
corner_radius = 10; corner_radius = 10;
# follow = "mouse"; # follow = "mouse";
font = "Source Sans Pro 10"; font = "Source Sans Pro 10";
format = "<b>%s</b>\\n%b"; #format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b" format = "<b>%s</b>\\n%b"; # format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b"
frame_color = "#232323"; frame_color = "#232323";
frame_width = 1; frame_width = 1;
offset = "15x15"; offset = "15x15";
@ -57,7 +62,9 @@
browser = "/usr/bin/env firefox -new-tab"; browser = "/usr/bin/env firefox -new-tab";
}; };
fullscreen_delay_everything = { fullscreen = "delay"; }; fullscreen_delay_everything = {
fullscreen = "delay";
};
urgency_critical = { urgency_critical = {
background = "#d64e4e"; background = "#d64e4e";

10
user/programs/games/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs {
, inputs pkgs,
, ... inputs,
...
}: }:
# games # games
{ } {
}

3
user/programs/neovim/default.nix
View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs = { programs = {
neovim = { neovim = {
enable = true; enable = true;

4
user/programs/rofi/default.nix
View File

@ -1,4 +1,5 @@
{ config, pkgs, ... }: { { config, pkgs, ... }:
{
xdg.configFile."rofi/config.rasi".text = '' xdg.configFile."rofi/config.rasi".text = ''
/*Dracula theme based on the Purple official rofi theme*/ /*Dracula theme based on the Purple official rofi theme*/
@ -138,4 +139,3 @@
@theme "${pkgs.rofi-unwrapped}/share/rofi/themes/android_notification.rasi" @theme "${pkgs.rofi-unwrapped}/share/rofi/themes/android_notification.rasi"
''; '';
} }

13
user/programs/tmux/default.nix
View File

@ -1,7 +1,14 @@
{ pkgs, lib, config, ... }: {
pkgs,
lib,
config,
...
}:
with lib; with lib;
let cfg = config.tmux.enable; let
in { cfg = config.tmux.enable;
in
{
options.tmux.enable = mkEnableOption "tmux"; options.tmux.enable = mkEnableOption "tmux";
config = mkIf cfg { config = mkIf cfg {
programs.tmux = { programs.tmux = {

4
user/programs/vscode/default.nix
View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.vscode = { programs.vscode = {
enable = true; enable = true;
enableUpdateCheck = true; enableUpdateCheck = true;
@ -17,6 +18,7 @@
ms-python.python ms-python.python
]; ];
userSettings = { userSettings = {
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";
"editor.formatOnSave" = true; "editor.formatOnSave" = true;

3
user/scripts/default.nix
View File

@ -1,4 +1,5 @@
{ pkgs, config, ... }: { { pkgs, config, ... }:
{
home.file.".local/bin/rofi-launcher" = { home.file.".local/bin/rofi-launcher" = {
source = ./rofi-launcher.sh; source = ./rofi-launcher.sh;
executable = true; executable = true;

39
user/services/ssh-office.nix
View File

@ -1,26 +1,28 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
let let
sshotp = pkgs.writeScriptBin "sshotp" sshotp = pkgs.writeScriptBin "sshotp" ''
'' #!/usr/bin/env expect
#!/usr/bin/env expect set stty_init -echo
set stty_init -echo set timeout 300
set timeout 300 set totp [lindex $argv 0];
set totp [lindex $argv 0]; puts "Our TOTP $totp"
puts "Our TOTP $totp" spawn ssh -D 20000 dresden.uio.no
spawn ssh -D 20000 dresden.uio.no expect {
expect { -re {.*(Verification_Code):} {
-re {.*(Verification_Code):} { send -- "$totp\r"
send -- "$totp\r" exp_continue
exp_continue
}
-re {.*dresden.*} {
wait
}
} }
''; -re {.*dresden.*} {
wait
}
}
'';
ssh-dresden = pkgs.writeShellApplication { ssh-dresden = pkgs.writeShellApplication {
name = "ssh-dresden"; name = "ssh-dresden";
runtimeInputs = [ pkgs.rbw pkgs.expect ]; runtimeInputs = [
pkgs.rbw
pkgs.expect
];
text = '' text = ''
#!/usr/bin/env bash #!/usr/bin/env bash
totp=$(rbw get -f "TOTP" rlogin) totp=$(rbw get -f "TOTP" rlogin)
@ -41,4 +43,3 @@ in
}; };
}; };
} }

3
user/sops/default.nix
View File

@ -1,4 +1,5 @@
{ user, ... }: { { user, ... }:
{
sops = { sops = {
age.keyFile = "/home/${user}/.config/sops/age/keys.txt"; age.keyFile = "/home/${user}/.config/sops/age/keys.txt";
defaultSopsFile = ../../secrets/${user}/secret.yaml; defaultSopsFile = ../../secrets/${user}/secret.yaml;

3
user/ssh/zedd.nix
View File

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.ssh = { programs.ssh = {
enable = true; enable = true;
controlMaster = "auto"; controlMaster = "auto";

21
user/zsh/default.nix
View File

@ -1,4 +1,10 @@
{ user, pkgs, config, ... }: { {
user,
pkgs,
config,
...
}:
{
home.packages = with pkgs; [ fd ]; home.packages = with pkgs; [ fd ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -53,12 +59,17 @@
zplug = { zplug = {
enable = true; enable = true;
plugins = [ plugins = [
{ name = "plugins/git"; tags = [ "from:oh-my-zsh" ]; } {
{ name = "modules/prompt"; tags = [ "from:prezto" ]; } name = "plugins/git";
tags = [ "from:oh-my-zsh" ];
}
{
name = "modules/prompt";
tags = [ "from:prezto" ];
}
{ name = "zsh-users/zsh-autosuggestions"; } { name = "zsh-users/zsh-autosuggestions"; }
{ {
name = name = "zsh-users/zsh-history-substring-search";
"zsh-users/zsh-history-substring-search";
} }
]; ];
}; };