sorceress
/
nix-infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NixOS 23.05 update

This commit is contained in:
Agatha Lovelace 2023-06-01 19:07:54 +02:00
parent 43187f6de9
commit 3e9811007b
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
12 changed files with 217 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/default.nix
View File

@ -4,7 +4,7 @@
## Optimizations ## Optimizations
# Clean /tmp # Clean /tmp
boot.cleanTmpDir = true; boot.tmp.cleanOnBoot = true;
# Link identical files # Link identical files
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
@ -42,13 +42,14 @@
# Packages used on all systems # Packages used on all systems
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
comma
git git
wget
xclip
killall killall
openssl
rsync rsync
sqlite-interactive sqlite-interactive
openssl wget
xclip
]; ];
# 🥺 # 🥺

1
common/fragments/frq-friend.nix
View File

@ -22,6 +22,7 @@ in {
ExecStart = "${pkgs.frq-friend}/bin/f3"; ExecStart = "${pkgs.frq-friend}/bin/f3";
WorkingDirectory = path; WorkingDirectory = path;
Restart = "always"; Restart = "always";
RuntimeMaxSec = "1h";
}; };
preStart = '' preStart = ''
ln -sf ${config} ${path}/config.kdl ln -sf ${config} ${path}/config.kdl

7
common/fragments/graphical/bspwm.nix
View File

@ -4,7 +4,7 @@
enable = true; enable = true;
extraConfigEarly = lib.strings.concatStringsSep "\n" [ extraConfigEarly = lib.strings.concatStringsSep "\n" [
"xsetroot -cursor_name left_ptr" "xsetroot -cursor_name left_ptr"
"xinput set-prop 'SynPS/2 Synaptics TouchPad' 'Synaptics Scrolling Distance' 60 60" "xinput set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Scrolling Pixel Distance' 10"
"setxkbmap" "setxkbmap"
]; ];
extraConfig = lib.strings.concatStringsSep "\n" extraConfig = lib.strings.concatStringsSep "\n"
@ -33,7 +33,8 @@
}; };
"Element".desktop = "II"; "Element".desktop = "II";
"TelegramDesktop".desktop = "III"; "TelegramDesktop".desktop = "III";
"Geary".desktop = "IV"; "Spotify".desktop = "IV";
"Geary".desktop = "V";
"firefox" = { "firefox" = {
desktop = "I"; desktop = "I";
state = "tiled"; state = "tiled";
@ -43,7 +44,7 @@
"firefox:Places".state = "floating"; "firefox:Places".state = "floating";
}; };
startupPrograms = startupPrograms =
[ "firefox" "element-desktop" "telegram-desktop" "geary" ]; [ "firefox" "element-desktop" "telegram-desktop" "spotify" "geary" ];
}; };
services.sxhkd = { services.sxhkd = {

27
common/fragments/graphical/default.nix
View File

@ -10,12 +10,15 @@
./kitty.nix ./kitty.nix
./element.nix ./element.nix
./url-eater.nix ./url-eater.nix
./spotify.nix
]; ];
# User packages # User packages
users.users.agatha.packages = with pkgs; [ users.users.agatha.packages = with pkgs; [
blueberry
brightnessctl brightnessctl
broot broot
clipmenu
colmena colmena
element-desktop element-desktop
flameshot flameshot
@ -32,20 +35,19 @@
lxappearance lxappearance
magic-wormhole magic-wormhole
neofetch neofetch
nil
nitrogen nitrogen
obs-studio
pfetch pfetch
pridefetch pridefetch
prismlauncher
rofi-calc rofi-calc
rofimoji rofimoji
tdesktop tdesktop
wireguard-tools wireguard-tools
xdg-utils xdg-utils
yubioath-desktop
clipmenu
xdotool xdotool
prismlauncher yubioath-flutter
obs-studio
nil
]; ];
# Brightness/volume keys # Brightness/volume keys
@ -75,20 +77,7 @@
layout = lib.mkForce "eu,de(qwerty),ua,ru"; layout = lib.mkForce "eu,de(qwerty),ua,ru";
xkbOptions = "ctrl:nocaps,compose:rctrl"; xkbOptions = "ctrl:nocaps,compose:rctrl";
synaptics = { libinput.enable = true;
enable = true;
tapButtons = true;
vertTwoFingerScroll = true;
vertEdgeScroll = true;
horizEdgeScroll = true;
horizTwoFingerScroll = true;
palmDetect = true;
palmMinWidth = 8;
palmMinZ = 100;
};
}; };
home-manager.users.agatha = { home-manager.users.agatha = {

4
common/fragments/graphical/kitty.nix
View File

@ -9,9 +9,7 @@ in {
font = { font = {
package = pkgs.iosevka; package = pkgs.iosevka;
name = "Iosevka Gothic"; name = "Iosevka Gothic";
# Has to be an integer until https://github.com/nix-community/home-manager/commit/e56714a057ecfa8b89caeccc23e32c628874ad4a is in 22.11 size = 11.5;
# size = 11.5;
size = 12;
}; };
keybindings = { "f5" = "load_config_file"; }; keybindings = { "f5" = "load_config_file"; };

10
common/fragments/graphical/spotify.nix Normal file
View File

@ -0,0 +1,10 @@
{ pkgs, lib, ... }: {
programs.spicetify = {
enable = true;
enabledCustomApps = with pkgs.spicetify-pkgs.apps; [
marketplace
lyrics-plus
];
};
}

12
common/home_manager/helix.nix
View File

@ -7,11 +7,13 @@
helix = { helix = {
enable = true; enable = true;
package = pkgs.helix; package = pkgs.helix;
languages = [{ languages = {
name = "nix"; language = [{
auto-format = true; name = "nix";
formatter = { command = "nixfmt"; }; auto-format = true;
}]; formatter = { command = "nixfmt"; };
}];
};
settings = { settings = {
theme = "paramount-dark"; theme = "paramount-dark";
editor = { editor = {

4
common/pkgs/bin.nix
View File

@ -1,4 +1,4 @@
{ rustPlatform, fetchFromGitHub }: { rustPlatform, fetchFromGitHub, git }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "bin"; pname = "bin";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoLock = { lockFile = "${src}/Cargo.lock"; }; cargoLock = { lockFile = "${src}/Cargo.lock"; };
nativeBuildInputs = [ git ];
meta = { meta = {
description = "highly opinionated, minimal pastebin"; description = "highly opinionated, minimal pastebin";
homepage = "https://github.com/WantGuns/bin"; homepage = "https://github.com/WantGuns/bin";

252
flake.lock
View File

@ -8,11 +8,11 @@
"stable": "stable" "stable": "stable"
}, },
"locked": { "locked": {
"lastModified": 1681413750, "lastModified": 1685370160,
"narHash": "sha256-mouot7Dk89BeFBAI8rn5DnuKGreHzQZ+AI/cmYpeHig=", "narHash": "sha256-7EAZtvHZBN4CFbUWznQicGL/g2+A/9w5JUl88xWmxkI=",
"owner": "AgathaSorceress", "owner": "AgathaSorceress",
"repo": "colmena", "repo": "colmena",
"rev": "e4cc19580cb07fdd3be263a8e01a04adbc4e8949", "rev": "f279530ba0ca33f30fc3ae386ae5487e8d926460",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,15 +44,16 @@
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1670900067, "lastModified": 1681175776,
"narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", "rev": "445a3d222947632b5593112bb817850e8a9cf737",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ipetkov", "owner": "ipetkov",
"ref": "v0.12.1",
"repo": "crane", "repo": "crane",
"type": "github" "type": "github"
} }
@ -115,11 +116,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680258209, "lastModified": 1683212002,
"narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680172861, "lastModified": 1680698112,
"narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=",
"owner": "davhau", "owner": "davhau",
"repo": "drv-parts", "repo": "drv-parts",
"rev": "ced8a52f62b0a94244713df2225c05c85b416110", "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,12 +228,15 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1681202837,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,6 +260,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"frq-friend": { "frq-friend": {
"inputs": { "inputs": {
"naersk": "naersk_2", "naersk": "naersk_2",
@ -284,11 +306,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1682990279, "lastModified": 1685487437,
"narHash": "sha256-ooWLgZItK9clTqe5WgdewIWkW0L4T1zuhhGNwePPvW8=", "narHash": "sha256-hxcl/seMmFtFhr2Nv/bBEEVgcFSyrvE2MLMtQJtG9nM=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "d1a4bd876b3ae646693c0905d7f29b636e2e5033", "rev": "d511122279b3b479362830305f4812f096273b6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,20 +323,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1685599623,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -338,11 +359,11 @@
"mk-naked-shell": { "mk-naked-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1676572903, "lastModified": 1681286841,
"narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "mk-naked-shell", "repo": "mk-naked-shell",
"rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,7 +435,7 @@
}, },
"naersk_3": { "naersk_3": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1679567394, "lastModified": 1679567394,
@ -446,11 +467,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680329418, "lastModified": 1683699050,
"narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,11 +502,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1674641431, "lastModified": 1683408522,
"narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +519,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1678375444, "lastModified": 1682879489,
"narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +552,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1682960002, "lastModified": 1685561376,
"narHash": "sha256-5Zjh4pT3lAjFGN1gVrjqj1LLJHKCAlGdLD8raU7oEMc=", "narHash": "sha256-uIcJdaovXr55FJdmvR6yIN6IWoOL4amBj56e/T2KhgM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8670e496ffd093b60e74e7fa53526aa5920d09eb", "rev": "bc3ec5eaa759d58e9fb1bdc9cfe94f74d0331b31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,6 +581,20 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1680273054,
"narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1680273054, "lastModified": 1680273054,
"narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
@ -575,7 +610,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_11": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1682092588, "lastModified": 1682092588,
"narHash": "sha256-NjKBPnScpbGiH/YOx74DIFOVkr5AKJOVZoy0l7J58gk=", "narHash": "sha256-NjKBPnScpbGiH/YOx74DIFOVkr5AKJOVZoy0l7J58gk=",
@ -653,11 +688,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1680213900, "lastModified": 1683408522,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,31 +720,33 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1682931856, "lastModified": 1685533922,
"narHash": "sha256-phFRasoX9a7pPwfHwUO4A3HjccedEgVQLHR1UoPCY90=", "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d529862de0cdabaebac67a48d825af99c2c3b50d", "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1680273054, "lastModified": 1684385584,
"narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"parts": { "parts": {
@ -721,11 +758,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679737941, "lastModified": 1683560683,
"narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -739,11 +776,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1679737941, "lastModified": 1683560683,
"narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,6 +799,7 @@
"mms": "mms", "mms": "mms",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_8",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"spicetify-nix": "spicetify-nix",
"url-eater": "url-eater", "url-eater": "url-eater",
"vampysite": "vampysite" "vampysite": "vampysite"
} }
@ -775,11 +813,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680315536, "lastModified": 1683771545,
"narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5c8c151bdd639074a0051325c16df1a64ee23497", "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -788,6 +826,25 @@
"type": "github" "type": "github"
} }
}, },
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1684872357,
"narHash": "sha256-10NR2inbTZnD2XfAtZ55+T8nOZo5e0TWUg3667APHco=",
"owner": "the-argus",
"repo": "spicetify-nix",
"rev": "16022e436ab3fe28ff8b5272a36fcadc0845b060",
"type": "github"
},
"original": {
"owner": "the-argus",
"repo": "spicetify-nix",
"type": "github"
}
},
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1669735802, "lastModified": 1669735802,
@ -849,18 +906,48 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"url-eater": { "url-eater": {
"inputs": { "inputs": {
"naersk": "naersk_3", "naersk": "naersk_3",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_11",
"utils": "utils_4" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1681562998, "lastModified": 1685257355,
"narHash": "sha256-VpuZIgIywqnB/JGMSfm1tJ9hai0u+CuRCnOLBCTAtuk=", "narHash": "sha256-1q9iFtbh5fk2kadX4UYyLZcr5zJJHhxRMmCPHsH3Pn0=",
"owner": "AgathaSorceress", "owner": "AgathaSorceress",
"repo": "url-eater", "repo": "url-eater",
"rev": "be1fed9ee7ffb7b61b2f16d143e1c62177ed3234", "rev": "9f042508ee76b6920923c97ab39318e7075fde0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -906,21 +993,6 @@
} }
}, },
"utils_3": { "utils_3": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"locked": { "locked": {
"lastModified": 1678901627, "lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@ -935,9 +1007,9 @@
"type": "github" "type": "github"
} }
}, },
"utils_5": { "utils_4": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -955,15 +1027,15 @@
}, },
"vampysite": { "vampysite": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_12",
"utils": "utils_5" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1682852086, "lastModified": 1685378366,
"narHash": "sha256-jxkFNoaIRVaNLbv86amo5mgCDnWmGrKzvBkUwcp2Ahw=", "narHash": "sha256-BchGw5S0vollYbOqe9Dp1z2XA4I4wGHYI42cPM4Jvyo=",
"ref": "refs/heads/mistress", "ref": "refs/heads/mistress",
"rev": "663afd4160aa14ddfe738ebcf8a36d08ddbc3c96", "rev": "2d37f2e143ad6ff0d7528573acfe34242889f14e",
"revCount": 17, "revCount": 18,
"type": "git", "type": "git",
"url": "https://git.lain.faith/sorceress/vampysite" "url": "https://git.lain.faith/sorceress/vampysite"
}, },

10
flake.nix
View File

@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.11"; nixpkgs.url = "nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.11"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -23,10 +23,12 @@
frq-friend.url = "git+https://git.xenua.me/xenua/fedi-frq-friend"; frq-friend.url = "git+https://git.xenua.me/xenua/fedi-frq-friend";
vampysite.url = "git+https://git.lain.faith/sorceress/vampysite"; vampysite.url = "git+https://git.lain.faith/sorceress/vampysite";
spicetify-nix.url = "github:the-argus/spicetify-nix";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
}; };
outputs = { nixpkgs, nixpkgs-unstable, home-manager, mms, helix, url-eater outputs = { nixpkgs, nixpkgs-unstable, home-manager, mms, helix, url-eater
, colorpickle, frq-friend, colmena, vampysite, ... }: { , colorpickle, frq-friend, colmena, vampysite, spicetify-nix, ... }: {
colmena = { colmena = {
network = { network = {
description = "Agatha's Nix Infra"; description = "Agatha's Nix Infra";
@ -39,6 +41,7 @@
colorpickle = colorpickle.packages.${final.system}.default; colorpickle = colorpickle.packages.${final.system}.default;
frq-friend = frq-friend.defaultPackage.${final.system}; frq-friend = frq-friend.defaultPackage.${final.system};
vampysite = vampysite.packages.${final.system}.default; vampysite = vampysite.packages.${final.system}.default;
spicetify-pkgs = spicetify-nix.packages.${final.system}.default;
}) })
colmena.overlay colmena.overlay
]; ];
@ -86,6 +89,7 @@
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
url-eater.nixosModule url-eater.nixosModule
colorpickle.nixosModules.default colorpickle.nixosModules.default
spicetify-nix.nixosModule
]; ];
deployment = { deployment = {

5
hosts/bloodletting/configuration.nix
View File

@ -52,7 +52,7 @@
banner = '' banner = ''
Hello mistress ^,,^ Hello mistress ^,,^
''; '';
passwordAuthentication = false; settings.PasswordAuthentication = false;
}; };
# Open ports in the firewall. # Open ports in the firewall.
@ -62,13 +62,14 @@
from = 40000; from = 40000;
to = 40200; to = 40200;
}]; }];
trustedInterfaces = [ "podman0" ];
}; };
virtualisation = { virtualisation = {
podman = { podman = {
enable = true; enable = true;
dockerCompat = true; dockerCompat = true;
defaultNetwork.dnsname.enable = true; defaultNetwork.settings.dns_enabled = true;
}; };
oci-containers = { backend = "podman"; }; oci-containers = { backend = "podman"; };
}; };

10
hosts/ritual/configuration.nix
View File

@ -27,20 +27,22 @@
banner = '' banner = ''
Hello mistress ^,,^ Hello mistress ^,,^
''; '';
passwordAuthentication = false; settings.PasswordAuthentication = false;
}; };
virtualisation = { virtualisation = {
podman = { podman = {
enable = true; enable = true;
dockerCompat = true; dockerCompat = true;
defaultNetwork.dnsname.enable = true; defaultNetwork.settings.dns_enabled = true;
}; };
oci-containers = { backend = "podman"; }; oci-containers = { backend = "podman"; };
}; };
hardware.bluetooth.enable = true; hardware.bluetooth = {
services.blueman.enable = true; enable = true;
settings = { General = { Disable = "Headset"; }; };
};
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions