Compare commits

..

25 Commits

Author SHA1 Message Date
Sky Hearn 8533784d83
- Change each submodule to use my own remote
- Readd color themeing I forgor to commit :<
- Get really confused about gnupg
2024-03-07 23:22:15 -08:00
Sky Hearn 7d8b46f018 86 current 2024-03-06 21:11:46 23.11.4801.b7ee09cf5614 6.1.79 * 2024-03-06 21:11:50 -08:00
Sky Hearn 9b66abaf95 78 current 2024-03-01 16:37:01 23.11.4801.b7ee09cf5614 6.1.79 *
- Add obsidian with a workaround for the EOL version of electron used in
1.4.16
- Add clang-tools for the clangd language server
- Add rclone
- Add gnupg
- Change themes system-wide to use "gruvbox"
- Make st a submodule and override the src attr for the st package.

Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:37:00 -08:00
Sky Hearn b2c312beb9 neovim configuration - thanks ku <3
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 239f862c29 76 current 2024-03-01 14:17:16 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 300a74bc26 75 current 2024-03-01 14:06:14 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn ff9deb5e40 74 current 2024-03-01 02:17:17 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 36c42b3ee0 74 current 2024-03-01 02:17:17 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn c144abfda9 73 current 2024-03-01 02:15:56 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 44acbb8246 72 current 2024-03-01 02:08:18 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 2a4b3abfd3 71 current 2024-03-01 02:05:57 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 9027b29229 70 current 2024-03-01 01:24:53 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn d20f9ff686 69 current 2024-03-01 00:55:17 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 15f4249f9b 68 current 2024-03-01 00:22:19 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 3558897e4e 67 current 2024-02-28 18:00:45 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 6c5c849003 66 current 2024-02-28 17:58:29 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn a564a2680b Moonlight Client
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn a490498ea3 64 current 2024-02-27 23:55:28 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn b493fb88c5 62 current 2024-02-27 23:23:49 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn a65dc9ea24 49 current 2024-02-27 21:29:53 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 9bd3b38586 46 current 2024-02-27 20:28:27 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 2234a104ec 45 current 2024-02-27 19:54:42 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 3669abe7ca 44 current 2024-02-27 19:41:39 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn af03677ec3 43 current 2024-02-27 17:58:27 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
Sky Hearn 65779f0766 42 current 2024-02-27 17:56:22 23.11.4801.b7ee09cf5614 6.1.79 *
Signed-off-by: Sky Hearn <sky.hearn@pm.me>
2024-03-06 02:23:21 -08:00
23 changed files with 377 additions and 692 deletions

9
.gitmodules vendored
View File

@ -0,0 +1,9 @@
[submodule "slstatus"]
path = slstatus
url = https://git.fallingsky.love/fallingsky04/slstatus.git
[submodule "dwm"]
path = dwm
url = https://git.fallingsky.love/fallingsky04/dwm.git
[submodule "st"]
path = st
url = https://git.fallingsky.love/fallingsky04/st.git

View File

@ -1,11 +0,0 @@
# This example uses YAML anchors which allows reuse of multiple keys
# without having to repeat yourself.
# Also see https://github.com/Mic92/dotfiles/blob/master/nixos/.sops.yaml
# for a more complex example.
keys:
- &sky age1j8gk5rrczcdql0mkwevjsgdaqqqzavgv006sx0xnc7mzmlp3x4wqvtwdsa
creation_rules:
- path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
key_groups:
age:
- *sky

View File

@ -1,3 +0,0 @@
This document exists to inform users that Sky Hearn has not been served with a secret government subpoena in any of their hardware, their software, or their services.
2024-03-03

Binary file not shown.

View File

