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

Compare commits

base: mbeno:16921788ea60195c2e538ed72276f297705ea845
Branches Tags
mbeno:master
..
compare: mbeno:258fa7d80be4cf7e282a44da9ae68e3a6a9f49d0
Branches Tags
mbeno:master

No commits in common. "16921788ea60195c2e538ed72276f297705ea845" and "258fa7d80be4cf7e282a44da9ae68e3a6a9f49d0" have entirely different histories.
16921788ea ... 258fa7d80b

11 changed files with 83 additions and 121 deletions
Show Stats Expand all files Collapse all files

21
flake.lock
View File

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

2
flake.nix
View File

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

9
system/hardware.nix
View File

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

47
system/programs.nix
View File

@ -1,10 +1,5 @@
{ config, pkgs, inputs, ... }: { { config, pkgs, inputs, ... }: {
services.flatpak.enable = true; services.flatpak.enable = true;
programs.nix-ld.enable = true;
programs.nix-ld.libraries = [
# put here missing libraries
pkgs.glibc
];
programs.steam = { programs.steam = {
enable = true; enable = true;
@ -43,49 +38,9 @@
vulkan-validation-layers vulkan-validation-layers
vkdisplayinfo vkdisplayinfo
vkd3d vkd3d
bottles
vkd3d-proton vkd3d-proton
vk-bootstrap vk-bootstrap
(lutris.override { lutris
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 sipcalc
xdg-utils xdg-utils
pass pass

83
system/services.nix
View File

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

7
user/default.nix
View File

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

4
user/packages/default.nix
View File

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

6
user/programs/firefox/default.nix Normal file
View File

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

12
user/programs/neovim/plugins.lua
View File

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

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

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

8
user/zsh/default.nix
View File

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