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-10-31 13:14:45 +01:00
parent d506427f01
commit 0bb3b6d884
Signed by: mbeno
SSH Key Fingerprint: SHA256:iAzOA1WUAxocdh/WRWXcSg5nw2dJ1aDCvPuT+3ZjkwI
10 changed files with 137 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
flake.lock Normal file
View File

@ -0,0 +1,73 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1730016908,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"umu": "umu"
}
},
"umu": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1730219667,
"narHash": "sha256-vNvV7p4LTYfPUG46Dt8ubPVJid4l4gEQRqU/ZV/sQR0=",
"ref": "refs/heads/main",
"rev": "10a406962c27a5a7cf05eab4ae19072cfaa4f165",
"revCount": 829,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
},
"original": {
"dir": "packaging/nix",
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
}
}
},
"root": "root",
"version": 7
}

4
flake.nix
View File

@ -8,6 +8,10 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
umu = {
url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
};
# ...

2
hosts/zedd/configuration.nix
View File

@ -15,7 +15,7 @@
kernelPackages = pkgs.linuxPackages_xanmod_latest;
};
boot.kernel.sysctl = {
"vm.max_map_count" = 16777216;
"vm.max_map_count" = 2147483642;
"fs.file-max" = 524288;
};

2
system/fonts.nix
View File

@ -5,7 +5,7 @@
fira-code-symbols
nerdfonts
noto-fonts
noto-fonts-cjk
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-monochrome-emoji
source-sans-pro

9
system/hardware.nix
View File

@ -3,8 +3,8 @@
networking.wireless = {
enable = true;
networks = {
"bennynet" = {
pskRaw = "85e8f17e02f4b4df5ddc9b95d1a4256b3c2608fcc8dfa1860b693d06c2a0bf1f";
"benny" = {
psk = "loloplop";
};
};
};
@ -23,8 +23,6 @@
intel-media-driver
intel-vaapi-driver
libvdpau-va-gl
rocm-opencl-icd
rocm-opencl-runtime
];
extraPackages32 = with pkgs.pkgsi686Linux; [
intel-media-driver
@ -32,14 +30,13 @@
];
};
ckb-next.enable = true;
nvidia = {
modesetting.enable = true;
powerManagement.enable = false;
powerManagement.finegrained = false;
open = true;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
package = config.boot.kernelPackages.nvidiaPackages.production;
};
pulseaudio.enable = false;
};

21
system/programs.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: {
{ config, pkgs, inputs, ... }: {
services.flatpak.enable = true;
programs.steam = {
enable = true;
@ -23,6 +23,23 @@
magicOrExtension = ''\x7fELF....AI\x02'';
};
environment.systemPackages = with pkgs; [
(inputs.umu.packages.${pkgs.system}.umu.override { version = "${inputs.umu.shortRev}"; })
gfxreconstruct
glslang
spirv-cross
spirv-headers
spirv-tools
vulkan-extension-layer
vulkan-headers
vulkan-loader
vulkan-tools
vulkan-tools-lunarg
vulkan-utility-libraries
vulkan-validation-layers
vkdisplayinfo
vkd3d
vkd3d-proton
vk-bootstrap
sipcalc
xdg-utils
pass
@ -33,6 +50,8 @@
xdg-desktop-portal-gtk
google-chrome
zoom-us
# icu
# icu.dev
neovim
git
gnupg

2
user/default.nix
View File

@ -13,7 +13,7 @@
./programs/rofi
./programs/obs-studio
./programs/vscode
./programs/games
# ./programs/games
./scripts
./zsh
./ssh

10
user/packages/default.nix
View File

@ -9,13 +9,9 @@
terminator
openssl
qpwgraph
mixxx
imagemagick
maim
sidequest
opera
direnv
android-studio
libpng
p7zip
lshw
@ -32,7 +28,6 @@
fd
ffmpeg
file
go-task
glib
jq
kitty
@ -55,17 +50,13 @@
ripgrep
sops
spotify
spicetify-cli
sshfs
ventoy
expect
# k8s tools
talosctl
k9s
cilium-cli
kubernetes-helm
cmctl
krew
zenity
protontricks
winetricks
@ -73,7 +64,6 @@
tokei
unzip
yt-dlp
zoom-us
vmware-horizon-client

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

@ -1,33 +1,33 @@
{ pkgs, config, ...}:
{ pkgs, config, ... }:
let
sshotp = pkgs.writeScriptBin "sshotp"
''
#!/usr/bin/env expect
set stty_init -echo
set timeout 300
set totp [lindex $argv 0];
puts "Our TOTP $totp"
spawn ssh -D 20000 dresden.uio.no
expect {
-re {.*(Verification_Code):} {
send -- "$totp\r"
exp_continue
sshotp = pkgs.writeScriptBin "sshotp"
''
#!/usr/bin/env expect
set stty_init -echo
set timeout 300
set totp [lindex $argv 0];
puts "Our TOTP $totp"
spawn ssh -D 20000 dresden.uio.no
expect {
-re {.*(Verification_Code):} {
send -- "$totp\r"
exp_continue
}
-re {.*dresden.*} {
wait
}
}
-re {.*dresden.*} {
wait
}
}
'';
ssh-dresden = pkgs.writeShellApplication {
name = "ssh-dresden";
runtimeInputs = [ pkgs.rbw pkgs.expect ];
text = ''
#!/usr/bin/env bash
totp=$(rbw get -f "TOTP" rlogin)
expect -f ${sshotp}/bin/sshotp "$totp"
'';
'';
ssh-dresden = pkgs.writeShellApplication {
name = "ssh-dresden";
runtimeInputs = [ pkgs.rbw pkgs.expect ];
text = ''
#!/usr/bin/env bash
totp=$(rbw get -f "TOTP" rlogin)
expect -f ${sshotp}/bin/sshotp "$totp"
'';
};
};
in
{
systemd.user.services.ssh-office = {
@ -37,10 +37,8 @@ in
Service = {
Type = "simple";
ExecStart = "${ssh-dresden}/bin/ssh-dresden";
Restart = "always";
};
Install = {
WantedBy = [ "default.target" ];
Restart = "never";
};
};
}

2
user/zsh/default.nix
View File

@ -13,7 +13,7 @@
sudo rm /nix/var/nix/gcroots/auto/*
sudo nix-collect-garbage -d
'';
nrebuild = "nix flake update /home/mbeno/git/nixos && sudo nixos-rebuild switch --recreate-lock-file --flake /home/${user}/git/nixos && nvd diff $(ls -d1v /nix/var/nix/profiles/system-*-link|tail -n 2) && source ~/.zshrc";
nrebuild = "nix flake update /home/mbeno/git/nixos && sudo nixos-rebuild switch --flake /home/mbeno/git/nixos && source ~/.zshrc";
nlog = ''
revpath="/nix/var/nix/profiles";
lastrev=$(ls -d1v $revpath/system-*-link|cut -d "-" -f2 | tail -n1);