Compare commits

...

21 Commits

Author SHA1 Message Date
16921788ea
lol 2024-11-06 16:10:54 +01:00
6450d97ac3
lol 2024-11-04 22:04:08 +01:00
43e9c58f92
lol 2024-11-03 11:18:58 +01:00
9580775856
lol 2024-11-03 11:16:48 +01:00
f9e8130f85
lol 2024-11-03 11:15:59 +01:00
2eb6aaae51
lol 2024-11-03 11:08:44 +01:00
f2e3256cc9
lol 2024-11-03 10:59:38 +01:00
e0ba4f1e6a
lol 2024-11-03 10:53:20 +01:00
f6cd5ed122
lol 2024-11-03 10:33:02 +01:00
fd70a80e76
lol 2024-11-02 12:17:37 +01:00
dc41206a90
lol 2024-11-02 12:15:56 +01:00
22bc149b50
lol 2024-11-02 12:11:30 +01:00
efd5fae542
lol 2024-11-02 12:03:08 +01:00
d4aed313f2
lol 2024-11-02 03:17:38 +01:00
9a367d3443
lol 2024-11-02 03:17:22 +01:00
90b6399204
lol 2024-11-02 02:45:21 +01:00
4bec1ec905
lol 2024-11-01 11:20:23 +01:00
c151876287
lol 2024-11-01 11:17:16 +01:00
27e297cc33
lol 2024-11-01 11:17:05 +01:00
0df0154b29
lol 2024-11-01 11:12:39 +01:00
c4cff38a6e
lol 2024-11-01 02:03:02 +01:00
11 changed files with 121 additions and 83 deletions

View File

@ -7,26 +7,27 @@
]
},
"locked": {
"lastModified": 1730016908,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@ -51,11 +52,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1730219667,
"narHash": "sha256-vNvV7p4LTYfPUG46Dt8ubPVJid4l4gEQRqU/ZV/sQR0=",
"lastModified": 1730836236,
"narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
"ref": "refs/heads/main",
"rev": "10a406962c27a5a7cf05eab4ae19072cfaa4f165",
"revCount": 829,
"rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
"revCount": 833,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

View File

@ -5,7 +5,7 @@
# nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
umu = {

View File

@ -22,22 +22,21 @@
extraPackages = with pkgs; [
# intel-media-driver
# intel-vaapi-driver
libvdpau-va-gl
# libvdpau-va-gl
];
# extraPackages32 = with pkgs.pkgsi686Linux; [
extraPackages32 = with pkgs.pkgsi686Linux; [
# intel-media-driver
# intel-vaapi-driver
#];
];
};
nvidia = {
modesetting.enable = true;
powerManagement.enable = false;
powerManagement.finegrained = false;
open = false;
open = true;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
};
pulseaudio.enable = true;
};
}

View File

@ -1,5 +1,10 @@
{ config, pkgs, inputs, ... }: {
services.flatpak.enable = true;
programs.nix-ld.enable = true;
programs.nix-ld.libraries = [
# put here missing libraries
pkgs.glibc
];
programs.steam = {
enable = true;
@ -38,9 +43,49 @@
vulkan-validation-layers
vkdisplayinfo
vkd3d
bottles
vkd3d-proton
vk-bootstrap
lutris
(lutris.override {
steamSupport = true;
extraLibraries = pkgs: [
liboggz
libgudev
speex
libogg
flac
graphene
libvpx
];
extraPkgs = pkgs: [
libvpx
libogg
liboggz
flac
graphene
gst_all_1.gstreamer
# Common plugins like "filesrc" to combine within e.g. gst-launch
gst_all_1.gst-plugins-base
# Specialized plugins separated by quality
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
# Plugins to reuse ffmpeg to play almost every video format
gst_all_1.gst-libav
# Support the Video Audio (Hardware) Acceleration API
gst_all_1.gst-vaapi
openssl
nghttp2
libidn2
rtmpdump
libpsl
curl
krb5
keyutils
# List library dependencies here
];
})
sipcalc
xdg-utils
pass

View File

@ -1,6 +1,7 @@
{ config, pkgs, ... }: {
security.rtkit.enable = true;
services.fwupd.enable = true;
networking.firewall.enable = false;
programs.dconf.enable = true;
services.gnome.gnome-keyring.enable = true;
@ -10,41 +11,41 @@
'';
security.polkit.enable = true;
services = {
prometheus = {
scrapeConfigs = [
{
job_name = "chrysalis";
static_configs = [{
targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ];
}];
}
];
exporters = {
node = {
enable = true;
enabledCollectors = [ "systemd" "processes" ];
port = 9002;
};
};
enable = true;
port = 9001;
};
grafana = {
enable = true;
settings = {
server = {
# Listening Address
http_addr = "127.0.0.1";
# and Port
http_port = 3000;
# Grafana needs to know on which domain and URL it's running
serve_from_sub_path = true;
};
};
};
# prometheus = {
# scrapeConfigs = [
# {
# job_name = "chrysalis";
# static_configs = [{
# targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ];
# }];
# }
# ];
#
# exporters = {
# node = {
# enable = true;
# enabledCollectors = [ "systemd" "processes" ];
# port = 9002;
# };
# };
#
# enable = true;
# port = 9001;
# };
#
# grafana = {
# enable = true;
# settings = {
# server = {
# # Listening Address
# http_addr = "127.0.0.1";
# # and Port
# http_port = 3000;
# # Grafana needs to know on which domain and URL it's running
# serve_from_sub_path = true;
# };
# };
# };
displayManager =
{
defaultSession = "none+i3";
@ -107,12 +108,12 @@
};
};
};
# services.pipewire = {
# enable = true;
# alsa.enable = true;
# alsa.support32Bit = true;
# pulse.enable = true;
#};
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
services.pcscd.enable = true;
services.dbus.packages = [ pkgs.gcr ];
services.openssh = {

View File

@ -38,6 +38,13 @@
stateVersion = "23.11";
};
programs.home-manager.enable = true;
programs.direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv.enable = true;
};
programs.firefox.enable = true;
};
};
}

