Compare commits

..

8 commits

10 changed files with 128 additions and 95 deletions

47
flake.lock generated
View file

@ -224,6 +224,26 @@
"type": "github" "type": "github"
} }
}, },
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1749999552,
"narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
@ -253,11 +273,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749682763, "lastModified": 1749996528,
"narHash": "sha256-DDhns3NS6L5OlYR0mSX03I5D7uGLyyd3MZegd1wTCyc=", "narHash": "sha256-60avE6oxLzasJr+/tFdhInEUUEF3FZ9uHofTUq4MZ1o=",
"rev": "ee0655240270480d7f6063dcf12ec47f04d2ded6", "rev": "7453e2979f1d4684bea4cb340f23c089ea0d5a90",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ee0655240270480d7f6063dcf12ec47f04d2ded6.tar.gz?rev=ee0655240270480d7f6063dcf12ec47f04d2ded6" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7453e2979f1d4684bea4cb340f23c089ea0d5a90.tar.gz?rev=7453e2979f1d4684bea4cb340f23c089ea0d5a90"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -339,11 +359,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1749195551, "lastModified": 1749832440,
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "rev": "db030f62a449568345372bd62ed8c5be4824fa49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +422,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1749285348, "lastModified": 1749794982,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -418,11 +438,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749727998, "lastModified": 1749857119,
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "narHash": "sha256-tG5xUn3hFaPpAHYIvr2F88b+ovcIO5k1HqajFy7ZFPM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "rev": "5f4f306bea96741f1588ea4f450b2a2e29f42b98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,6 +533,7 @@
"inputs": { "inputs": {
"authentik-nix": "authentik-nix", "authentik-nix": "authentik-nix",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"lix": "lix", "lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",

View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-25.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
@ -10,7 +10,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware?ref=master";
microvm = { microvm = {
url = "github:astro/microvm.nix"; url = "github:astro/microvm.nix";
@ -21,7 +21,7 @@
}; };
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.2"; url = "github:nix-community/lanzaboote?ref=v0.4.2";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
@ -46,6 +46,11 @@
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
tmux-yank = { tmux-yank = {
url = "github:tmux-plugins/tmux-yank"; url = "github:tmux-plugins/tmux-yank";
flake = false; flake = false;
@ -54,6 +59,7 @@
outputs = outputs =
inputs@{ inputs@{
home-manager,
lanzaboote, lanzaboote,
lix-module, lix-module,
microvm, microvm,
@ -114,6 +120,13 @@
nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3 nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen3
lix-module.nixosModules.default lix-module.nixosModules.default
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."0xa" = import ./hosts/toaster/0xa-home.nix;
}
./hosts/toaster ./hosts/toaster
./modules/basic-tools ./modules/basic-tools
@ -122,7 +135,8 @@
./modules/emacs.nix ./modules/emacs.nix
./modules/gnupg.nix ./modules/gnupg.nix
./modules/mail ./modules/mail
./modules/plasma.nix ./modules/mail
./modules/niri.nix
./modules/radio.nix ./modules/radio.nix
./modules/science.nix ./modules/science.nix
./modules/tlp.nix ./modules/tlp.nix

View file

@ -61,7 +61,7 @@ in
virtualHosts."news.oxapentane.com".extraConfig = "reverse_proxy http://10.89.88.14:8080"; virtualHosts."news.oxapentane.com".extraConfig = "reverse_proxy http://10.89.88.14:8080";
virtualHosts."music.oxapentane.com".extraConfig = '' virtualHosts."music.oxapentane.com".extraConfig = ''
route { route {
reverse_proxy /outpost.goauthentik.io/* 10.89.88.11:9000 [fd31:185d:722f::11]:9000 reverse_proxy /outpost.goauthentik.io/* 10.89.88.11:9000 [fd31:185d:722f::11]:9000

View file

@ -4,7 +4,7 @@
./amd.nix ./amd.nix
./hardware-configuration.nix ./hardware-configuration.nix
./irc.nix ./irc.nix
./network ./network/full-networkd.nix
./secure-boot.nix ./secure-boot.nix
./zfs.nix ./zfs.nix
]; ];

View file

@ -7,7 +7,6 @@
./nix.nix ./nix.nix
./nix-ld.nix ./nix-ld.nix
./zsh.nix ./zsh.nix
./fish.nix
]; ];
environment.systemPackages = environment.systemPackages =
@ -81,7 +80,6 @@
vim = "nvim"; vim = "nvim";
grep = "grep --color=auto"; grep = "grep --color=auto";
}; };
users.defaultUserShell = pkgs.zsh; # keep root shell posix compatible
programs.iftop.enable = true; programs.iftop.enable = true;
programs.mosh.enable = true; programs.mosh.enable = true;

View file

@ -17,6 +17,7 @@
mpv mpv
obs-studio obs-studio
qbittorrent qbittorrent
transmission_4-gtk
signal-desktop signal-desktop
spotify spotify
telegram-desktop telegram-desktop

View file

@ -31,7 +31,7 @@
nix-index nix-index
kicad kicad
kikit kikit
freecad-wayland freecad-qt6
imhex imhex
python3Full python3Full
nixfmt-rfc-style nixfmt-rfc-style

View file

@ -5,14 +5,37 @@
}: }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages =
direnv let
mu # https://wiki.nixos.org/wiki/TexLive
]; # minimal set of latex packages for orgmode
# emacs config:
# (setq org-latex-complier "lualatex")
# (setq org-preview-latex-default-process 'dvisvgm)
orgmode-tex = (
pkgs.texlive.combine {
inherit (pkgs.texlive)
scheme-basic
dvisvgm
dvipng
wrapfig
amsmath
ulem
hyperref
capt-of
;
}
);
in
with pkgs;
[
mu
orgmode-tex
];
services.emacs = { services.emacs = {
install = true; install = true;
enable = false; enable = true;
package = package =
with pkgs; with pkgs;
( (

View file

@ -4,8 +4,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnupg gnupg
opensc opensc
yubikey-personalization-gui
]; ];
# smartcard support # smartcard support

View file

@ -1,74 +1,52 @@
# General Desktop-related config { pkgs, ... }:
{ pkgs, inputs, ... }:
{ {
nixpkgs.overlays = [ inputs.niri.overlays.niri ];
programs.niri.enable = true; programs.niri.enable = true;
imports = [ imports = [
./desktop-software.nix ./desktop-software.nix
./fonts.nix ./fonts.nix
]; ];
environment.systemPackages = environment.systemPackages = with pkgs; [
let screen-message
xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs ( qbittorrent
final: _prev: { gajim
version = "git"; imv
cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50="; mpv
src = pkgs.fetchFromGitHub { evince
owner = "Supreeeme"; brightnessctl
repo = "xwayland-satellite"; pulsemixer
rev = "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc"; cmus
sha256 = "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM="; termusic
}; gsettings-desktop-schemas
cargoDeps = pkgs.rustPlatform.fetchCargoTarball { xdg-utils
inherit (final) pname src version; qt5.qtwayland
hash = final.cargoHash; bashmount
}; audacity
} spotify-player
); zathura
in ncdu
with pkgs; adwaita-icon-theme
[ bluetui
screen-message gammastep
qbittorrent graphicsmagick
gajim i3status-rust
imv impala
mpv kanshi
evince pamixer
brightnessctl swayidle
pulsemixer swaylock
cmus wl-clipboard
termusic xfce.thunar
gsettings-desktop-schemas banana-cursor
xdg-utils fuzzel
qt5.qtwayland alacritty
bashmount i3bar-river
audacity mako
spotify-player swww
zathura oculante
ncdu xwayland-satellite
adwaita-icon-theme foot
bluetui ];
gammastep
graphicsmagick
i3status-rust
impala
kanshi
pamixer
swayidle
swaylock
wl-clipboard
xfce.thunar
banana-cursor
fuzzel
alacritty
i3bar-river
mako
swww
oculante
xwayland-satellite-git
];
# Enable sound. # Enable sound.
security.rtkit.enable = true; security.rtkit.enable = true;
@ -127,7 +105,7 @@
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri-session"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri}/bin/niri-session";
}; };
}; };
}; };