Compare commits
9 commits
15e9870f45
...
db8daf4f06
Author | SHA1 | Date | |
---|---|---|---|
db8daf4f06 | |||
e9625f41c4 | |||
2669f23735 | |||
8f7f58b9d1 | |||
1e3e2d083c | |||
b0bc8919c2 | |||
b6731802a8 | |||
e513320653 | |||
a35426bdac |
8 changed files with 61 additions and 31 deletions
26
flake.lock
generated
26
flake.lock
generated
|
@ -278,11 +278,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1739546930,
|
||||
"narHash": "sha256-m9s8XjIFd9ByX45/mnsryQa0G5ncMjOBJE4kAOHPoUI=",
|
||||
"rev": "1077bc626e8dfc153524da40eddad46ef893d66e",
|
||||
"lastModified": 1740253065,
|
||||
"narHash": "sha256-ucwXcftJ7DHjk1UA2LmfHXkDPoCgfB4uadwFUCBvc8w=",
|
||||
"rev": "82c7e76c9c2d829dc11c22b32173a40056cc44ef",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1077bc626e8dfc153524da40eddad46ef893d66e.tar.gz?rev=1077bc626e8dfc153524da40eddad46ef893d66e"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/82c7e76c9c2d829dc11c22b32173a40056cc44ef.tar.gz?rev=82c7e76c9c2d829dc11c22b32173a40056cc44ef"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
@ -387,11 +387,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1738816619,
|
||||
"narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
|
||||
"lastModified": 1740089251,
|
||||
"narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
|
||||
"rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -403,11 +403,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1739484910,
|
||||
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
|
||||
"lastModified": 1739923778,
|
||||
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
|
||||
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -447,11 +447,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1739446958,
|
||||
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
|
||||
"lastModified": 1739866667,
|
||||
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
|
||||
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
{ lib, pkgs, ... }: {
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./mullvad.nix
|
||||
./dumpdvb.nix
|
||||
./zw.nix
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [ iwgtk impala ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
iwgtk
|
||||
impala
|
||||
];
|
||||
|
||||
# kick out networkmanager
|
||||
networking.networkmanager.enable = lib.mkForce false;
|
||||
|
@ -48,8 +52,12 @@
|
|||
DHCP = "yes";
|
||||
IPv6AcceptRA = true;
|
||||
};
|
||||
dhcpV4Config = { RouteMetric = 666; };
|
||||
dhcpV6Config = { RouteMetric = 666; };
|
||||
dhcpV4Config = {
|
||||
RouteMetric = 666;
|
||||
};
|
||||
dhcpV6Config = {
|
||||
RouteMetric = 666;
|
||||
};
|
||||
};
|
||||
"wlan-uplink" = {
|
||||
matchConfig.Name = "wlan0";
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
supportedFilesystems = [ "zfs" ];
|
||||
kernelParams = [ "nohibernate" ];
|
||||
plymouth.enable = false;
|
||||
tmp.useTmpfs = true;
|
||||
tmp.useTmpfs = false;
|
||||
tmp.cleanOnBoot = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 git-lfs ] else [ git ]);
|
||||
++ (
|
||||
if config.networking.hostName == "toaster" then
|
||||
[
|
||||
gitFull
|
||||
git-lfs
|
||||
]
|
||||
else
|
||||
[ git ]
|
||||
);
|
||||
|
||||
environment.variables =
|
||||
let
|
||||
|
|
|
@ -5,18 +5,15 @@
|
|||
dino
|
||||
ffmpeg-full
|
||||
firefox-wayland
|
||||
vivaldi
|
||||
vivaldi-ffmpeg-codecs
|
||||
gimp
|
||||
inkscape
|
||||
signal-desktop
|
||||
tdesktop
|
||||
telegram-desktop
|
||||
tor-browser
|
||||
wl-clipboard
|
||||
yt-dlp
|
||||
element-desktop
|
||||
discord
|
||||
spotify
|
||||
mpv
|
||||
];
|
||||
programs.steam.enable = true;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Loading…
Add table
Reference in a new issue