Compare commits
7 Commits
4bc99c40d3
...
panam
| Author | SHA1 | Date | |
|---|---|---|---|
 miloignis
|
f0d8b48ebe | ||
 Marcus Godwin
|
149a070935 | ||
|
Marcus Godwin
|
872b103afc | ||
|
Marcus Godwin
|
dcd3742313 | ||
|
Marcus Godwin
|
c11cf32d39 | ||
|
Marcus Godwin
|
9b428c5798 | ||
|
Marcus Godwin
|
4bec798787 |
Generated
+114
-28
@@ -1,18 +1,53 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-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"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1676367705,
|
||||
"narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
|
||||
"lastModified": 1739051380,
|
||||
"narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
|
||||
"rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -23,11 +58,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1676569297,
|
||||
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -36,42 +71,93 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"vps_nixpkgs": "vps_nixpkgs"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"lastModified": 1781877992,
|
||||
"narHash": "sha256-iAqxefR//nOlNCgNwbJ7dZEyec7ABIWu0VK8PbLixDY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bb452854d59d604d25e2a4026e9ac8b8646156f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vps_nixpkgs": {
|
||||
"nixpkgs_stable": {
|
||||
"locked": {
|
||||
"lastModified": 1673410828,
|
||||
"narHash": "sha256-xAggTjXt7iqOe4lNRtq+B31cjxchvJOr9zIJJ4JmfY8=",
|
||||
"lastModified": 1688392541,
|
||||
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9852294f15c380cd61fd441538982426f8ee8ccc",
|
||||
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "master",
|
||||
"ref": "nixos-22.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs_stable": "nixpkgs_stable",
|
||||
"tachikoma": "tachikoma"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tachikoma": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781895204,
|
||||
"narHash": "sha256-ABzdazJNFxMLM5bJDsXZnHbpJZ83CUy0TUo/yj/CUJA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6650ee26bbfb684b4a9cab55d2d7ebb9afd2ed8c",
|
||||
"revCount": 191,
|
||||
"type": "git",
|
||||
"url": "https://forge.room409.xyz/miloignis/tachikoma.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://forge.room409.xyz/miloignis/tachikoma.git"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -3,839 +3,33 @@
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
vps_nixpkgs.url = "nixpkgs/master";
|
||||
nixpkgs_stable.url = "nixpkgs/nixos-22.11";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
tachikoma = {
|
||||
url = "git+https://forge.room409.xyz/miloignis/tachikoma.git";
|
||||
#inputs.nixpkgs.follows = "nixpkgs";
|
||||
#don't follow because it can change the cargo hash?
|
||||
};
|
||||
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, vps_nixpkgs, home-manager }@attrs:
|
||||
outputs = { self, nixpkgs, nixpkgs_stable, home-manager, tachikoma, flake-utils }@attrs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
homeManagerSharedModule = {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.nathan = { config, pkgs, lib, ... }:{
|
||||
# This value determines the Home Manager release that your
|
||||
# configuration is compatible with. This helps avoid breakage
|
||||
# when a new Home Manager release introduces backwards
|
||||
# incompatible changes.
|
||||
#
|
||||
# You can update Home Manager without changing this value. See
|
||||
# the Home Manager release notes for a list of state version
|
||||
# changes in each release.
|
||||
home.stateVersion = "22.11";
|
||||
|
||||
home.packages = with pkgs; [ ];
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
format = lib.concatStrings [
|
||||
"$username"
|
||||
"$hostname"
|
||||
"$directory"
|
||||
"$jobs"
|
||||
"$cmd_duration"
|
||||
"$character"
|
||||
];
|
||||
directory = {
|
||||
truncation_length = 10;
|
||||
truncate_to_repo = false;
|
||||
};
|
||||
scan_timeout = 10;
|
||||
character = {
|
||||
success_symbol = "➜";
|
||||
error_symbol = "➜";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
sessionVariables = {
|
||||
};
|
||||
profileExtra = ''
|
||||
if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
|
||||
'';
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Nathan Braswell";
|
||||
userEmail = "nathan@braswell.email";
|
||||
};
|
||||
programs.vim = {
|
||||
enable = true;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
nerdcommenter vim-polyglot #parinfer-rust
|
||||
];
|
||||
settings = {
|
||||
# Is the need for these obliviated by vim-polyglot using sleuth?
|
||||
#expandtab = false;
|
||||
tabstop = 4;
|
||||
shiftwidth = 4;
|
||||
};
|
||||
extraConfig = ''
|
||||
set number
|
||||
set hlsearch
|
||||
nnoremap <leader>m :bn<CR>
|
||||
nnoremap <leader>t :tabnew<CR>
|
||||
nnoremap <leader>. :tabn<CR>
|
||||
nnoremap <leader>, :tabp<CR>
|
||||
nnoremap <leader>v :vsplit<CR>
|
||||
nnoremap <leader>h :split<CR>
|
||||
nnoremap <leader>q :q<CR>
|
||||
inoremap jk <Esc>
|
||||
inoremap kj <Esc>
|
||||
|
||||
" Thanks to https://unix.stackexchange.com/questions/140898/vim-hide-status-line-in-the-bottom
|
||||
let s:hidden_all = 0
|
||||
function! ToggleHiddenAll()
|
||||
if s:hidden_all == 0
|
||||
let s:hidden_all = 1
|
||||
set noshowmode
|
||||
set noruler
|
||||
set laststatus=0
|
||||
set noshowcmd
|
||||
else
|
||||
let s:hidden_all = 0
|
||||
set showmode
|
||||
set ruler
|
||||
set laststatus=2
|
||||
set showcmd
|
||||
endif
|
||||
endfunction
|
||||
|
||||
nnoremap <S-h> :call ToggleHiddenAll()<CR>
|
||||
'';
|
||||
};
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
#$Id: vim-keys.conf,v 1.2 2010-09-18 09:36:15 nicm Exp $
|
||||
#
|
||||
# vim-keys.conf, v1.2 2010/09/12
|
||||
#
|
||||
# By Daniel Thau. Public domain.
|
||||
#
|
||||
# This configuration file binds many vi- and vim-like bindings to the
|
||||
# appropriate tmux key bindings. Note that for many key bindings there is no
|
||||
# tmux analogue. This is intended for tmux 1.3, which handles pane selection
|
||||
# differently from the previous versions
|
||||
|
||||
# split windows like vim
|
||||
# vim's definition of a horizontal/vertical split is reversed from tmux's
|
||||
bind s split-window -v
|
||||
bind v split-window -h
|
||||
|
||||
# move around panes with hjkl, as one would in vim after pressing ctrl-w
|
||||
bind h select-pane -L
|
||||
bind j select-pane -D
|
||||
bind k select-pane -U
|
||||
bind l select-pane -R
|
||||
|
||||
# resize panes like vim
|
||||
# feel free to change the "1" to however many lines you want to resize by, only
|
||||
# one at a time can be slow
|
||||
bind < resize-pane -L 1
|
||||
bind > resize-pane -R 1
|
||||
bind - resize-pane -D 1
|
||||
bind + resize-pane -U 1
|
||||
|
||||
# bind : to command-prompt like vim
|
||||
# this is the default in tmux already
|
||||
bind : command-prompt
|
||||
|
||||
# vi-style controls for copy mode
|
||||
setw -g mode-keys vi
|
||||
'';
|
||||
};
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
(menu-bar-mode -1)
|
||||
(tool-bar-mode -1)
|
||||
(scroll-bar-mode -1)
|
||||
|
||||
;; Use spaces, not tabs, for indentation.
|
||||
(setq-default indent-tabs-mode nil)
|
||||
;; Highlight matching pairs of parentheses.
|
||||
(setq show-paren-delay 0)
|
||||
(show-paren-mode)
|
||||
|
||||
;(require 'smartparens-config)
|
||||
|
||||
|
||||
(setq evil-want-C-u-scroll t)
|
||||
(evil-mode 1)
|
||||
(evil-set-undo-system 'undo-redo)
|
||||
(setq key-chord-two-keys-delay 0.5)
|
||||
(key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
|
||||
(key-chord-mode 1)
|
||||
(custom-set-variables
|
||||
;; custom-set-variables was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(custom-safe-themes
|
||||
'("3ff4a0ad1a2da59a72536e6030291cf663314c14c8a5a9eb475f3c28436d071d" default)))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
(load-theme 'dracula t)
|
||||
'';
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
evil key-chord magit proof-general
|
||||
#paredit
|
||||
#smartparens
|
||||
#parinfer-rust-mode
|
||||
rainbow-delimiters dracula-theme
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
commonConfigFunc = ({ config, lib, pkgs, modulesPath, ... }: (specificPkgs: {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
time.timeZone = "America/New_York";
|
||||
users.extraUsers.nathan = {
|
||||
name = "nathan";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "sway" "plugdev" "adbusers"];
|
||||
createHome = true;
|
||||
home = "/home/nathan";
|
||||
shell = "/run/current-system/sw/bin/bash";
|
||||
};
|
||||
|
||||
# testing
|
||||
services.jellyfin.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
services.dbus.enable = true;
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk ];
|
||||
gtkUsePortal = true;
|
||||
};
|
||||
services.blueman.enable = true;
|
||||
|
||||
services.printing.enable = true;
|
||||
services.printing.drivers = [ pkgs.brlaser ];
|
||||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
extraPackages = with pkgs; [
|
||||
swaylock # lockscreen
|
||||
swayidle
|
||||
xwayland # for legacy apps
|
||||
#waybar # status bar
|
||||
mako # notification daemon
|
||||
kanshi # autorandr
|
||||
bemenu # is this right?
|
||||
i3status
|
||||
];
|
||||
};
|
||||
|
||||
environment = {
|
||||
etc = {
|
||||
"sway/config".source = ./sway_config;
|
||||
};
|
||||
};
|
||||
# For steam, and Vulkan in general
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
tmux vim wget curl git w3m iftop iotop killall file unzip zip ripgrep imv killall gomuks htop
|
||||
firefox-wayland chromium gnome.nautilus
|
||||
vlc steam calibre foliate transmission-gtk mupdf
|
||||
gimp
|
||||
foot pavucontrol pywal
|
||||
sway wayland glib dracula-theme gnome.adwaita-icon-theme swaylock swayidle wl-clipboard
|
||||
(pkgs.writeTextFile {
|
||||
name = "dbus-sway-environment";
|
||||
destination = "/bin/dbus-sway-environment";
|
||||
executable = true;
|
||||
|
||||
text = ''
|
||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||
systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
'';
|
||||
})
|
||||
# currently, there is some friction between sway and gtk:
|
||||
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
|
||||
# the suggested way to set gtk settings is with gsettings
|
||||
# for gsettings to work, we need to tell it where the schemas are
|
||||
# using the XDG_DATA_DIR environment variable
|
||||
# run at the end of sway config
|
||||
(pkgs.writeTextFile {
|
||||
name = "configure-gtk";
|
||||
destination = "/bin/configure-gtk";
|
||||
executable = true;
|
||||
text = let
|
||||
schema = pkgs.gsettings-desktop-schemas;
|
||||
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
|
||||
in ''
|
||||
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
|
||||
gnome_schema=org.gnome.desktop.interface
|
||||
gsettings set $gnome_schema gtk-theme 'Dracula'
|
||||
'';
|
||||
})
|
||||
] ++ specificPkgs;
|
||||
programs.waybar.enable = true;
|
||||
|
||||
# kanshi systemd service
|
||||
systemd.user.services.kanshi = {
|
||||
description = "kanshi daemon";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.kanshi}/bin/kanshi -c kanshi_config_file";
|
||||
};
|
||||
};
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
user = "nathan";
|
||||
dataDir = "/home/nathan/syncthing_stuff";
|
||||
configDir = "/home/nathan/syncthing_stuff/.config/syncthing";
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
services.tailscale.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
}));
|
||||
in {
|
||||
nixosConfigurations.nixos4800H = nixpkgs.lib.nixosSystem {
|
||||
nixosConfigurations.panam = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
homeManagerSharedModule
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light ]) {
|
||||
# HARDWARE
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = { device = "/dev/disk/by-uuid/ae8e4a92-53dd-49b5-bf3a-aeb9a109c01e"; fsType = "ext4"; };
|
||||
fileSystems."/boot" = { device = "/dev/disk/by-uuid/28E9-0409"; fsType = "vfat"; };
|
||||
swapDevices = [ ];
|
||||
nix.maxJobs = lib.mkDefault 16;
|
||||
# END HARDWARE
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
networking.hostName = "nixos4800H"; # Define your hostname.
|
||||
|
||||
# THIS SEEMS CONTRADICTORY
|
||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
||||
# replicates the default behaviour.
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces.eno1.useDHCP = true;
|
||||
networking.interfaces.wlp1s0.useDHCP = true;
|
||||
networking.wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.100.0.7/24" ];
|
||||
privateKeyFile = "/home/nathan/wireguard-keys/private";
|
||||
peers = [
|
||||
{
|
||||
publicKey = "WXx7XXJzerPJBPMTvZ454iQhx5Q5bFvBgF6NsPPX9nk=";
|
||||
allowedIPs = [ "10.100.0.0/24" ];
|
||||
#allowedIPs = [ "0.0.0.0/0" ];
|
||||
## Then sudo ip route add 104.238.179.164 via 10.0.0.1 dev enp30s0
|
||||
endpoint = "104.238.179.164:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
system.stateVersion = "20.03";
|
||||
}))
|
||||
];
|
||||
};
|
||||
nixosConfigurations.nixos-desktop = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
homeManagerSharedModule
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs []) {
|
||||
# HARDWARE
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.supportedFilesystems = [ "ntfs" ];
|
||||
fileSystems."/" = { device = "/dev/disk/by-uuid/163c1731-2f66-436b-a74f-20f84ec628dd"; fsType = "ext4"; };
|
||||
fileSystems."/boot" = { device = "/dev/disk/by-uuid/9C44-5411"; fsType = "vfat"; };
|
||||
#fileSystems."/big_disk" = { device = "/dev/disk/by-uuid/B610D69310D65A47"; fsType = "ntfs3"; options = ["rw" "uid=1000"]; };
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# END HARDWARE
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
networking.hostName = "nixos-desktop"; # Define your hostname.
|
||||
system.stateVersion = "22.11";
|
||||
}))
|
||||
];
|
||||
};
|
||||
nixosConfigurations.condoserver = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
homeManagerSharedModule
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs []) {
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
fileSystems."/" = { device = "/dev/disk/by-uuid/0ef06a3a-080d-4f15-b53e-54c91adb8ec9"; fsType = "ext4"; };
|
||||
fileSystems."/boot" = { device = "/dev/disk/by-uuid/86F4-9779"; fsType = "vfat"; };
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/20cc65f9-f35e-419a-b00f-252cd576b2ce"; } ];
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# high-resolution display
|
||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# don't suspend on lid close
|
||||
services.logind.lidSwitch = "ignore";
|
||||
networking.hostName = "condoserver"; # Define your hostname.
|
||||
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
}))
|
||||
];
|
||||
};
|
||||
nixosConfigurations.vps = vps_nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
({config, pkgs, lib, ... }: {
|
||||
# HARDWARE
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/b9470789-6d82-4ad4-9a4a-7e19b8fcc8dc";
|
||||
fsType = "ext4";
|
||||
};
|
||||
nix.maxJobs = lib.mkDefault 1;
|
||||
# END HARDWARE
|
||||
|
||||
nix.gc.automatic = true;
|
||||
imports = [ ];
|
||||
|
||||
nixpkgs.overlays = [ ( self: super: {
|
||||
mautrix-telegram = super.mautrix-telegram.overrideAttrs (old: {
|
||||
#src = pkgs.fetchFromGitHub {
|
||||
# owner = "tulir";
|
||||
# repo = old.pname;
|
||||
# #rev = "v${version}";
|
||||
# # Literal next commit to fix double-puppeting 2 typing 2 furious
|
||||
# rev = "eca1032d1660099216e71a7e0b24d35bb4833d74";
|
||||
# sha256 = "1vpdgi1szhlccni1d87bbcsi2p08ifs1s2iinimkc7d8ldqv1p52";
|
||||
#};
|
||||
propagatedBuildInputs = old.propagatedBuildInputs ++ (with pkgs.python3.pkgs; [
|
||||
#asyncpg
|
||||
python-olm pycryptodome unpaddedbase64
|
||||
]);
|
||||
});
|
||||
}) ];
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.version = 2;
|
||||
boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only
|
||||
|
||||
swapDevices = [{
|
||||
device = "/var/swapfile";
|
||||
size = 4096;
|
||||
}];
|
||||
|
||||
networking.hostName = "vps"; # Define your hostname.
|
||||
networking.nameservers = [ "1.1.1.1" "8.8.8.8" ];
|
||||
# WireGuard
|
||||
networking.nat.enable = true;
|
||||
networking.nat.externalInterface = "ens3";
|
||||
networking.nat.internalInterfaces = ["wg0"];
|
||||
networking.firewall = {
|
||||
#allowedTCPPorts = [ 22 80 443 3478 3479 ];
|
||||
#allowedUDPPorts = [ 22 80 443 5349 5350 51820 ];
|
||||
allowedTCPPorts = [ 22 80 443 ];
|
||||
allowedUDPPorts = [ 22 80 443 51820 ];
|
||||
#extraCommands = ''
|
||||
# iptables -A FORWARD -i %i -j ACCEPT; iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
|
||||
#'';
|
||||
};
|
||||
#networking.wireguard.interfaces = {
|
||||
# wg0 = {
|
||||
# ips = [ "10.100.0.1/24" ];
|
||||
# listenPort = 51820;
|
||||
# privateKeyFile = "/home/nathan/wireguard-keys/private";
|
||||
# peers = [
|
||||
# {
|
||||
# publicKey = "FqJShA/dz8Jj73tSyjzcsyASOEv6uAFs6e/vRol8ygc=";
|
||||
# allowedIPs = [ "10.100.0.2/32" ];
|
||||
# }
|
||||
# {
|
||||
# publicKey = "aAgay9pn/3Vj1nHC4GFY2vysW12n5VFyuUcB5+0pux8=";
|
||||
# allowedIPs = [ "10.100.0.3/32" ];
|
||||
# }
|
||||
# {
|
||||
# publicKey = "u55Jkd4dRdBqnhliIP9lwsxIYow2Tr8BhPPhKFtaVAc=";
|
||||
# allowedIPs = [ "10.100.0.4/32" ];
|
||||
# }
|
||||
# {
|
||||
# publicKey = "J/BWU33DYMkoWOKSZWrtAqWciep03YuicaDMD5MCqWg=";
|
||||
# allowedIPs = [ "10.100.0.5/32" ];
|
||||
# }
|
||||
# {
|
||||
# publicKey = "y2gAEhg1vwK1+nka2Knu7NyOk8HaaY4w18nD6EMyLSk=";
|
||||
# allowedIPs = [ "10.100.0.6/32" ];
|
||||
# }
|
||||
# {
|
||||
# publicKey = "SoaYh1mb6DYd6TuOEFl4lRCZUBTPQfOnWHIOmtkgxxM=";
|
||||
# allowedIPs = [ "10.100.0.7/32" ];
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
#};
|
||||
|
||||
services.openssh.enable = true;
|
||||
services.openssh.passwordAuthentication = false;
|
||||
services.openssh.kbdInteractiveAuthentication = false;
|
||||
services.openssh.permitRootLogin = "prohibit-password";
|
||||
|
||||
services.mastodon = {
|
||||
enable = true;
|
||||
localDomain = "mastodon.room409.xyz";
|
||||
configureNginx = true;
|
||||
smtp.fromAddress = "notifications@mastodon.room409.xyz";
|
||||
};
|
||||
|
||||
services.mautrix-telegram = {
|
||||
enable = true;
|
||||
settings = {
|
||||
homeserver = {
|
||||
address = "https://synapse.room409.xyz";
|
||||
domain = "synapse.room409.xyz";
|
||||
};
|
||||
bridge.permissions = {
|
||||
"synapse.room409.xyz" = "full";
|
||||
"@miloignis:synapse.room409.xyz" = "admin";
|
||||
};
|
||||
bridge.encryption = {
|
||||
allow = true;
|
||||
require_verification = false;
|
||||
};
|
||||
};
|
||||
environmentFile = /var/lib/mautrix-telegram/secrets;
|
||||
};
|
||||
|
||||
#services.bookbot = {
|
||||
# enable = true;
|
||||
# port = 8888;
|
||||
#};
|
||||
|
||||
services.matrix-synapse = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
server_name = "synapse.room409.xyz";
|
||||
public_baseurl = "https://synapse.room409.xyz/";
|
||||
|
||||
enable_registration = false;
|
||||
#registration_shared_secret = null;
|
||||
database.name = "psycopg2";
|
||||
url_preview_enabled = true;
|
||||
report_stats = true;
|
||||
max_upload_size = "100M";
|
||||
|
||||
listeners = [
|
||||
{
|
||||
port = 8008;
|
||||
tls = false;
|
||||
resources = [
|
||||
{
|
||||
compress = true;
|
||||
names = ["client" "federation"];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
app_service_config_files = [
|
||||
"/var/lib/matrix-synapse/telegram-registration.yaml"
|
||||
"/var/lib/matrix-synapse/facebook-registration.yaml"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.gitea = {
|
||||
enable = true;
|
||||
disableRegistration = true;
|
||||
appName = "Room409.xyz Forge";
|
||||
domain = "forge.room409.xyz";
|
||||
rootUrl = "https://forge.room409.xyz/";
|
||||
httpPort = 3001;
|
||||
};
|
||||
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
# postgresql user and db name in the service.matrix-synapse.databse_args setting is default
|
||||
initialScript = pkgs.writeText "synapse-init.sql" ''
|
||||
CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
|
||||
CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
|
||||
TEMPLATE template0
|
||||
LC_COLLATE = "C"
|
||||
LC_CTYPE = "C";
|
||||
'';
|
||||
};
|
||||
|
||||
services.headscale = {
|
||||
enable = true;
|
||||
address = "0.0.0.0";
|
||||
port = 8789;
|
||||
serverUrl = "https://headscale.room409.xyz";
|
||||
dns.baseDomain = "wg.test";
|
||||
settings.logtail.enabled = false;
|
||||
};
|
||||
|
||||
security.acme.email = "miloignis@gmail.com";
|
||||
security.acme.acceptTerms = true;
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts."headscale.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:8789";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
virtualHosts."forge.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/".proxyPass = "http://localhost:3001";
|
||||
};
|
||||
|
||||
virtualHosts."synapse.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/.well-known/matrix/server".extraConfig = ''
|
||||
add_header Content-Type application/json;
|
||||
return 200 '{ "m.server": "synapse.room409.xyz:443" }';
|
||||
'';
|
||||
locations."/.well-known/matrix/client".extraConfig = ''
|
||||
add_header Content-Type application/json;
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
return 200 '{ "m.homeserver": {"base_url": "https://synapse.room409.xyz"}, "m.identity_server": { "base_url": "https://vector.im"} }';
|
||||
'';
|
||||
locations."/".proxyPass = "http://localhost:8008";
|
||||
locations."/".extraConfig = ''
|
||||
client_max_body_size 100M;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
'';
|
||||
};
|
||||
|
||||
virtualHosts."element-synapse.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
root = pkgs.element-web.override {
|
||||
conf = {
|
||||
default_server_name = "synapse.room409.xyz";
|
||||
default_server_config = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
virtualHosts."kraken-lang.org" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
root = "/var/www/kraken-lang.org";
|
||||
locations."/k_prime.wasm".extraConfig = ''
|
||||
default_type application/wasm;
|
||||
'';
|
||||
};
|
||||
virtualHosts."faint.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
root = "/var/www/faint.room409.xyz";
|
||||
};
|
||||
#virtualHosts."www.kraken-lang.org" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# root = "/var/www/kraken-lang.org";
|
||||
# locations."/k_prime.wasm".extraConfig = ''
|
||||
# default_type application/wasm;
|
||||
# '';
|
||||
#};
|
||||
virtualHosts."room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>room409.xyz</title>
|
||||
<style>
|
||||
h1, h2 ,h3 { line-height:1.2; }
|
||||
body {
|
||||
max-width: 45em;
|
||||
margin: 1em auto;
|
||||
padding: 0 .62em;
|
||||
font: 1.2em/1.62 sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header><h1>So Mean and Clean</h1></header>
|
||||
<i>It's like a hacker wrote it</i>
|
||||
<br> <br>
|
||||
<b>Keyboard Cowpeople Team:</b> <a href="https://github.com/Limvot/Serif">Serif, a cross platform Matrix client</a>
|
||||
<br> <br>
|
||||
<b>MiloIgnis:</b> <a href="https://kraken-lang.org/">Kraken Programming Language</a>
|
||||
</body>
|
||||
</html>
|
||||
'';
|
||||
};
|
||||
#locations."/bookclub/".proxyPass = "http://localhost:8888/room/!xSMgeFJYbuYTOGAGga:synapse.room409.xyz/";
|
||||
};
|
||||
|
||||
virtualHosts."miloignis.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>MiloIgnis's Website</title>
|
||||
<style>
|
||||
h1, h2 ,h3 { line-height:1.2; }
|
||||
body {
|
||||
max-width: 45em;
|
||||
margin: 1em auto;
|
||||
padding: 0 .62em;
|
||||
font: 1.2em/1.62 sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header><h1>MiloIgnis's Website</h1></header>
|
||||
<br> <br>
|
||||
Hello! I'm MiloIgnis, a part-time PhD student studing programming languages and compilers.
|
||||
My current project is making a functional language based on Vau-calculus (inspired by John Shutt's work) practial via partial evlauation and some clever compilation techniques.
|
||||
That project, Kraken, is <a href="https://kraken-lang.org/">here</a>.
|
||||
|
||||
<ol>
|
||||
<li>Matrix - <a href="https://matrix.to/#/@miloignis:synapse.room409.xyz">@miloignis:synapse.room409.xyz</a></li>
|
||||
<li>Mastodon - <a rel="me" href="https://mastodon.room409.xyz/@miloignis">@miloignis</a></li>
|
||||
</ol>
|
||||
<br> <br>
|
||||
</body>
|
||||
</html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
virtualHosts."internet-list.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>room409.xyz</title>
|
||||
<style>
|
||||
h1, h2 ,h3 { line-height:1.2; }
|
||||
body {
|
||||
max-width: 45em;
|
||||
margin: 1em auto;
|
||||
padding: 0 .62em;
|
||||
font: 1.2em/1.62 sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header><h1>A list of colors on the internet</h1></header>
|
||||
<ol>
|
||||
<li>Blue</li>
|
||||
<li>Chilladelphia</li>
|
||||
<li>Kenny</li>
|
||||
</ol>
|
||||
</body>
|
||||
</html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
#virtualHosts."4800H.room409.xyz" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# locations."/".proxyPass = "http://10.100.0.7:80";
|
||||
#};
|
||||
};
|
||||
|
||||
services.journald.extraConfig = "SystemMaxUse=50M";
|
||||
|
||||
services.tailscale.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
htop tmux git vim wget unzip file
|
||||
iftop ripgrep
|
||||
config.services.headscale.package
|
||||
#wireguard
|
||||
];
|
||||
users.extraUsers.nathan = {
|
||||
name = "nathan";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "plugdev"];
|
||||
createHome = true;
|
||||
home = "/home/nathan";
|
||||
shell = "/run/current-system/sw/bin/bash";
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDjyWh/SPOgx+yOgrc8g8+7PR0+CWMrWZ4PaWcmgDzfUGAWyj2FHBNG2gLvIKn4+TAwvbEPp+7YXxlmiYltUWNlEXEzryhrhYiqeun9uApT+fgzxF278/VeS+NErX4S2WGwhUdybk6MSs0cpUVp+TNiZFUH+ltTcLai3aLaMaL13Z024DzjpD4jRVG4PErHTe/6dTfdmg6AS7gB0b+LTjFzdYSdeYsHxqcig+d+34vQkNmV2dIvLpNkbpzyfUyE3g1gpYTgRKgY4mZqd6QUKOyIH0SDqPUDrmK6e1LK2yTYe1jP39G2JhAMOrSm8jEFm7RLxHXJ862EqD8gFV2aCQ2HUFlFpx7t02Tgvw80grQRoJKJyYtElO6CAr+oFnhxWnYgUsoYmGLSp5Nv1wV9WHkprWnGyuj/CGM8D3gwFSL672IYQOGTwQElcclRZ/uMlNjtyw6ky4VV22gDZag1hMfZhWf/nmMNql8dCoqY7K36XAAEDXjiS5J9EZe7AexLV68= nathan@nixos_4800H" # laptop
|
||||
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmGhDNdwDXulhJ8MGehlfLQZ8Qzxv2K4vXqyvJWSkMj5XzCRcylKME0qdfiA+G0SeozCY2Qhd2xiPsaL3PaZX7HD1fiesO0jofl9Ph+VIbwwP2LT7kYYSoUXSdj3uPBdZD8BhSZsMHIPVQfzj5JkvE1W9AQik+d5o7RPO8srpo8JHRpH0lgJbuiLWkpLX2sD2hjlI5uMhMekGnI0UA3ie3x9Xnh3J019X0K3Efxm8X31k60j9J0bgGLhxYwu42+kiJKabdpk5tFsqLvDRbzPUGSm+5ZiWMX5ILDbr+/Aczzb2ek5rzsEB2s48BmxBtJnXfjnQtBo6URuJYzVSI9V6vEgUnueGPY/DN1oeRZqTcqujIADh3ZMcdKg1cfdvNYoSk2FcFz0rZXTLjkwOAK2HMRZFXK5ijX7tpnb5GXsiDa0uoWhJVByzrnlqZ65LuHdLFPbe+A/N+T3wzykIkG2hNv8mRJi7/pWjNy2O2iKsSSSabN5xjxI7aFzyUQK+23UF2wzLc1+f4qMcB5HoHhktOV1QRM4RKtvYhdkAG0O/C5Wu0BItrjQbAoqSa29QLlBpHCIlY4Vr8S4kNXf8mm8gRrKATHNZBTUAVNMDYFcd9n4hyK8ERGodaXFDP7m/r+yZaHLcpQQ46sYjq2nbkP1yYaCbmVoEEUpKRtP2UDc91w== miloignis@gmail.com" # desktop
|
||||
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSG8Mi192YYB1PSmRUQGT0WxMuG8f3HKmdC6Y/NTKlRZDMeyV81cxmJpMjpKszc0P5e0j6F4Q1y9R0GybRPVFFgA5I5ETReWcJ1pe8Bs/BxZpxcl/fESUl2YOoEWxGzwha7CAIAlgMFTljj9osYTx+b8j+6MFhlsRnUCaxngRle2JeSmkCFYMlkKjynTHME4OjfRb3xR1VmB489s25tMmRjpzGuD6+5o0x+nX3yk8t711vKcuYx0irwi3sn4w9bKXamPOZH/5sCNz1Q7Qgz9BWOPYXMpnYytDcps7ACAqpKu3etzBvMQo+TZzivr+yZhePhUWovE1HpPVTBqEf3D+ekHZ5ZdQ6Y4W3/16WdDYCq9eCdZvsPOAFi9Sl/lf74LuzEqD1pPHg7avh7+fNJN2r0KoyozuvDSIwW8Kwo1uSav0XCHvdsFmSUmEXjwb4M2Bue6XDWCrVa8FiRpS1F/uvLgdWsZIkBJCX6vy6zPkFMJoKG9IdT4KYCn1KW3ifwTs= nathan@nixos" #condoserver
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
system.stateVersion = "20.03";
|
||||
})
|
||||
tachikoma.nixosModules.default
|
||||
./home_manager.nix
|
||||
./panam.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.marcus = { config, pkgs, lib, ... }:{
|
||||
# This value determines the Home Manager release that your
|
||||
# configuration is compatible with. This helps avoid breakage
|
||||
# when a new Home Manager release introduces backwards
|
||||
# incompatible changes.
|
||||
#
|
||||
# You can update Home Manager without changing this value. See
|
||||
# the Home Manager release notes for a list of state version
|
||||
# changes in each release.
|
||||
home.stateVersion = "22.11";
|
||||
|
||||
home.packages = with pkgs; [ ];
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
format = lib.concatStrings [
|
||||
"$username"
|
||||
"$hostname"
|
||||
"$directory"
|
||||
"$jobs"
|
||||
"$cmd_duration"
|
||||
"$character"
|
||||
];
|
||||
directory = {
|
||||
truncation_length = 10;
|
||||
truncate_to_repo = false;
|
||||
};
|
||||
scan_timeout = 10;
|
||||
character = {
|
||||
success_symbol = "➜";
|
||||
error_symbol = "➜";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Marcus Godwin";
|
||||
userEmail = "godwin3@gatech.edu";
|
||||
};
|
||||
programs.vim = {
|
||||
enable = true;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
nerdcommenter vim-polyglot #parinfer-rust
|
||||
];
|
||||
settings = {
|
||||
# Is the need for these obliviated by vim-polyglot using sleuth?
|
||||
#expandtab = false;
|
||||
tabstop = 4;
|
||||
shiftwidth = 4;
|
||||
};
|
||||
extraConfig = ''
|
||||
set number
|
||||
set hlsearch
|
||||
nnoremap <leader>m :bn<CR>
|
||||
nnoremap <leader>t :tabnew<CR>
|
||||
nnoremap <leader>. :tabn<CR>
|
||||
nnoremap <leader>, :tabp<CR>
|
||||
nnoremap <leader>v :vsplit<CR>
|
||||
nnoremap <leader>h :split<CR>
|
||||
nnoremap <leader>q :q<CR>
|
||||
inoremap jk <Esc>
|
||||
inoremap kj <Esc>
|
||||
|
||||
" Thanks to https://unix.stackexchange.com/questions/140898/vim-hide-status-line-in-the-bottom
|
||||
let s:hidden_all = 0
|
||||
function! ToggleHiddenAll()
|
||||
if s:hidden_all == 0
|
||||
let s:hidden_all = 1
|
||||
set noshowmode
|
||||
set noruler
|
||||
set laststatus=0
|
||||
set noshowcmd
|
||||
else
|
||||
let s:hidden_all = 0
|
||||
set showmode
|
||||
set ruler
|
||||
set laststatus=2
|
||||
set showcmd
|
||||
endif
|
||||
endfunction
|
||||
|
||||
nnoremap <S-h> :call ToggleHiddenAll()<CR>
|
||||
'';
|
||||
};
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
#$Id: vim-keys.conf,v 1.2 2010-09-18 09:36:15 nicm Exp $
|
||||
#
|
||||
# vim-keys.conf, v1.2 2010/09/12
|
||||
#
|
||||
# By Daniel Thau. Public domain.
|
||||
#
|
||||
# This configuration file binds many vi- and vim-like bindings to the
|
||||
# appropriate tmux key bindings. Note that for many key bindings there is no
|
||||
# tmux analogue. This is intended for tmux 1.3, which handles pane selection
|
||||
# differently from the previous versions
|
||||
|
||||
# split windows like vim
|
||||
# vim's definition of a horizontal/vertical split is reversed from tmux's
|
||||
bind s split-window -v
|
||||
bind v split-window -h
|
||||
|
||||
# move around panes with hjkl, as one would in vim after pressing ctrl-w
|
||||
bind h select-pane -L
|
||||
bind j select-pane -D
|
||||
bind k select-pane -U
|
||||
bind l select-pane -R
|
||||
|
||||
# resize panes like vim
|
||||
# feel free to change the "1" to however many lines you want to resize by, only
|
||||
# one at a time can be slow
|
||||
bind < resize-pane -L 1
|
||||
bind > resize-pane -R 1
|
||||
bind - resize-pane -D 1
|
||||
bind + resize-pane -U 1
|
||||
|
||||
# bind : to command-prompt like vim
|
||||
# this is the default in tmux already
|
||||
bind : command-prompt
|
||||
|
||||
# vi-style controls for copy mode
|
||||
setw -g mode-keys vi
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,276 @@
|
||||
({ config, lib, pkgs, modulesPath, ... }: {
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
# needed for stable restarts of pi-hole container
|
||||
#boot.cleanTmpDir = true;
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = { device = "/dev/disk/by-uuid/b22f705d-8d3d-4d6c-997d-226399f03e18"; fsType = "ext4"; };
|
||||
fileSystems."/boot" = { device = "/dev/disk/by-uuid/BE49-6634"; fsType = "vfat"; };
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/9b8aa223-f67b-4c1a-9161-a3daec3dfefc"; } ];
|
||||
# Mounted data drives for use by glusterfs
|
||||
#fileSystems."/data/brick1" = { device = "/dev/disk/by-label/gfs_ssd1"; fsType = "xfs"; };
|
||||
fileSystems."/data/brick2" = { device = "/dev/disk/by-label/gfs_hdd1"; fsType = "xfs"; };
|
||||
fileSystems."/data/brick3" = { device = "/dev/disk/by-label/gfs_hdd2"; fsType = "xfs"; };
|
||||
# Glusterfs shared storage
|
||||
#fileSystems."/ghost_in_the_stream" = { device = "panam:/gv0"; fsType = "glusterfs"; };
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# high-resolution display
|
||||
#hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "panam"; # Define your hostname.
|
||||
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
time.timeZone = "America/New_York";
|
||||
users.extraUsers.marcus = {
|
||||
name = "marcus";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "sway" "plugdev" "adbusers" "docker" ];
|
||||
createHome = true;
|
||||
home = "/home/marcus";
|
||||
shell = "/run/current-system/sw/bin/bash";
|
||||
};
|
||||
users.extraUsers.nathan = {
|
||||
name = "nathan";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "sway" "plugdev" "adbusers" "docker" ];
|
||||
createHome = true;
|
||||
home = "/home/nathan";
|
||||
shell = "/run/current-system/sw/bin/bash";
|
||||
};
|
||||
|
||||
# Pi Hole + docker setup
|
||||
#virtualisation.oci-containers.backend = "docker";
|
||||
#virtualisation.docker.autoPrune.enable = true;
|
||||
|
||||
#virtualisation.oci-containers.containers.pihole = {
|
||||
#image = "pihole/pihole:2023.02.2";
|
||||
# image = "pihole/pihole:latest";
|
||||
# ports = [
|
||||
# "5353:53/udp"
|
||||
# "5353:53/tcp"
|
||||
# "9091:80/tcp"
|
||||
# ];
|
||||
# volumes = [
|
||||
# "/var/lib/pihole/:/etc/pihole/"
|
||||
# "/var/lib/dnsmasq.d:/etc/dnsmasq.d"
|
||||
# ];
|
||||
# environment = {
|
||||
# TZ = config.time.timeZone;
|
||||
# WEB_PORT = "80";
|
||||
# WEBPASSWORD = "critical";
|
||||
# PIHOLE_DNS_ = "9.9.9.9;2620:fe::fe";
|
||||
# REV_SERVER = "true";
|
||||
# REV_SERVER_DOMAIN = "pihole.local";
|
||||
# REV_SERVER_TARGET = "192.168.4.1";
|
||||
# REV_SERVER_CIDR = "192.168.4.0/16";
|
||||
# DNSMASQ_LISTENING = "local";
|
||||
# VIRTUAL_HOST = "pi.hole";
|
||||
# };
|
||||
# extraOptions = [
|
||||
# "--add-host=host.docker.internal:host-gateway"
|
||||
# ];
|
||||
#};
|
||||
#systemd.services."docker-pihole".postStart = ''
|
||||
# while ! docker ps | grep pihole; do
|
||||
# sleep 10s
|
||||
# echo "Waiting on containers"
|
||||
# done
|
||||
# sleep 30s
|
||||
|
||||
# docker exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt"
|
||||
# docker exec pihole pihole -a adlist add "https://v.firebog.net/hosts/AdguardDNS.txt"
|
||||
# docker exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easylist.txt"
|
||||
# docker exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easyprivacy.txt"
|
||||
|
||||
# docker exec pihole pihole -g
|
||||
# '';
|
||||
|
||||
|
||||
# Adguard Home
|
||||
services.adguardhome = {
|
||||
enable = true;
|
||||
mutableSettings = true;
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
http = {
|
||||
address = "127.0.0.1:3000";
|
||||
};
|
||||
dns = {
|
||||
upstream_dns = [
|
||||
"9.9.9.9#dns.quad9.net"
|
||||
"1.1.1.1"
|
||||
];
|
||||
};
|
||||
filtering = {
|
||||
protection_enabled = true;
|
||||
filtering_enabled = true;
|
||||
parental_enabled = false;
|
||||
safe_search = {
|
||||
enabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
# Enable flatpak for installing/running steam link software
|
||||
services.flatpak.enable = true;
|
||||
|
||||
# testing
|
||||
services.jellyfin.enable = true;
|
||||
services.tachikoma = {
|
||||
enable = true;
|
||||
user = "nathan";
|
||||
config = ''
|
||||
id = "panam"
|
||||
database_prefix = "/home/nathan/tachikoma_db"
|
||||
adam_smasher_your_io_bandwidth = false
|
||||
reset_interval = 300
|
||||
port = 8080
|
||||
|
||||
[shares.default]
|
||||
serve = [ "/data/brick1", "/data/brick2", "/data/brick3", "/home/videos" ]
|
||||
avoid = [ "/data/brick2/grey_share", "/data/brick2/staging", "/data/brick2/cache", "data/brick2/Angel Cop - Remastered", "/data/brick2/Gunbuster - The Complete OVA Series", "/data/brick2/Iria - Zeiram the Animation/", "/data/brick2/Record of Lodoss War- Chronicles of the Heroic Knight" ]
|
||||
download_dir = "/data/brick2/cache"
|
||||
mount_point = "/fuse_mount" # this is optional, remove if you don't want to FUSE
|
||||
max_delete = 30
|
||||
[shares.a_darker_shade_of_grey]
|
||||
serve = [ "/data/brick2/grey_share" ]
|
||||
max_delete = 30
|
||||
'';
|
||||
};
|
||||
programs.fuse.userAllowOther = true;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
services.dbus.enable = true;
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal-kde
|
||||
];
|
||||
#gtkUsePortal = true;
|
||||
};
|
||||
nixpkgs.overlays = [
|
||||
];
|
||||
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
extraPackages = with pkgs; [
|
||||
swaylock # lockscreen
|
||||
swayidle
|
||||
xwayland # for legacy apps
|
||||
#waybar # status bar
|
||||
mako # notification daemon
|
||||
kanshi # autorandr
|
||||
bemenu # is this right?
|
||||
i3status
|
||||
ffmpeg_7-full
|
||||
];
|
||||
};
|
||||
|
||||
environment = {
|
||||
etc = {
|
||||
"sway/config".source = ./sway_config;
|
||||
};
|
||||
};
|
||||
# For steam, and Vulkan in general
|
||||
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
};
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
intel-vaapi-driver # previously vaapiIntel
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
|
||||
vpl-gpu-rt # QSV on 11th gen or newer
|
||||
intel-media-sdk # QSV up to 11th gen
|
||||
];
|
||||
};
|
||||
programs.bash.shellAliases = {
|
||||
steamlink = "flatpak run com.valvesoftware.SteamLink";
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
tmux vim wget curl git w3m iftop iotop killall file unzip zip ripgrep imv killall htop
|
||||
firefox pkgs.nautilus vlc steam
|
||||
foot pavucontrol pywal
|
||||
sway wayland glib dracula-theme pkgs.adwaita-icon-theme wl-clipboard
|
||||
pkgs.jellyfin
|
||||
pkgs.jellyfin-web
|
||||
pkgs.jellyfin-ffmpeg
|
||||
(pkgs.writeTextFile {
|
||||
name = "dbus-sway-environment";
|
||||
destination = "/bin/dbus-sway-environment";
|
||||
executable = true;
|
||||
|
||||
text = ''
|
||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||
systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
|
||||
'';
|
||||
})
|
||||
# currently, there is some friction between sway and gtk:
|
||||
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
|
||||
# the suggested way to set gtk settings is with gsettings
|
||||
# for gsettings to work, we need to tell it where the schemas are
|
||||
# using the XDG_DATA_DIR environment variable
|
||||
# run at the end of sway config
|
||||
(pkgs.writeTextFile {
|
||||
name = "configure-gtk";
|
||||
destination = "/bin/configure-gtk";
|
||||
executable = true;
|
||||
text = let
|
||||
schema = pkgs.gsettings-desktop-schemas;
|
||||
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
|
||||
in ''
|
||||
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
|
||||
gnome_schema=org.gnome.desktop.interface
|
||||
gsettings set $gnome_schema gtk-theme 'Dracula'
|
||||
'';
|
||||
})
|
||||
];
|
||||
programs.waybar.enable = true;
|
||||
|
||||
# kanshi systemd service
|
||||
systemd.user.services.kanshi = {
|
||||
description = "kanshi daemon";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.kanshi}/bin/kanshi -c kanshi_config_file";
|
||||
};
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
services.tailscale.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
})
|
||||
|
||||
+16
-10
@@ -11,16 +11,20 @@ font pango:Ubuntu Sans Mono 10
|
||||
|
||||
#exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
|
||||
#exec dbus-update-activation-environment WAYLAND_DISPLAY
|
||||
exec dbus-sway-environment
|
||||
exec configure-gtk
|
||||
exec dbus-sway-environment
|
||||
# give sway a little time to startup before starting kanshi.
|
||||
exec sleep 5; systemctl --user start kanshi.service
|
||||
|
||||
xwayland enable
|
||||
|
||||
#When everything's wayland, maybe
|
||||
#output eDP-1 scale 2
|
||||
|
||||
#Output HDMI-A-1 'Goldstar Company Ltd LG TV SSCR2 0x00000101'
|
||||
output HDMI-A-1 mode 1920x1080@60Hz
|
||||
#output HDMI-A-1 mode 4096x2160@30Hz
|
||||
|
||||
|
||||
# reload the configuration file
|
||||
bindsym $mod+Shift+q reload
|
||||
@@ -172,17 +176,19 @@ input 9456:320:Metadot_-_Das_Keyboard_Das_Keyboard {
|
||||
|
||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
position top
|
||||
#bar {
|
||||
# position top
|
||||
|
||||
# When the status_command prints a new line to stdout, swaybar updates.
|
||||
# The default just shows the current date and time.
|
||||
#status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
|
||||
status_command i3status
|
||||
# status_command i3status
|
||||
|
||||
colors {
|
||||
statusline $color7
|
||||
background $color0
|
||||
inactive_workspace #32323200 #32323200 #5c5c5c
|
||||
}
|
||||
}
|
||||
# colors {
|
||||
# statusline $color7
|
||||
# background $color0
|
||||
# inactive_workspace #32323200 #32323200 #5c5c5c
|
||||
# }
|
||||
#}
|
||||
|
||||
include /etc/sway/config.d/*
|
||||
|
||||
Reference in New Issue
Block a user