0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: 0xa:conduwuit
Branches Tags
0xa:main
0xa:sway
0xa:conduwuit
0xa:NTWRKMNGR
...
pull from: 0xa:main
Branches Tags
0xa:main
0xa:sway
0xa:conduwuit
0xa:NTWRKMNGR
Sign in to create a new pull request.

25 commits
conduwuit ... main

Author SHA1 Message Date
Grisha Shipunov
38c5c53a28 bump lock 2025-02-23 13:57:38 +01:00
Grisha Shipunov
019a309dda Revert "sway config" 
This reverts commit 73df58ccb0.
 2025-02-23 02:34:44 +01:00
Grisha Shipunov
db8daf4f06 bump lock 2025-02-23 02:34:27 +01:00
Grisha Shipunov
e9625f41c4 software changes 2025-02-23 02:34:20 +01:00
Grisha Shipunov
2669f23735 bump lock 2025-02-21 00:53:12 +01:00
Grisha Shipunov
8f7f58b9d1 write tmp to disk 2025-02-21 00:52:57 +01:00
Grisha Shipunov
1e3e2d083c new name for telegram 2025-02-20 23:31:24 +01:00
Grisha Shipunov
b0bc8919c2 add zathura 2025-02-20 23:22:10 +01:00
Grisha Shipunov
b6731802a8 format 2025-02-18 09:54:31 +01:00
Grisha Shipunov
e513320653 software changes 2025-02-18 09:54:25 +01:00
Grisha Shipunov
a35426bdac add ibm3270 and cozette to fonts 2025-02-15 20:53:33 +01:00
Grisha Shipunov
f72c2e676c dnssec is annoying 2025-02-15 17:35:51 +01:00
Grisha Shipunov
73df58ccb0 sway config 2025-02-15 17:35:51 +01:00
Grisha Shipunov
cbb93b0041 update website 2025-02-15 17:03:56 +01:00
Grisha Shipunov
f40d25ed63 bump lock 2025-02-15 15:01:01 +01:00
Grisha Shipunov
ee5fe2ae95 bump lock 2025-02-13 19:48:43 +01:00
Grisha Shipunov
52d09e2f06 remove conflicting kicad defintitions 2025-02-13 19:35:14 +01:00
Grisha Shipunov
fdf386137b tide too buggy 2025-02-12 01:48:53 +01:00
Grisha Shipunov
715eeabaa4 bump lock 2025-02-11 16:07:40 +01:00
Grisha Shipunov
127f4d4c0e enable git lfs 2025-02-11 16:07:21 +01:00
Grisha Shipunov
2e5127bef8 forgejo: more resources 2025-02-11 12:33:44 +01:00
Grisha Shipunov
4658f48f07 bump lock 2025-02-10 15:22:28 +01:00
Grisha Shipunov
f8db0c1b86 update website 2025-02-10 12:12:25 +01:00
Grisha Shipunov
c95ccef488 update lix to beta 2025-02-10 12:07:38 +01:00
Grisha Shipunov
f4a7e1ee38 fish improvements 2025-02-10 11:51:25 +01:00
10 changed files with 93 additions and 63 deletions
Show stats Expand all files Collapse all files

87
flake.lock generated
View file

@ -14,11 +14,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1738503522,
"narHash": "sha256-1yrVbGLBMBPl34EibVARkUB9Gak1GjLRLZXJk9jbHxU=",
"lastModified": 1739612324,
"narHash": "sha256-3RQgKLNSKlcLtdfAo7Zx3+Q+3Bwgy8rx3gZ6ejTeh1w=",
"owner": "nix-community",
"repo": "authentik-nix",
"rev": "bc62d5509989f5dca633c65b58aa0ac79a48db3e",
"rev": "efd801f6faecf6caf489fa03dbd6e32e416bec6d",
"type": "github"
},
"original": {
@ -102,11 +102,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@ -278,36 +278,38 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1737234286,
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
"lastModified": 1740304046,
"narHash": "sha256-BaI27pORky5j8slRzGJTzaWR5tuKvY1z9I+n7n16YgM=",
"rev": "c64a9db6bb03d2755757188394d15fa1a0e12406",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c64a9db6bb03d2755757188394d15fa1a0e12406.tar.gz?rev=c64a9db6bb03d2755757188394d15fa1a0e12406"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_4",
"flakey-profile": "flakey-profile",
"lix": "lix",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1737237494,
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
"lastModified": 1738176840,
"narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
"rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
}
},
"microvm": {
@ -385,11 +387,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1738638143,
"narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=",
"lastModified": 1740089251,
"narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70",
"rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
"type": "github"
},
"original": {
@ -401,11 +403,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1738702386,
"narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
"lastModified": 1740162160,
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
"type": "github"
},
"original": {
@ -417,14 +419,14 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1735774519,
"narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
"lastModified": 1738452942,
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
}
},
"nixpkgs-stable": {
@ -445,11 +447,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1738680400,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
@ -477,11 +479,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1736884309,
"narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=",
"lastModified": 1738741221,
"narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b",
"rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb",
"type": "github"
},
"original": {
@ -522,6 +524,7 @@
"authentik-nix": "authentik-nix",
"flake-utils": "flake-utils_2",
"lanzaboote": "lanzaboote",
"lix": "lix",
"lix-module": "lix-module",
"microvm": "microvm",
"nixos-hardware": "nixos-hardware",
@ -564,11 +567,11 @@
]
},
"locked": {
"lastModified": 1738291974,
"narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
"lastModified": 1739262228,
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"type": "github"
},
"original": {
@ -701,18 +704,18 @@
]
},
"locked": {
"lastModified": 1738536830,
"narHash": "sha256-3QbNcI9qJ0tKv00w0r2Amqf9pylHVolcTyEi30WZxY8=",
"lastModified": 1739635190,
"narHash": "sha256-UOFXRKepDpnPTGRyyfOt8uVkYaDL4gMbE2VlZR0lCNA=",
"ref": "main",
"rev": "6fd169aab3ce461fef6a1a4dcbb2ef643e12d9e6",
"revCount": 5,
"rev": "28953f4e57a2c4ca2ada3547a45c8d2a839d4dfc",
"revCount": 9,
"type": "git",
"url": "https://codeberg.org/0xa/website.git"
"url": "https://git.oxapentane.com/0xa/website.git"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://codeberg.org/0xa/website.git"
"url": "https://git.oxapentane.com/0xa/website.git"
}
}
},

