v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

Merge branch 'new' of ssh://git.0x76.dev:42/v/infrastructure into new

Browse source
This commit is contained in:
Vivian 2025-08-20 21:00:05 +02:00
commit eff1752c64
9 changed files with 105 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/default.nix
View file

@ -18,8 +18,7 @@
}; };
sharedModules = [ sharedModules = [
./hm-modules ./hm-modules
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeModules.nixvim
inputs.autostart.homeManagerModules.xdg-autostart
inputs.catppuccin.homeModules.catppuccin inputs.catppuccin.homeModules.catppuccin
inputs.autostart.homeManagerModules.xdg-autostart inputs.autostart.homeManagerModules.xdg-autostart
]; ];

5
common/desktop/home.nix
View file

@ -28,15 +28,15 @@ in
btop btop
calibre calibre
celluloid # video player celluloid # video player
cinny-desktop # cinny-desktop
comma comma
discord discord
element-desktop element-desktop
firefox firefox
foliate # epub reader foliate # epub reader
gcc gcc
gimp
jellyfin-media-player jellyfin-media-player
krita
neofetch neofetch
nicotine-plus nicotine-plus
nixpkgs-review nixpkgs-review
@ -47,7 +47,6 @@ in
unzip unzip
yt-dlp yt-dlp
obsidian
(lib.hiPrio ( (lib.hiPrio (
pkgs.writeShellScriptBin "obsidian" '' pkgs.writeShellScriptBin "obsidian" ''
unset WAYLAND_DISPLAY unset WAYLAND_DISPLAY

8
common/hm-modules/catppuccin/default.nix
View file

@ -42,10 +42,10 @@ in
gtk = { gtk = {
enable = true; enable = true;
iconTheme = { # iconTheme = {
name = "Papirus-Dark"; # name = "Papirus-Dark";
package = pkgs.papirus-icon-theme.override { color = "violet"; }; # package = pkgs.papirus-icon-theme.override { color = "violet"; };
}; # };
# cursorTheme = { # cursorTheme = {
# inherit (config.home.pointerCursor) name package size; # inherit (config.home.pointerCursor) name package size;
# }; # };

4
common/hm-modules/nvim/default.nix
View file

@ -30,8 +30,8 @@ with lib;
luaLoader.enable = true; luaLoader.enable = true;
performance = { performance = {
byteCompileLua.enable = true; # byteCompileLua.enable = true;
combinePlugins.enable = true; # combinePlugins.enable = true;
}; };
globals.mapleader = " "; globals.mapleader = " ";

26
common/hm-modules/nvim/lsp.nix
View file

@ -53,19 +53,19 @@
installCargo = false; installCargo = false;
installRustc = false; installRustc = false;
}; };
pyright.enable = true; # pyright.enable = true;
pylsp = { # pylsp = {
enable = true; # enable = true;
settings.plugins = { # settings.plugins = {
black = { # black = {
enabled = true; # enabled = true;
cache_config = true; # cache_config = true;
}; # };
pycodestyle = { # pycodestyle = {
maxLineLength = 100; # maxLineLength = 100;
}; # };
}; # };
}; # };
elixirls.enable = true; elixirls.enable = true;
clangd.enable = true; clangd.enable = true;
yamlls.enable = true; yamlls.enable = true;

2
common/modules/gnome/default.nix
View file

@ -41,11 +41,11 @@ in
layout = "us"; layout = "us";
variant = "altgr-intl"; variant = "altgr-intl";
}; };
};
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
displayManager.gdm.enable = lib.mkDefault true; displayManager.gdm.enable = lib.mkDefault true;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
};
udev.packages = with pkgs; [ gnome-settings-daemon ]; udev.packages = with pkgs; [ gnome-settings-daemon ];
dbus.enable = true; dbus.enable = true;
udisks2.enable = true; udisks2.enable = true;

142
flake.lock generated
View file

