Compare commits
22 commits
0c0b7a3606
...
8ea649c943
Author | SHA1 | Date | |
---|---|---|---|
|
8ea649c943 | ||
|
31d07b2a46 | ||
|
e8cd421d7a | ||
|
2df90b3642 | ||
|
0bc998b139 | ||
|
5ba7383cf3 | ||
|
04f9d56270 | ||
|
2cb85eee70 | ||
|
a363af49ce | ||
|
e0128029a3 | ||
|
4d33831256 | ||
|
562f2b01bd | ||
|
d83dd48dbf | ||
|
05d5e12513 | ||
|
718d25f4ee | ||
|
f458b89d99 | ||
|
8370885530 | ||
|
cdac36dfdb | ||
|
5623b4b16f | ||
|
642e3b26fe | ||
|
06fcdb08ca | ||
|
ff5f9eeca4 |
6 changed files with 64 additions and 52 deletions
29
flake.lock
29
flake.lock
|
@ -319,11 +319,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719631702,
|
||||
"narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=",
|
||||
"lastModified": 1720432056,
|
||||
"narHash": "sha256-rw8s4EsRSVtlAGNd5ttO4Ynb/eq0rMJsqG9zyREK3sk=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "2f9668e19aff06550cd154c87c0af120735a56a4",
|
||||
"rev": "5d1928b925da7390eae3e369e6808d64cf916ed7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -489,6 +489,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgsOlder": {
|
||||
"locked": {
|
||||
"lastModified": 1719918800,
|
||||
"narHash": "sha256-9UoMK9d1PiJZJrInbMONscA7QN8C6kZIX9FUyHp6UqQ=",
|
||||
"owner": "arachnist",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "02e10f7e99522cef9909f78312ffbbd2d96e59c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "arachnist",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "02e10f7e99522cef9909f78312ffbbd2d96e59c3",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1702272962,
|
||||
|
@ -523,11 +539,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1719918800,
|
||||
"narHash": "sha256-9UoMK9d1PiJZJrInbMONscA7QN8C6kZIX9FUyHp6UqQ=",
|
||||
"lastModified": 1720542264,
|
||||
"narHash": "sha256-5DaslaU9rl6nJyRzZlVwTVvN8tMA8ec6AM1NDWDSJS8=",
|
||||
"owner": "arachnist",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "02e10f7e99522cef9909f78312ffbbd2d96e59c3",
|
||||
"rev": "8eb7f26d11fd482370287f2960d09076029a19a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -608,6 +624,7 @@
|
|||
"lix-module": "lix-module",
|
||||
"nix-formatter-pack": "nix-formatter-pack",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgsOlder": "nixpkgsOlder",
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:arachnist/nixpkgs/ar-patchset-unstable";
|
||||
nixpkgsOlder.url = "github:arachnist/nixpkgs/02e10f7e99522cef9909f78312ffbbd2d96e59c3";
|
||||
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
|
|
|
@ -115,6 +115,7 @@ in {
|
|||
dnsutils
|
||||
tailscale
|
||||
nix-top
|
||||
nix-tree
|
||||
];
|
||||
|
||||
documentation = {
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
let
|
||||
flakes = lib.filterAttrs (name: value: value ? outputs) inputs;
|
||||
nixRegistry = builtins.mapAttrs (name: v: { flake = v; }) flakes;
|
||||
pkgsOlder = import inputs.nixpkgsOlder { system = pkgs.system; config.allowUnfree = true; };
|
||||
# rfkill block 0; rmmod btusb btintel; systemctl restart bluetooth.service; modprobe btintel; modprobe btusb; systemctl restart bluetooth.service; rfkill unblock 0
|
||||
bt-unfuck = with pkgs;
|
||||
writeScriptBin "bt-unfuck" ''
|
||||
|
@ -93,7 +94,7 @@ in {
|
|||
consoleLogLevel = 0;
|
||||
initrd.verbose = false;
|
||||
initrd.systemd.enable = true;
|
||||
plymouth.enable = true;
|
||||
plymouth.enable = lib.mkDefault true;
|
||||
plymouth.theme = "breeze";
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
|
@ -107,7 +108,7 @@ in {
|
|||
fonts = {
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
nerdfonts
|
||||
font-awesome
|
||||
terminus_font
|
||||
terminus_font_ttf
|
||||
noto-fonts-cjk
|
||||
|
@ -166,53 +167,44 @@ in {
|
|||
environment.systemPackages = [
|
||||
inputs.agenix.packages.${pkgs.system}.default
|
||||
inputs.nixpkgs.legacyPackages.${pkgs.system}.colmena
|
||||
] ++ (with pkgs; [
|
||||
krfb # for kdeconnect virtual display
|
||||
] ++ (with pkgs.kdePackages; [
|
||||
tokodon
|
||||
neochat
|
||||
kate
|
||||
kolourpaint
|
||||
okular
|
||||
discover
|
||||
]) ++ (with pkgsOlder; [
|
||||
freecad
|
||||
neofetch
|
||||
]) ++ (with pkgs; [
|
||||
chromium
|
||||
# electrum
|
||||
ffmpeg-full
|
||||
firefox
|
||||
imagemagick
|
||||
inkscape
|
||||
kate
|
||||
keybase-gui
|
||||
kolourpaint
|
||||
nixfmt-classic
|
||||
okular
|
||||
paprefs
|
||||
pavucontrol
|
||||
solvespace
|
||||
spotify
|
||||
youtube-dl
|
||||
morph
|
||||
mpv
|
||||
gphoto2
|
||||
minicom
|
||||
maim
|
||||
thunderbird
|
||||
feh
|
||||
virt-manager
|
||||
cura
|
||||
ncdu
|
||||
nixos-option
|
||||
yt-dlp
|
||||
lsix
|
||||
element-desktop
|
||||
oneko
|
||||
cinny-desktop
|
||||
neochat
|
||||
vagrant
|
||||
vokoscreen-ng
|
||||
appimage-run
|
||||
protonup-ng
|
||||
scrcpy
|
||||
krita
|
||||
vlc
|
||||
libreoffice-qt6
|
||||
kdePackages.tokodon
|
||||
|
||||
glasgow
|
||||
freecad
|
||||
|
||||
easyeffects
|
||||
|
||||
|
@ -230,28 +222,6 @@ in {
|
|||
'' + old.preFixup;
|
||||
}))
|
||||
|
||||
(vscode-with-extensions.override {
|
||||
vscodeExtensions = with vscode-extensions; [
|
||||
bbenoist.nix
|
||||
bierner.emojisense
|
||||
bierner.markdown-checkbox
|
||||
bierner.markdown-emoji
|
||||
bodil.file-browser
|
||||
golang.go
|
||||
ms-vscode.cpptools
|
||||
ms-vscode.cmake-tools
|
||||
ms-vscode.anycode
|
||||
ms-toolsai.jupyter
|
||||
ms-toolsai.jupyter-renderers
|
||||
ms-vscode.makefile-tools
|
||||
redhat.vscode-yaml
|
||||
rust-lang.rust-analyzer
|
||||
shardulm94.trailing-spaces
|
||||
arrterian.nix-env-selector
|
||||
jnoortheen.nix-ide
|
||||
];
|
||||
})
|
||||
|
||||
prusa-slicer
|
||||
# TODO: investigate later
|
||||
# orca-slicer
|
||||
|
@ -264,7 +234,6 @@ in {
|
|||
dig
|
||||
whois
|
||||
cfssl
|
||||
gomuks
|
||||
bind
|
||||
nmap
|
||||
waypipe
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
{ config, inputs, pkgs, ... }:
|
||||
|
||||
let
|
||||
pkgsOlder = import inputs.nixpkgsOlder { system = pkgs.system; config.allowUnfree = true; };
|
||||
in
|
||||
{
|
||||
networking.hostName = "kyorinrin";
|
||||
|
||||
|
@ -9,9 +12,12 @@
|
|||
graphical
|
||||
laptop
|
||||
secureboot
|
||||
gaming
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
|
||||
services.fprintd.enable = true;
|
||||
|
||||
age.secrets.ar-password.file = ../../secrets/kyorinrin-ar.age;
|
||||
|
||||
users.users.ar.hashedPasswordFile = config.age.secrets.ar-password.path;
|
||||
|
|
|
@ -39,6 +39,12 @@ _:
|
|||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/steam" = {
|
||||
device = "/dev/disk/by-uuid/82037b18-0f09-4383-8238-8e3396af30a3";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=steam" ];
|
||||
};
|
||||
|
||||
fileSystems."/etc/ssh" = {
|
||||
device = "/dev/disk/by-uuid/82037b18-0f09-4383-8238-8e3396af30a3";
|
||||
fsType = "btrfs";
|
||||
|
@ -88,9 +94,21 @@ _:
|
|||
options = [ "subvol=var_lib_tpm" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib/alsa" = {
|
||||
device = "/dev/disk/by-uuid/82037b18-0f09-4383-8238-8e3396af30a3";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=var_lib_alsa" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib/tailscale" = {
|
||||
device = "/dev/disk/by-uuid/82037b18-0f09-4383-8238-8e3396af30a3";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=var_lib_tailscale" ];
|
||||
};
|
||||
|
||||
fileSystems."/var/lib/fprint" = {
|
||||
device = "/dev/disk/by-uuid/82037b18-0f09-4383-8238-8e3396af30a3";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=var_lib_fprint" ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue