Compare commits
7 Commits
d6ec2908ab
..
panam
| Author | SHA1 | Date | |
|---|---|---|---|
| f0d8b48ebe | |||
| 149a070935 | |||
| 872b103afc | |||
| dcd3742313 | |||
| c11cf32d39 | |||
| 9b428c5798 | |||
| 4bec798787 |
@@ -1,3 +1,3 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
nixos-rebuild switch --fast --flake .#condoserver --target-host root@condoserver.room409.wg.test --build-host root@condoserver.room409.wg.test
|
nixos-rebuild switch --fast --flake .#condoserver --target-host root@192.168.86.21 --build-host root@192.168.86.21
|
||||||
|
|||||||
Generated
+125
-24
@@ -1,5 +1,41 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"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": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -7,11 +43,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735925111,
|
"lastModified": 1739051380,
|
||||||
"narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=",
|
"narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1",
|
"rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -20,29 +56,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1735388221,
|
|
||||||
"narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixos-hardware",
|
|
||||||
"rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "master",
|
|
||||||
"repo": "nixos-hardware",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735834308,
|
"lastModified": 1739020877,
|
||||||
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
|
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
|
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -51,11 +71,92 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1781877992,
|
||||||
|
"narHash": "sha256-iAqxefR//nOlNCgNwbJ7dZEyec7ABIWu0VK8PbLixDY=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "bb452854d59d604d25e2a4026e9ac8b8646156f0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_stable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1688392541,
|
||||||
|
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "nixos-22.11",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixpkgs": "nixpkgs",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"home-manager": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1697662575,
|
|
||||||
"narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "3433206e51766b4164dad368a81325efbf343fbe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1697456312,
|
|
||||||
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"home-manager": "home-manager",
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
@@ -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
-16
@@ -11,21 +11,20 @@ font pango:Ubuntu Sans Mono 10
|
|||||||
|
|
||||||
#exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
|
#exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
|
||||||
#exec dbus-update-activation-environment WAYLAND_DISPLAY
|
#exec dbus-update-activation-environment WAYLAND_DISPLAY
|
||||||
exec dbus-sway-environment
|
|
||||||
exec configure-gtk
|
exec configure-gtk
|
||||||
|
exec dbus-sway-environment
|
||||||
# give sway a little time to startup before starting kanshi.
|
# give sway a little time to startup before starting kanshi.
|
||||||
exec sleep 5; systemctl --user start kanshi.service
|
exec sleep 5; systemctl --user start kanshi.service
|
||||||
|
|
||||||
|
xwayland enable
|
||||||
|
|
||||||
#When everything's wayland, maybe
|
#When everything's wayland, maybe
|
||||||
output eDP-1 scale 1
|
#output eDP-1 scale 2
|
||||||
|
|
||||||
#Output HDMI-A-1 'Goldstar Company Ltd LG TV SSCR2 0x00000101'
|
#Output HDMI-A-1 'Goldstar Company Ltd LG TV SSCR2 0x00000101'
|
||||||
output HDMI-A-1 mode 1920x1080@60Hz
|
output HDMI-A-1 mode 1920x1080@60Hz
|
||||||
|
#output HDMI-A-1 mode 4096x2160@30Hz
|
||||||
|
|
||||||
#Output DP-4 'LG Electronics LG TV SSCR2 0x00000101'
|
|
||||||
output DP-3 mode 1280x720@60Hz
|
|
||||||
#output DP-4 mode 1280x720@60Hz
|
|
||||||
#output DP-4 mode 3840x2160@60Hz
|
|
||||||
|
|
||||||
# reload the configuration file
|
# reload the configuration file
|
||||||
bindsym $mod+Shift+q reload
|
bindsym $mod+Shift+q reload
|
||||||
@@ -54,7 +53,6 @@ floating_modifier $mod
|
|||||||
#bindsym $mod+Return exec st
|
#bindsym $mod+Return exec st
|
||||||
#bindsym $mod+Return exec sakura
|
#bindsym $mod+Return exec sakura
|
||||||
bindsym $mod+Return exec foot
|
bindsym $mod+Return exec foot
|
||||||
bindsym $mod+Shift+Return exec ghostty
|
|
||||||
|
|
||||||
# kill focused window
|
# kill focused window
|
||||||
bindsym $mod+Shift+c kill
|
bindsym $mod+Shift+c kill
|
||||||
@@ -178,17 +176,19 @@ input 9456:320:Metadot_-_Das_Keyboard_Das_Keyboard {
|
|||||||
|
|
||||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||||
# finds out, if available)
|
# finds out, if available)
|
||||||
bar {
|
#bar {
|
||||||
position top
|
# position top
|
||||||
|
|
||||||
# When the status_command prints a new line to stdout, swaybar updates.
|
# When the status_command prints a new line to stdout, swaybar updates.
|
||||||
# The default just shows the current date and time.
|
# 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 while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
|
||||||
status_command i3status
|
# status_command i3status
|
||||||
|
|
||||||
colors {
|
# colors {
|
||||||
statusline $color7
|
# statusline $color7
|
||||||
background $color0
|
# background $color0
|
||||||
inactive_workspace #32323200 #32323200 #5c5c5c
|
# inactive_workspace #32323200 #32323200 #5c5c5c
|
||||||
}
|
# }
|
||||||
}
|
#}
|
||||||
|
|
||||||
|
include /etc/sway/config.d/*
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --fast --flake .#vps --target-host root@room409.xyz --impure
|
nixos-rebuild switch --fast --flake .#vps --target-host root@room409.xyz
|
||||||
|
|||||||
Reference in New Issue
Block a user