@ -12,11 +12,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1752217044, "lastModified": 1755378195,
"narHash": "sha256-5TomR72rn4q+5poQcN6EnanxeXKqJSqWVAoDAFN0lUc=", "narHash": "sha256-cKw1bfEwW+pQWsvzOAe0GfsSNXTSFS+5MYcZFQB5dFc=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "24fad0622fc9404c69e83bab7738359c5be4988e", "rev": "c1cfee9b63e48d9cee18e538ca32f1721078de91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1752227483, "lastModified": 1755511413,
"narHash": "sha256-eetITGJfURryoHY5gfuE9/4sEV9aSgzhPxgsQgofNa8=", "narHash": "sha256-cBBF+nwGrSroN6ZewHPFaSThyCvwBxSZMdYEH8DxDx8=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "5f431aac1a4038c385e6de2d2384d943e4802d61", "rev": "ca11a19d4e1d2ba5e6162f40cb71288551fd51dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -83,11 +83,11 @@
"stable": "stable" "stable": "stable"
}, },
"locked": { "locked": {
"lastModified": 1752070778, "lastModified": 1755272288,
"narHash": "sha256-2ArxrGPb39YxeyMgEzFX/YiUwwOgz62qazHhYJnZQss=", "narHash": "sha256-ypTPb2eKcOBbOoyvPV0j4ZOXs4kayo73/2KI456QnE0=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "f560ed613a568aee178576b21c6818ef50819ca5", "rev": "5bf4ce6a24adba74a5184f4a9bef01d545a09473",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -113,11 +113,11 @@
}, },
"crane_2": { "crane_2": {
"locked": { "locked": {
"lastModified": 1750266157, "lastModified": 1754269165,
"narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "rev": "444e81206df3f7d92780680e45858e31d2f07a08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +292,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1754091436,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,11 +313,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1754487366,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -602,11 +602,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752202894, "lastModified": 1755601933,
"narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=", "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fab659b346c0d4252208434c3c4b3983a4b38fec", "rev": "8af2e064f93234ee79df8b9858eeefbf84394488",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +657,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1750371812, "lastModified": 1753819801,
"narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "b13c7481e37856f322177010bdf75fccacd1adc8", "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -763,11 +763,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1751381593, "lastModified": 1754297745,
"narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", "rev": "892cbdca865d6b42f9c0d222fe309f7720259855",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +787,11 @@
"nixpkgs-25_05": "nixpkgs-25_05" "nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1752060039, "lastModified": 1754605910,
"narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", "narHash": "sha256-kVWxzm44ywJTb4REfwWCYXnROISykG0yE+X5A3Gov24=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", "rev": "57d9624c71ca65bee69b30d72b11f6c5257e9500",
"revCount": 773, "revCount": 783,
"type": "git", "type": "git",
"url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git" "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git"
}, },
@ -807,11 +807,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1752095991, "lastModified": 1755102374,
"narHash": "sha256-+paXzPg6SN3O+YKtQKiU+kQE1EkfsrI1XEYTxI4DSFk=", "narHash": "sha256-v6xhTSgnGQoF1a51BB6OQWN8HXiYbZtVL+54TRuk9zk=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "f30b1412b73df264dc9cac154d340645add350ff", "rev": "0a5cda80e48191959cf5a9c0552532599ef2cee4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +900,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1752048960, "lastModified": 1755330281,
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -915,11 +915,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750776420, "lastModified": 1755027561,
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -931,11 +931,11 @@
}, },
"nixpkgs-25_05": { "nixpkgs-25_05": {
"locked": { "locked": {
"lastModified": 1751741127, "lastModified": 1753749649,
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "29e290002bfff26af1db6f64d070698019460302", "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1042,11 +1042,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1746904237, "lastModified": 1754725699,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1058,11 +1058,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1751984180, "lastModified": 1755186698,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1073,11 +1073,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1751786137, "lastModified": 1754393734,
"narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", "rev": "a683adc19ff5228af548c6539dbc3440509bfed3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1089,11 +1089,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1751984180, "lastModified": 1755186698,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1111,11 +1111,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1752158208, "lastModified": 1755541228,
"narHash": "sha256-XbXYLUtaB/wHvZYefvaDPbo4eYj27kbtowHfww9bqLw=", "narHash": "sha256-3PsCEAfZLk3shQNgEH67P6KvhV6bXziewl3HwJ/iaV4=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "b728cf43d97814df43f5d9bd9dafac9072ccd9e8", "rev": "e1e4bb83f1b1193c99971dfde6928e1f60ed4296",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1130,11 +1130,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1752238241, "lastModified": 1755599037,
"narHash": "sha256-FAL3YvZOt8lXQY/N7ssugm775BkjWnH1FpgAAaBQrfU=", "narHash": "sha256-wyQzSgNokEMaC1wrIbiHIqatbikrvimrTV8a47RlJ8k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9e311ede9a39b9ec3a7e37be8411056a4c4e9711", "rev": "e92965e6bad1a44445803a8567400e5c6ad9cbe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1153,11 +1153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749730855, "lastModified": 1754301638,
"narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "rev": "a60091045273484c040a91f5c229ba298f8ecc27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1225,11 +1225,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751165203, "lastModified": 1754189623,
"narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1241,11 +1241,11 @@
"spectrum": { "spectrum": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751265943, "lastModified": 1754675037,
"narHash": "sha256-XoHSo6GEElzRUOYAEg/jlh5c8TDsyDESFIux3nU/NMc=", "narHash": "sha256-afS08F7lfMUBR4qrBxinN1kuxu+DoHQ5TPNVp9VS/OA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "37c8663fab86fdb202fece339ef7ac7177ffc201", "rev": "586577f3015397afacd83bc185454f4cc3c8028f",
"revCount": 904, "revCount": 955,
"type": "git", "type": "git",
"url": "https://spectrum-os.org/git/spectrum" "url": "https://spectrum-os.org/git/spectrum"
}, },

2
hosts/thalassa/aoife/default.nix
View file

@ -61,7 +61,7 @@
services = { services = {
hypridle.enable = true; hypridle.enable = true;
xserver.displayManager.gdm.enable = true; displayManager.gdm.enable = true;
flatpak.enable = true; flatpak.enable = true;

8
hosts/thalassa/aoife/uni.nix
View file

@ -1,9 +1,15 @@
# Config options needed for various university courses # Config options needed for various university courses
{ pkgs, lib, ... }: {
lib,
pkgs,
config,
...
}:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
esp-generate esp-generate
espflash espflash
(lib.mkIf config.hardware.saleae-logic.enable config.hardware.saleae-logic.package)
]; ];
users.extraGroups.plugdev = { }; users.extraGroups.plugdev = { };