tacocatgirl/nix-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

updated flake, formatted, xdg mime stuff, ...

Browse source
This commit is contained in:
Aria Nolan 2024-03-27 17:19:37 -04:00
parent eceff55fca
commit ba9eb822d0
7 changed files with 72 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -281,11 +281,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711206119, "lastModified": 1711292506,
"narHash": "sha256-CrFfwkwtLM5ASfDR2pdZjVfEMIcNaMQVIjoDaI1ZPEY=", "narHash": "sha256-6E0Q0AVWWbHb1pLVXXcQJ1z65R8lXFu42vbsufxdoPw=",
"owner": "doronbehar", "owner": "doronbehar",
"repo": "nix-matlab", "repo": "nix-matlab",
"rev": "ad0bf07c4e4a43edd50253b9e9e6dfc4712ba73a", "rev": "fbfa1dcde5054278742ea28cd1d362aca60510ec",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710783728, "lastModified": 1711274671,
"narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=",
"owner": "NixOs", "owner": "NixOs",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,11 +328,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711001935, "lastModified": 1711163522,
"narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20f77aa09916374aa3141cbc605c955626762c9a", "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,11 +355,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1711199922, "lastModified": 1711284540,
"narHash": "sha256-Oz5WNOPp95K4JLyoNQKyEdaUM5JzliC62jwTpGPqYNE=", "narHash": "sha256-DTzi4ujZoxM3ZXStCwD6Lph3FdGtkBlvfYsDCRITjfA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "7170aad28139cd3629b2b6ce4c9272bf41c2ad45", "rev": "e7a3461fefd983ae3443e9aa849e9d1566ab47e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +370,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1711204334, "lastModified": 1711339044,
"narHash": "sha256-Wzdv/we5OmxDHx9qxwO9b6XKRm6IS4jwoVbV65g8LxI=", "narHash": "sha256-FBl0rD/b0+r+vJaL/Q5xq9jSmPdYG+qVEaX3YgSJAU0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "676b81c589e5389344eb5c8f5e3fcf321e1dd87d", "rev": "e65fe342315ed4fe3201369f7802646eaa40cd8b",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
modules/mullvad.nix
View file

@ -1,5 +1,8 @@
{pkgs, config, ...}: { {
pkgs,
config,
...
}: {
age.secrets.mullvad.file = ../secrets/mullvad.age; age.secrets.mullvad.file = ../secrets/mullvad.age;
environment.shellAliases = { environment.shellAliases = {
@ -26,12 +29,14 @@
# Path to the private key file. # Path to the private key file.
privateKeyFile = config.age.secrets.mullvad.path; privateKeyFile = config.age.secrets.mullvad.path;
peers = [{ peers = [
publicKey = "57Zu2qPzRScZWsoC2NhXgz0FiC0HiKkbEa559sbxB3k="; {
allowedIPs = [ "0.0.0.0/0" ]; publicKey = "57Zu2qPzRScZWsoC2NhXgz0FiC0HiKkbEa559sbxB3k=";
endpoint = "${server_ip}:51820"; allowedIPs = ["0.0.0.0/0"];
persistentKeepalive = 25; endpoint = "${server_ip}:51820";
}]; persistentKeepalive = 25;
}
];
postUp = '' postUp = ''
wg set wg0 fwmark 51820 wg set wg0 fwmark 51820

12
modules/nixos-common.nix
View file

@ -1,10 +1,16 @@
{pkgs, inputs, ...}: { {
pkgs,
inputs,
...
}: {
# ------------ System ------------ # ------------ System ------------
imports = [ imports = [
./mullvad.nix ./mullvad.nix
]; ];
programs.fish.enable = true;
users.users.tacocat = { users.users.tacocat = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "networkmanager" "audio" "video" "bluetooth" "kvm" "docker"]; extraGroups = ["wheel" "networkmanager" "audio" "video" "bluetooth" "kvm" "docker"];
@ -32,7 +38,7 @@
name_servers="1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001" name_servers="1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001"
name_server_blacklist="129.21.3.17 129.21.4.18 2620:8d:8000:0:aba:ca:daba:ec" name_server_blacklist="129.21.3.17 129.21.4.18 2620:8d:8000:0:aba:ca:daba:ec"
''; '';
networking.firewall.allowedTCPPorts = [ 2234 ]; networking.firewall.allowedTCPPorts = [2234];
# Sound # Sound
services.pipewire = { services.pipewire = {
@ -68,6 +74,8 @@
name "Pipewire sound server" name "Pipewire sound server"
} }
''; '';
# volume_normalization "yes"
# '';
}; };
systemd.services.mpd.environment = { systemd.services.mpd.environment = {
# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609 # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609

10
users/tacocat/home.nix
View file

@ -24,6 +24,8 @@
]; ];
packages = with pkgs; [ packages = with pkgs; [
fd fd
swayimg
whipper
unzip unzip
mpc-cli mpc-cli
nicotine-plus nicotine-plus
@ -95,6 +97,14 @@
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"application/pdf" = ["org.pwmt.zathura-pdf-mupdf.desktop"]; "application/pdf" = ["org.pwmt.zathura-pdf-mupdf.desktop"];
"image/jpg" = ["swayimg.desktop"];
"image/jpeg" = ["swayimg.desktop"];
"image/png" = ["swayimg.desktop"];
"image/gif" = ["swayimg.desktop"];
"image/svg+xml" = ["swayimg.desktop"];
"image/webp" = ["swayimg.desktop"];
"image/heif" = ["swayimg.desktop"];
"image/bmp" = ["swayimg.desktop"];
}; };
}; };
}; };

14
users/tacocat/neovim/cmp.nix
View file

@ -1,13 +1,13 @@
{...}: { {...}: {
programs.nixvim.plugins.cmp = { programs.nixvim.plugins.cmp = {
enable = true; enable = true;
filetype = { # filetype = {
tex = { # tex = {
sources = [ # sources = [
{name = "latex_symbols";} # {name = "latex_symbols";}
]; # ];
}; # };
}; # };
settings = { settings = {
sources = [ sources = [
{ {

21
users/tacocat/programs/ncmpcpp.nix
View file

@ -2,12 +2,23 @@
programs.ncmpcpp = { programs.ncmpcpp = {
enable = true; enable = true;
bindings = [ bindings = [
{ key = "j"; command = "scroll_down"; } {
{ key = "k"; command = "scroll_up"; } key = "j";
{ key = "J"; command = [ "select_item" "scroll_down" ]; } command = "scroll_down";
{ key = "K"; command = [ "select_item" "scroll_up" ]; } }
{
key = "k";
command = "scroll_up";
}
{
key = "J";
command = ["select_item" "scroll_down"];
}
{
key = "K";
command = ["select_item" "scroll_up"];
}
]; ];
mpdMusicDir = "/data/music"; mpdMusicDir = "/data/music";
}; };
} }

1
users/tacocat/wayland/waybar/default.nix
View file

@ -13,6 +13,7 @@
"sway/window" "sway/window"
]; ];
modules-right = [ modules-right = [
"mpd"
"custom/arrow9" "custom/arrow9"
"pulseaudio" "pulseaudio"
"custom/arrow8" "custom/arrow8"