@ -5,205 +5,349 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
nix.settings.experimental-features = [ "nix-command" "flakes" ];
sops.age.keyFile = "/secrets/age/keys.txt";
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./users/users.nix <home-manager/nixos>
./services/gitea.nix
./services/duckddns.nix
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# set hostname # amdgpu stuffs
networking.hostName = "rackserver"; boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ];
# fix nixpkgs warning # opengl support
nix.nixPath = [ hardware.opengl.enable = true;
"nixpkgs=${pkgs.path}" # opengl packages
hardware.opengl.extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
vaapiVdpau
libvdpau-va-gl
];
hardware.opengl.driSupport = true;
networking.hostName = "sky-laptop"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# Set your time zone.
time.timeZone = "America/Los_Angeles";
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
#keyMap = "us";
useXkbConfig = true; # use xkb.options in tty.
};
# Enable the X11 windowing system
services.xserver.enable = true;
services.xserver.displayManager.sessionCommands = ''
slstatus &
nitrogen --restore &
clipcatd &
'';
# Configure keymap in X11
services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
# Enable CUPS to print documents.
# services.printing.enable = true;
# Enable sound.
sound.enable = true;
hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
# Enable dwm
services.xserver.windowManager.dwm.package = pkgs.dwm.overrideAttrs {
src = ./dwm;
};
services.xserver.windowManager.dwm.enable = true;
# Sky User
users.users.sky.isNormalUser = true;
users.users.sky.extraGroups = [ "wheel" ]; # Enable sudo for the user.
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"obsidian"
]; ];
# ACME nixpkgs.config.permittedInsecurePackages =
security.acme = { lib.optional (pkgs.obsidian.version == "1.4.16") "electron-25.9.0";
acceptTerms = true;
defaults.email = "sky.hearn@pm.me"; home-manager.useGlobalPkgs = true;
# Home Manager for Sky
home-manager.users.sky = {pkgs, ...}: {
home.packages = with pkgs; [
obsidian
(callPackage (./rolldice/default.nix) {})
clang-tools
rclone
trash-cli
mumble
nheko
zim
moonlight-embedded
nitrogen
firefox-bin
neofetch
ncpamixer
tree
xclip
grpc
clipcat
keepassxc
jellyfin-media-player
];
services.picom = {
enable = true;
vSync = true;
backend = "glx";
inactiveOpacity = 0.9;
settings = {
blur = {
method = "dual-kawase";
};
};
}; };
# wireguard server setup programs.bash = {
# enable NAT enable = true;
networking.nat.enable = true; shellAliases = {
networking.nat.externalInterface = "eno4"; nv = "nvim";
networking.nat.internalInterfaces = [ "wg0" ]; ccm = "clipcat-menu";
networking.firewall = { };
allowedUDPPorts = [ 51820 ];
}; };
networking.wireguard.interfaces = { programs.git = {
# "wg0" is the network interface name. You can name the interface arbitrarily. enable = true;
wg0 = { userName = "Sky Hearn";
# Determines the IP address and subnet of the server's end of the tunnel interface. userEmail = "sky.hearn@pm.me";
ips = [ "10.100.0.1/22" ]; signing = {
key = "DAB485883AE426EC";
signByDefault = false;
};
};
# The port that WireGuard listens to. Must be accessible by the client. programs.neovim = {
listenPort = 51820; enable = true;
defaultEditor = true;
# This allows the wireguard server to route your traffic to the internet and hence be like a VPN extraConfig = ''
# For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients set shiftwidth=2 smarttab
postSetup = '' set expandtab
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eno4 -j MASQUERADE set tabstop=8 softtabstop=0
''; '';
extraPackages = with pkgs; [
# This undoes the above command # Use the project flake's language server to prevent version mismatches
postShutdown = '' # clang_12
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eno4 -j MASQUERADE # rust-analyzer
];
plugins = with pkgs.vimPlugins; [
{
plugin = gruvbox-nvim;
type = "viml";
# Better performance is off until I can figure out a way to make the cache outside the nix store
config = ''
if has('termguicolors')
set termguicolors
endif
colorscheme gruvbox
''; '';
# Path to the private key file.
#
# Note: The private key can also be included inline via the privateKey option,
# but this makes the private key world-readable; thus, using privateKeyFile is
# recommended.
privateKeyFile = "/run/keys/wg-privatekey"; # TODO: Change this to be a sops secret
peers = [
# List of allowed peers.
{ #nub
# Public key of the peer (not a file path).
publicKey = "j2WrE1lX5Pf12Yk61zzCUJCnzVQyR+s+nWw72a4gsik=";
# List of IPs assigned to this peer within the tunnel subnet. Used to configure routing.
allowedIPs = [ "10.100.1.0/24" ];
}
{ # ku
publicKey = "MCPLxi1clVx92gfeq04mm1flgjzS2XqtC3OKN6C0iE8=";
allowedIPs = [ "10.100.2.0/24" ];
}
{ # Jas
publicKey = "Q90Tvst8ZntJPl1WxLOcV108k9SwPIpjXAtxHPE62UM=";
allowedIPs = ["10.100.0.6/32"];
}
{ # skyLaptop
publicKey = "2sg0sgMMGQrCGt0f/5+1kO/B0Ghfb137DTf9nYctZTM=";
allowedIPs = [ "10.100.0.4/32" ];
}
{ # skyDesktop
publicKey = "36tqEexZ8e6ks+qjDpnMzUY9LAJvFvVDe6MLzR9vtEo=";
allowedIPs = [ "10.100.0.5/32" ];
}
{ # melon :>
publicKey = "nJgeRkHd6mRqT/lMUJIApCov4GgSekrkJJxZGTXOVCE=";
allowedIPs = [ "10.100.0.7/32" ];
} }
{ {
publicKey = "gs17DdrtnYe2cA+Jxt6p/qovfCAT7eVn58Pq5eTHmGc="; plugin = lualine-nvim;
allowedIPs = [ "10.100.0.8/32" ]; type = "lua";
config = ''
require'lualine'.setup {
options = {
theme = 'gruvbox'
},
sections = {
lualine_c = {'lsp_progress'}
} }
{ # Kitibri
publicKey = "cT95nYaPYkra1Im355EwUXxw9Wef7b1j0YBx6+rnp1s=";
allowedIPs = [ "10.100.0.9/32" ];
} }
{ # ken '';
publicKey = "6FHWDuKLW3QNVNTURIm6bJ1s0+FtzgEO9TtKuS0khhM=";
allowedIPs = [ "10.100.0.10/32" ];
} }
{ # Jamie {
publicKey = "mF6eLG4VgwVV56PGn+Omg0mvN2UGB8b0i7rq8rJI+l0="; plugin = lsp-status-nvim;
allowedIPs = [ "10.100.0.11/32" ]; type = "lua";
config = ''
require'lsp-status'.register_progress()
'';
} }
{ # saff {
publicKey = "3rxyEvAU3I/wdTRJR4qKAHmbmw5abnx1o49jei14FTI="; plugin = nvim-lspconfig;
allowedIPs = [ "10.100.0.12/32" ]; type = "lua";
config = ''
-- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true }
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
-- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer
local on_attach = function(client, bufnr)
-- Set up status tracking
require'lsp-status'.on_attach(client)
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap=true, silent=true, buffer=bufnr }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
end
local lsp_flags = {
-- This is the default in Nvim 0.7+
debounce_text_changes = 150,
} }
{ # Tech
publicKey = "uD+yrVfZidjwiJjk6y5bHL7xlIozgsSKKGM3idu92BI="; local servers = { 'clangd', 'rust_analyzer' }
allowedIPs = [ "10.100.0.13/32" ];
for _, lsp in ipairs(servers) do
require'lspconfig'[lsp].setup(
vim.tbl_extend('keep',
require('coq').lsp_ensure_capabilities({
on_attach = on_attach,
flags = lsp_flags
}) or {},
require'lsp-status'.capabilities
)
)
end
'';
} }
{ # meow {
publicKey = "Jn3py2rxRuoluUl4eKxK+m+f21wMzQ4xI+NOMt7Oihc="; plugin = coq_nvim;
allowedIPs = [ "10.100.0.14/32" ]; type = "lua";
config = ''
vim.g.coq_settings = { auto_start = 'shut-up', xdg = true }
'';
} }
{ # fetti {
publicKey = "g92YcBJQK/MOWMbpF8wZV/G8EgKdcIdltfdE/26GgSA="; plugin = nvim-treesitter.withAllGrammars;
allowedIPs = [ "10.100.0.15/32" ]; type = "lua";
config = ''
require'nvim-treesitter.configs'.setup {
-- TODO: Make this use stdpath("data")
-- parser_install_dir = "~/.local/share/nvim/site",
-- ensure_installed = { "nix", "help", "rust", "c", "lua" },
-- auto_install = true,
highlight = {
enable = true
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = "gnn", -- set to `false` to disable one of the mappings
node_incremental = "grn",
scope_incremental = "grc",
node_decremental = "grm",
} }
{ # baron },
publicKey = "4YQRCZwgdzpPk3Gia+3cl2GByHxjI1Vbup0orlgp8BI="; indent = {
allowedIPs = [ "10.100.0.16/32" ]; enable = true
},
} }
{ # blise vim.cmd([[
publicKey = "wOOOAtQ5YX4surQGU1aU+JzSV1fI/qFqMLm731z8nTc="; set foldmethod=expr
allowedIPs = [ "10.100.0.17/32" ]; set foldexpr=nvim_treesitter#foldexpr()
set nofoldenable
]])
'';
} }
{ # baba {
publicKey = "il12KBAwODC1TTZgT4JIL0f6AZcYWxylmuVlTlWd80s="; plugin = telescope-nvim;
allowedIPs = [ "10.100.0.18/32" ];
}
{ # Mari
publicKey = "NfEjPn+ZYgB1vfNZ353AQOKPZLKUt4gPoNUSrywXjl0=";
allowedIPs = [ "10.100.0.20/32" ];
}
{ # WiTu
publicKey = "k+PkzHREDszWnzvY79JcBL2XCkwtQ/XSunxNft7pjwY=";
allowedIPs = ["10.100.0.19/32"];
}
{ # Shiro
publicKey = "I4US1u5iR5g8qzVvtVMvK65dgNsnnXbkAac3GBS1PWQ=";
allowedIPs = ["10.100.0.21/32"];
} }
]; ];
}; };
home.stateVersion = "23.11";
}; };
# List packages installed in system profile. To search, run:
# arion setup # $ nix search wget
virtualisation.podman.enable = true; environment.systemPackages = with pkgs; [
virtualisation.podman.dockerSocket.enable = true; wireguard-tools
virtualisation.podman.defaultNetwork.settings.dns_enabled = true; pinentry
pulseaudio
environment.systemPackages = [ bash
pkgs.git vim
pkgs.bash wget
pkgs.wget acpi
pkgs.curl dmenu
pkgs.vim dunst
libnotify
pkgs.arion (pkgs.st.overrideAttrs (_: {
# Do install the docker CLI to talk to podman. src = ./st;
# Not needed when virtualisation.docker.enable = true; })
pkgs.docker-client )
(pkgs.slstatus.overrideAttrs (_: {
src = ./slstatus;
})
)
libva-utils
]; ];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
programs.mtr.enable = true;
# List services that you want to enable: # List services that you want to enable:
networking.firewall.allowedTCPPorts = [ 80 443 22 25565 25566 25567];
services.nginx = {
enable = true;
recommendedGzipSettings = true;
recommendedOptimisation = true;
recommendedProxySettings = true;
};
services.postgresql = {
enable = true;
};
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh = { services.openssh.enable = true;
# https://discourse.nixos.org/t/cant-get-gnupg-to-work-no-pinentry/15373/19
services.pcscd.enable = true;
programs.gnupg.agent = {
enable = true; enable = true;
settings = { pinentryFlavor = "tty";
# Forbid root login through SSH.
PermitRootLogin = "no";
# key authentication
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
}; };
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# This option defines the first version of NixOS you have installed on this particular machine, # This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
# #
@ -221,4 +365,5 @@
# #
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
} }

1
dwm Submodule

@ -0,0 +1 @@
Subproject commit 9397c7c7caaf7b08635f15360e7aeaf71f547fff

View File

@ -1,234 +0,0 @@
{
"nodes": {
"arion": {
"inputs": {
"flake-parts": "flake-parts",
"haskell-flake": "haskell-flake",
"hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1709606645,
"narHash": "sha256-yObjAl8deNvx1uIfQn7/vkB9Rnr0kqTo1HVrsk46l30=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "d2d48c9ec304ac80c84ede138b8c6f298d07d995",
"type": "github"
},
"original": {
"id": "arion",
"type": "indirect"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"arion",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"arion",
"hercules-ci-effects",
"nixpkgs"
]
},
"locked": {
"lastModified": 1701473968,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1675296942,
"narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "c2cafce9d57bfca41794dc3b99c593155006c71e",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.1.0",
"repo": "haskell-flake",
"type": "github"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"arion",
"nixpkgs"
]
},
"locked": {
"lastModified": 1708547820,
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1709578243,
"narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-23-11": {
"locked": {
"lastModified": 1709569716,
"narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "617579a787259b9a6419492eaac670a5f7663917",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1709428628,
"narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1709356872,
"narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "458b097d81f90275b3fdf03796f0563844926708",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"arion": "arion",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"nixpkgs-23-11": "nixpkgs-23-11",
"sops-nix": "sops-nix"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1709591996,
"narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "sops-nix",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View File

@ -1,43 +0,0 @@
{
description = "NixOS configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix";
nixpkgs-23-11.url = "github:nixos/nixpkgs/nixos-23.11";
};
outputs = inputs@{ nixpkgs, nixpkgs-23-11, home-manager, sops-nix, arion, ... }: {
nixosConfigurations = {
rackserver = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
sops-nix.nixosModules.sops
# https://github.com/hercules-ci/arion/issues/230
({pkgs, ...}:
{
nixpkgs.overlays = [ (final: prev: { arion = nixpkgs-23-11.legacyPackages.x86_64-linux.arion; }) ];
})
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.ku = import ./users/ku.nix;
home-manager.users.nub = import ./users/nub.nix;
home-manager.users.jas = import ./users/jas.nix;
home-manager.users.sky = import ./users/sky.nix;
home-manager.users.podman = import ./users/podman.nix;
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
}
];
};
};
};
}

View File

@ -8,19 +8,19 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/88bc4e4c-a29d-4e5a-9ed2-8f991c2148a2"; { device = "/dev/disk/by-uuid/4318-37A8";
fsType = "btrfs"; fsType = "vfat";
}; };
fileSystems."/boot" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/4791-0457"; { device = "/dev/disk/by-uuid/0040c110-03d5-4157-89b4-09637d80eb44";
fsType = "vfat"; fsType = "btrfs";
}; };
swapDevices = [ ]; swapDevices = [ ];
@ -30,11 +30,8 @@
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
# networking.interfaces.eno2.useDHCP = lib.mkDefault true;
# networking.interfaces.eno3.useDHCP = lib.mkDefault true;
# networking.interfaces.eno4.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

