3 Commits

Author SHA1 Message Date
99174d9bac Setup vaultwarden on monolith 2024-12-26 22:28:21 -08:00
362cd11703 Add Orca Slicer to marauder 2024-12-26 17:18:20 -08:00
bc32bb44de Update hardware settings on marauder 2024-12-26 17:18:03 -08:00
10 changed files with 30 additions and 244 deletions

124
flake.lock generated
View File

@@ -177,11 +177,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -209,11 +209,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@@ -239,22 +239,6 @@
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
@@ -269,7 +253,7 @@
"type": "github"
}
},
"flake-compat_7": {
"flake-compat_6": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -283,7 +267,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_8": {
"flake-compat_7": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -343,7 +327,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
@@ -361,7 +345,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@@ -379,7 +363,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
@@ -947,7 +931,7 @@
},
"nix-search-cli": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"flake-utils": [
"shelvacu",
"flake-utils"
@@ -974,7 +958,7 @@
},
"nix-search-cli-unstable": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"flake-utils": [
"shelvacu",
"flake-utils"
@@ -1001,7 +985,7 @@
},
"nixos-apple-silicon-unstable": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_5",
"nixpkgs": [
"shelvacu",
"nixpkgs-unstable"
@@ -1101,22 +1085,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1744502386,
"narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1733348545,
"narHash": "sha256-b4JrUmqT0vFNx42aEN9LTWOHomkTKL/ayLopflVf81U=",
@@ -1134,7 +1102,7 @@
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat_7",
"flake-compat": "flake-compat_6",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"home-manager": [
@@ -1167,7 +1135,7 @@
"nixvim-unstable": {
"inputs": {
"devshell": "devshell_2",
"flake-compat": "flake-compat_8",
"flake-compat": "flake-compat_7",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks_2",
"home-manager": [
@@ -1394,29 +1362,9 @@
"type": "github"
}
},
"phps": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2",
"utils": "utils"
},
"locked": {
"lastModified": 1744610086,
"narHash": "sha256-weX7WoOM/Gn8aIO81dgA94Msalch6nUpjssIJOPuWK8=",
"owner": "fossar",
"repo": "nix-phps",
"rev": "931af19caf5fbe50ea8b568c2fbfa1c8b35174e8",
"type": "github"
},
"original": {
"owner": "fossar",
"repo": "nix-phps",
"type": "github"
}
},
"purescript-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": "flake-compat",
"nixpkgs": [
"shelvacu",
"nix-inspect",
@@ -1442,7 +1390,7 @@
},
"purescript-overlay_2": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_2",
"nixpkgs": [
"shelvacu",
"nix-inspect-unstable",
@@ -1503,7 +1451,6 @@
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"phps": "phps",
"shelvacu": "shelvacu"
}
},
@@ -1601,7 +1548,7 @@
"nix-search-cli-unstable": "nix-search-cli-unstable",
"nixos-apple-silicon-unstable": "nixos-apple-silicon-unstable",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim",
"nixvim-unstable": "nixvim-unstable",
@@ -1757,21 +1704,6 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt": {
"inputs": {
"nixpkgs": [
@@ -1883,24 +1815,6 @@
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"vscode-server": {
"inputs": {
"flake-utils": [

View File

@@ -4,7 +4,6 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
shelvacu.url = "git+https://git.uninsane.org/shelvacu/nix-stuff";
phps.url = "github:fossar/nix-phps";
};
outputs = { self, nixpkgs, ... }@inputs:

View File

@@ -33,12 +33,9 @@
repository = "b2:marauder-backup";
passwordFile = "/etc/restic-password";
paths = [
"${config.users.users.nettika.home}/Artwork"
"${config.users.users.nettika.home}/Documents"
"${config.users.users.nettika.home}/Music"
"${config.users.users.nettika.home}/Pictures"
"${config.users.users.nettika.home}/Artwork"
"${config.users.users.nettika.home}/Projects"
"${config.users.users.nettika.home}/Videos"
];
pruneOpts = [
"--keep-daily 7"

View File

@@ -6,7 +6,6 @@
self.nixosModules.zerotier
./backup.nix
./dev.nix
./www.nix
./printing.nix
];
@@ -51,7 +50,7 @@
cpu.amd.updateMicrocode = true;
graphics = {
enable = true;
enable32Bit = true;
driSupport32Bit = true;
extraPackages = [ pkgs.vaapiVdpau ];
};
nvidia = {
@@ -76,18 +75,18 @@
slack
element-desktop
telegram-desktop
signal-desktop
# Browsers
firefox
filezilla
# Creative
# Art and 3D
inkscape
gimp
krita
openscad-unstable
bambu-studio
orca-slicer
# Multimedia
vlc

View File

@@ -5,30 +5,16 @@
};
environment.systemPackages = with pkgs; [
# Code Editors
vscode
arduino-ide
# Dev Tools
kotlin
rustup
pyenv
gcc
nixd
nixpkgs-fmt
pyenv
rustup
electron-fiddle
electron
# Languages
gcc
kotlin
nodejs
php
];
programs.direnv = {
enable = true;
};
nixpkgs.config.permittedInsecurePackages = [
"electron-24.8.6"
];
}

View File

@@ -1,26 +0,0 @@
{ pkgs, inputs, ... }:
let
fortune = pkgs.writeShellScript "cgi" ''
echo "Content-type: text/html"
echo ""
${pkgs.fortune}/bin/fortune
'';
in {
services.mysql = {
enable = true;
package = pkgs.mariadb;
};
services.httpd = {
enable = true;
enablePHP = true;
phpPackage = inputs.phps.packages.x86_64-linux.php80;
extraConfig = ''
ScriptAlias /fortune ${fortune}/bin/fortune
'';
virtualHosts."localhost" = {
documentRoot = "/var/www";
locations."/".index = "index.html index.php";
};
};
}

View File

@@ -6,7 +6,6 @@
self.nixosModules.server
self.nixosModules.zerotier
./dns.nix
./memos.nix
./vault.nix
];
@@ -50,6 +49,7 @@
rustup
gcc
(callPackage ../marauder/ffcheck.nix { })
htop
mp3val
];

View File

@@ -1,45 +0,0 @@
{ pkgs, ... }:
{
users.users = {
memos = {
isSystemUser = true;
group = "memos";
};
};
users.groups = {
memos = { };
};
environment.systemPackages = [ pkgs.memos ];
systemd.tmpfiles.settings = {
memosDirs = {
"/var/opt/memos".d = {
mode = "700";
user = "memos";
group = "memos";
};
};
};
# systemd.services = {
# memos = {
# description = "Memos Note-taking Server";
# wantedBy = [ "multi-user.target" ];
# after = [ "network.target" ];
# serviceConfig = {
# Type = "simple";
# User = "memos";
# WorkingDirectory = "/var/opt/memos";
# ExecStart = "${pkgs.memos}/bin/memos --data /var/opt/memos --port 5230";
# Restart = "on-failure";
# TimeoutSec = 15;
# };
# };
# };
networking.firewall = {
allowedTCPPorts = [ 5230 ];
};
}

View File

@@ -4,27 +4,14 @@
nix.settings = {
experimental-features = [ "nix-command" "flakes" ];
substituters = [
"https://nixcache.shelvacu.com"
"https://fossar.cachix.org"
];
trusted-public-keys = [
"fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE="
"nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM="
];
substituters = [ "https://nixcache.shelvacu.com" ];
trusted-public-keys = [ "nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM=" ];
trusted-users = [ "@wheel" ];
};
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
};
users.users.nettika = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" ];
shell = pkgs.fish;
};
security.sudo.wheelNeedsPassword = false;
@@ -54,13 +41,8 @@
'';
};
programs.fish = {
enable = true;
};
environment.systemPackages = with pkgs; [
git-crypt
htop
jq
];
}

View File

@@ -7,24 +7,4 @@
config.programs.bash.promptInit = ''
PS1="\[\e]0;\u@\h: \w\a\]\n${config.promptEmoji} \[\033[1;$((UID ? 32 : 31))m\]\w \\$\[\033[0m\] "
'';
config.programs.fish = {
promptInit = ''
function fish_prompt
echo -n '${config.promptEmoji} '
set_color brgreen
echo -n (prompt_pwd)
set_color normal
echo -n ' > '
end
function fish_right_prompt
set_color bryellow
echo -n (git branch --show-current 2>/dev/null)
end
'';
shellInit = ''
set -g fish_greeting
set -g fish_prompt_pwd_full_dirs 999
'';
};
}