10
flake.nix
View file

@ -30,13 +30,19 @@
inputs.nixpkgs.follows = "nixpkgs";
};
lix = {
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
flake = false;
};
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.lix.follows = "lix";
};
website = {
url = "git+https://codeberg.org/0xa/website.git?ref=main";
url = "git+https://git.oxapentane.com/0xa/website.git?ref=main";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};

3
hosts/forgejo/default.nix
View file

@ -18,7 +18,8 @@ in
microvm = {
hypervisor = "qemu";
mem = 3 * 1024;
vcpu = 2;
balloonMem = 4 * 1024;
vcpu = 4;
interfaces = [
{
type = "tap";

6
hosts/toaster/hardware-configuration.nix
View file

@ -49,6 +49,12 @@
options = [ "zfsutil" ];
};
fileSystems."/tmp" = {
device = "zpool/nocomp/tmp";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/A170-F83D";
fsType = "vfat";

3
hosts/toaster/zfs.nix
View file

@ -19,6 +19,7 @@
supportedFilesystems = [ "zfs" ];
kernelParams = [ "nohibernate" ];
plymouth.enable = false;
tmp.useTmpfs = true;
tmp.useTmpfs = false;
tmp.cleanOnBoot = true;
};
}

12
modules/basic-tools/default.nix
View file

@ -39,7 +39,6 @@
exfatprogs
nmap
bind
nnn
lf
man-pages
unzip
@ -50,8 +49,17 @@
sshfs
whois
mtr
joshuto
]
++ (if config.networking.hostName == "toaster" then [ gitFull ] else [ git ]);
++ (
if config.networking.hostName == "toaster" then
[
gitFull
git-lfs
]
else
[ git ]
);
environment.variables =
let

5
modules/basic-tools/fish.nix
View file

@ -3,11 +3,9 @@
environment.systemPackages = with pkgs; [
lsd
fzf
grc
fishPlugins.done
fishPlugins.fzf-fish
fishPlugins.tide
fishPlugins.grc
fishPlugins.hydro
];
programs.fish = {
@ -15,6 +13,7 @@
interactiveShellInit = ''
set fish_greeting
function fish_command_not_found
echo "Command not found"
end
'';
shellAliases = {

6
modules/desktop-software.nix
View file

@ -5,19 +5,15 @@
dino
ffmpeg-full
firefox-wayland
vivaldi
vivaldi-ffmpeg-codecs
gimp
inkscape
kicad
signal-desktop
tdesktop
telegram-desktop
tor-browser
wl-clipboard
yt-dlp
element-desktop
discord
spotify
mpv
];
programs.steam.enable = true;

8
modules/fonts.nix
View file

@ -26,7 +26,13 @@
twemoji-color-font
twitter-color-emoji
iosevka-bin
(nerdfonts.override { fonts = [ "Hack" ]; })
cozette
(nerdfonts.override {
fonts = [
"Hack"
"3270"
];
})
];
fonts.enableDefaultPackages = true;

16
modules/sway.nix
View file

@ -1,5 +1,8 @@
# General Desktop-related config
{ pkgs, ... }:
{ pkgs, inputs, ... }:
let
unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
in
{
imports = [
./desktop-software.nix
@ -19,11 +22,12 @@
termusic
gsettings-desktop-schemas
xdg-utils
foot
qt5.qtwayland
bashmount
nautilus
audacity
spotify-player
zathura
ncdu
];
# Enable sound.
@ -61,16 +65,15 @@
'';
extraPackages = with pkgs; [
adwaita-icon-theme
alacritty
bluetui
foot
gammastep
graphicsmagick
grim
i3status-rust
unstablepkgs.i3status-rust
impala
kanshi
mako
swaynotificationcenter
pamixer
rofi-wayland
slurp
@ -78,6 +81,7 @@
swaylock
wl-clipboard
wl-mirror
xfce.thunar
];
};
environment.sessionVariables = {