28
rolldice/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, stdenv
, fetchzip
, readline
}:
stdenv.mkDerivation rec {
name = "rolldice";
version = "1.16-1";
src = fetchzip {
url = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/rolldice/1.16-1build1/rolldice_1.16.orig.tar.gz";
sha256 = "sha256-gyBwPzO0UO6LvGvaWk5bn1uFUPtedC3Y1/uN3FdyJSQ=";
};
buildInputs = [
readline
];
buildPhase = ''
make
'';
installPhase = ''
mkdir -p $out/bin
mv rolldice $out/bin
'';
}

View File

@ -1,22 +0,0 @@
{pkgs, ...}:
{
systemd.timers."duckddns" = {
wantedBy = [ "timers.target" ];
timerConfig = {
OnBootSec = "5m";
OnUnitActiveSec = "5m";
Unit = "duckddns.service";
};
};
systemd.services."duckddns"= {
# hiding my token hehe
script = ''
bash /home/sky/duckddns.sh
'';
serviceConfig = {
Type = "oneshot";
User = "root";
};
};
}

View File

@ -1,33 +0,0 @@
{ config, ... }:
{
services.nginx.virtualHosts."git.skymath.duckdns.org" = {
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://localhost:3001/";
};
};
services.postgresql = {
ensureDatabases = [ config.services.gitea.user ];
ensureUsers = [
{
name = config.services.gitea.database.user;
ensureDBOwnership = true;
}
];
};
services.gitea = {
enable = true;
appName = "Fallingsky04's Gitea Server <3"; # Give the site a name
database = {
type = "postgres";
passwordFile = "/run/keys/gitea-dbpassword";
};
settings.server = {
HTTP_PORT = 3001;
};
};
}