View File

@ -4,7 +4,6 @@
age
discord
jellyfin-media-player
firefox-bin
pdfpc
terminator
openssl
@ -17,6 +16,7 @@
lshw
powershell
vlc
mosh
expat
xdeltaUnstable
transmission_4-gtk
@ -42,8 +42,6 @@
mpv
pamixer
pinentry
pulseaudio
pulsemixer
rbw
restic
ripgrep

View File

@ -1,6 +0,0 @@
{ pkgs, config, lib, inputs, user, ... }: {
options.firefox.enable = lib.mkEnableOption "Firefox";
config =
lib.mkIf config.firefox.enable { programs.firefox = { enable = true; }; };
}

View File

@ -16,8 +16,6 @@ lsp_zero.format_on_save({
servers = {
['gopls'] = { 'go' },
['nil_ls'] = { 'nix' },
['lua_ls'] = { 'lua' },
['tsserver'] = { 'typescript', 'javascript' },
},
})
-- LSP: go
@ -110,16 +108,6 @@ lspconfig.lua_ls.setup({
})
-- LSP: ts/js
lspconfig.tsserver.setup({
init_options = {
plugins = {
},
},
filetypes = {
"typescript",
"javascript",
},
})
-- Telescope

View File

@ -2,6 +2,7 @@
programs.vscode = {
enable = true;
enableUpdateCheck = true;
package = pkgs.vscode.fhs;
enableExtensionUpdateCheck = true;
mutableExtensionsDir = true;
extensions = with pkgs.vscode-extensions; [

View File

@ -13,7 +13,9 @@
sudo rm /nix/var/nix/gcroots/auto/*
sudo nix-collect-garbage -d
'';
nrebuild = "git -C /home/mbeno/git/nixos add --all && git -C /home/mbeno/git/nixos commit -m'lol' && nix flake update --flake /home/mbeno/git/nixos && sudo nixos-rebuild switch --flake /home/mbeno/git/nixos && source ~/.zshrc";
nreb = "nix flake update --flake /home/mbeno/git/nixos && sudo nixos-rebuild switch --flake /home/mbeno/git/nixos && source ~/.zshrc";
nbo = "nix flake update --flake /home/mbeno/git/nixos && sudo nixos-rebuild boot --flake /home/mbeno/git/nixos && reboot";
ncom = "git -C /home/mbeno/git/nixos add --all && git -C /home/mbeno/git/nixos commit -m'lol'";
nlog = ''
revpath="/nix/var/nix/profiles";
lastrev=$(ls -d1v $revpath/system-*-link|cut -d "-" -f2 | tail -n1);
@ -55,7 +57,9 @@
}
];
};
history.size = 1000000;
history.size = 100000000;
history.path = "${config.xdg.dataHome}/zsh/history";
history.share = true;
historySubstringSearch.enable = true;
};
}