1
slstatus Submodule

@ -0,0 +1 @@
Subproject commit f227db9662f3c4f96fdfd0d025e3ed4060ded0a2

1
st Submodule

@ -0,0 +1 @@
Subproject commit 7544d3c13dfae83ed19697265daa2ef46882f089

View File

@ -1,47 +0,0 @@
{ pkgs, ... }:
{
project.name = "minecraft";
services = {
mc = {
service.image = "itzg/minecraft-server:java17-jdk";
service.volumes = [ "/home/podman/data:/data" ];
service.dns = [ "8.8.8.8" ];
service.network_mode = "host";
service.environment = {
EULA = "true";
TYPE = "FORGE";
VERSION = "1.20.1";
FORGE_VERSION = "47.2.20";
MEMORY = "16G";
};
};
ftb_infinity = {
service.image = "itzg/minecraft-server:java8-multiarch";
service.volumes = [ "/home/podman/ftb_infinity/data:/data" ];
service.dns = [ "8.8.8.8" ];
service.network_mode = "host";
service.environment = {
EULA = "true";
TYPE = "FORGE";
VERSION = "1.7.10";
FORGE_VERSION = "10.13.4.1614";
MEMORY = "16G";
};
};
fabric = {
service.image = "itzg/minecraft-server:java17-jdk";
service.volumes = [ "/home/podman/fabric/data:/data" ];
service.dns = [ "8.8.8.8" ];
service.network_mode = "host";
service.environment = {
EULA = "true";
TYPE = "FABRIC";
VERSION = "1.20.1";
MEMORY = "16G";
OPS = "Fallingsky04";
SERVER_PORT = "25567";
SEED="-2098004362385192995";
};
};
};
}

View File

@ -1 +0,0 @@
import <nixpkgs> { system = "x86_64-linux"; }

View File

@ -1,12 +0,0 @@
{ pkgs, ... }:
{
home.username = "jas";
home.homeDirectory = pkgs.lib.mkForce "/home/jas"; # use force here since vm trys to set it to /var/empty
home.packages = [ ];
programs.bash.enable = true;
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "23.11";
}

View File

@ -1,11 +0,0 @@
{ pkgs, ... }: {
home.username = "ku";
home.homeDirectory = pkgs.lib.mkForce "/home/ku"; # use force here since vm trys to set it to /var/empty
home.packages = [ ];
programs.bash.enable = true;
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "23.11";
}

View File

@ -1,12 +0,0 @@
{ pkgs, ... }:
{
home.username = "nub";
home.homeDirectory = pkgs.lib.mkForce "/home/nub"; # use force here since vm trys to set it to /var/empty
home.packages = [ ];
programs.bash.enable = true;
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "23.11";
}

View File

@ -1,20 +0,0 @@
{ pkgs, ... }: {
home.username = "podman";
home.homeDirectory = pkgs.lib.mkForce "/home/podman";
home.packages = [ ];
programs.bash.enable = true;
home.file = {
"arion-pkgs.nix" = {
source = ./arion-pkgs.nix;
};
"arion-compose.nix" = {
source = ./arion-compose.nix;
};
};
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "23.11";
}

View File

@ -1,24 +0,0 @@
{ pkgs, ... }:
{
home.username = "sky";
home.homeDirectory = pkgs.lib.mkForce "/home/sky"; # use force here since vm trys to set it to /var/empty
home.packages = [ pkgs.neovim ];
programs.bash = {
enable = true;
shellAliases = {
nv = "nvim";
};
};
programs.git = {
enable = true;
userName = "Sky Hearn";
userEmail = "sky.hearn@pm.me";
};
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "23.11";
}

View File

@ -1,23 +0,0 @@
{ config, lib, pkgs, ...}:
{
users.users.sky.isNormalUser = true;
users.users.ku.isNormalUser = true;
users.users.nub.isNormalUser = true;
users.users.jas.isNormalUser = true;
users.extraUsers.podman.hashedPassword = "";
users.users.podman.isNormalUser = true;
users.users.gitea.isSystemUser = true;
users.groups.keys.members = [ "gitea" ];
users.extraUsers.sky.hashedPassword = "";
users.groups.wheel.members=["sky"];
users.users.sky.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHTT5oIuXAkJvNzsHQ/RP2OOWb7R7zMjhU0ZmZCStlOX"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDP1B+iui9JR8u1yBNJ6Eh+7HL+PKuKkpjtOIDhl9uvZ1XsDqKnUJcFNjh7Jx+H4vpxoNMfEQzQB7qdkWnfhjNGiRp/6RxYcj20f71D3nElm1ELYpgzfufRPYaviwK86/0nj/Bjky4NoB5oBh6aQUi4VjECGNq+V/NzBuJ/vDiOY6+SfvlmJxQZ+0/Na+eWNFq+sDV+bP3PJWdVDO6MQR4IhVWHGZJX5Bjvzu+nFfMkCxp82OESCtyxl6BlW5jFN++SJiAFMASU5FkQU8hfLZb7nDr9ftDNmqWtbBFfnQ4E0jYtaxTN9Gx9A/NTU3AIvfICQcpOVbYXkyNYwsCVEarujc+ZV6EiCosic8xD2ONp5P7YT8TNOcSAQzto+OKTcDc3Z7gkIopZifvlNQissMqL8QxwcRpNr8Jg590CrHvnqanB0AO+pE346cNlo6/qEzw4uCGdo+WZAXI1Evg0/6uvklC48wqAbTsLiXGPXQlXsY5T6D6bvUNAF51lreHWYdE="
];
users.groups.podman = {};
users.users.podman.group = "podman";
}

View File

@ -1 +0,0 @@
HmG6Xcyo4jfE+uhJkEjK+IGref4peV5easEbxx2l0W4=