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": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739546930,
|
"lastModified": 1740253065,
|
||||||
"narHash": "sha256-m9s8XjIFd9ByX45/mnsryQa0G5ncMjOBJE4kAOHPoUI=",
|
"narHash": "sha256-ucwXcftJ7DHjk1UA2LmfHXkDPoCgfB4uadwFUCBvc8w=",
|
||||||
"rev": "1077bc626e8dfc153524da40eddad46ef893d66e",
|
"rev": "82c7e76c9c2d829dc11c22b32173a40056cc44ef",
|
||||||
"type": "tarball",
|
"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": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -387,11 +387,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738816619,
|
"lastModified": 1740089251,
|
||||||
"narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
|
"narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
|
"rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -403,11 +403,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739484910,
|
"lastModified": 1739923778,
|
||||||
"narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
|
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
|
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -447,11 +447,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739446958,
|
"lastModified": 1739866667,
|
||||||
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
|
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
|
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -49,6 +49,12 @@
|
||||||
options = [ "zfsutil" ];
|
options = [ "zfsutil" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileSystems."/tmp" = {
|
||||||
|
device = "zpool/nocomp/tmp";
|
||||||
|
fsType = "zfs";
|
||||||
|
options = [ "zfsutil" ];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/A170-F83D";
|
device = "/dev/disk/by-uuid/A170-F83D";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
|
|
|
@ -1,11 +1,15 @@
|
||||||
{ lib, pkgs, ... }: {
|
{ lib, pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./mullvad.nix
|
./mullvad.nix
|
||||||
./dumpdvb.nix
|
./dumpdvb.nix
|
||||||
./zw.nix
|
./zw.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ iwgtk impala ];
|
environment.systemPackages = with pkgs; [
|
||||||
|
iwgtk
|
||||||
|
impala
|
||||||
|
];
|
||||||
|
|
||||||
# kick out networkmanager
|
# kick out networkmanager
|
||||||
networking.networkmanager.enable = lib.mkForce false;
|
networking.networkmanager.enable = lib.mkForce false;
|
||||||
|
@ -48,8 +52,12 @@
|
||||||
DHCP = "yes";
|
DHCP = "yes";
|
||||||
IPv6AcceptRA = true;
|
IPv6AcceptRA = true;
|
||||||
};
|
};
|
||||||
dhcpV4Config = { RouteMetric = 666; };
|
dhcpV4Config = {
|
||||||
dhcpV6Config = { RouteMetric = 666; };
|
RouteMetric = 666;
|
||||||
|
};
|
||||||
|
dhcpV6Config = {
|
||||||
|
RouteMetric = 666;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
"wlan-uplink" = {
|
"wlan-uplink" = {
|
||||||
matchConfig.Name = "wlan0";
|
matchConfig.Name = "wlan0";
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
supportedFilesystems = [ "zfs" ];
|
supportedFilesystems = [ "zfs" ];
|
||||||
kernelParams = [ "nohibernate" ];
|
kernelParams = [ "nohibernate" ];
|
||||||
plymouth.enable = false;
|
plymouth.enable = false;
|
||||||
tmp.useTmpfs = true;
|
tmp.useTmpfs = false;
|
||||||
|
tmp.cleanOnBoot = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
exfatprogs
|
exfatprogs
|
||||||
nmap
|
nmap
|
||||||
bind
|
bind
|
||||||
nnn
|
|
||||||
lf
|
lf
|
||||||
man-pages
|
man-pages
|
||||||
unzip
|
unzip
|
||||||
|
@ -50,8 +49,17 @@
|
||||||
sshfs
|
sshfs
|
||||||
whois
|
whois
|
||||||
mtr
|
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 =
|
environment.variables =
|
||||||
let
|
let
|
||||||
|
|
|
@ -5,18 +5,15 @@
|
||||||
dino
|
dino
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
firefox-wayland
|
firefox-wayland
|
||||||
vivaldi
|
|
||||||
vivaldi-ffmpeg-codecs
|
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
signal-desktop
|
signal-desktop
|
||||||
tdesktop
|
telegram-desktop
|
||||||
tor-browser
|
tor-browser
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
yt-dlp
|
yt-dlp
|
||||||
element-desktop
|
element-desktop
|
||||||
discord
|
discord
|
||||||
spotify
|
|
||||||
mpv
|
mpv
|
||||||
];
|
];
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
|
|
|
@ -26,7 +26,13 @@
|
||||||
twemoji-color-font
|
twemoji-color-font
|
||||||
twitter-color-emoji
|
twitter-color-emoji
|
||||||
iosevka-bin
|
iosevka-bin
|
||||||
(nerdfonts.override { fonts = [ "Hack" "3270" ]; })
|
cozette
|
||||||
|
(nerdfonts.override {
|
||||||
|
fonts = [
|
||||||
|
"Hack"
|
||||||
|
"3270"
|
||||||
|
];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.enableDefaultPackages = true;
|
fonts.enableDefaultPackages = true;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
# General Desktop-related config
|
# General Desktop-related config
|
||||||
{ pkgs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
|
let
|
||||||
|
unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./desktop-software.nix
|
./desktop-software.nix
|
||||||
|
@ -19,11 +22,12 @@
|
||||||
termusic
|
termusic
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
xdg-utils
|
xdg-utils
|
||||||
foot
|
|
||||||
qt5.qtwayland
|
qt5.qtwayland
|
||||||
bashmount
|
bashmount
|
||||||
nautilus
|
|
||||||
audacity
|
audacity
|
||||||
|
spotify-player
|
||||||
|
zathura
|
||||||
|
ncdu
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable sound.
|
# Enable sound.
|
||||||
|
@ -61,16 +65,15 @@
|
||||||
'';
|
'';
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
adwaita-icon-theme
|
adwaita-icon-theme
|
||||||
alacritty
|
|
||||||
bluetui
|
bluetui
|
||||||
foot
|
foot
|
||||||
gammastep
|
gammastep
|
||||||
graphicsmagick
|
graphicsmagick
|
||||||
grim
|
grim
|
||||||
i3status-rust
|
unstablepkgs.i3status-rust
|
||||||
impala
|
impala
|
||||||
kanshi
|
kanshi
|
||||||
mako
|
swaynotificationcenter
|
||||||
pamixer
|
pamixer
|
||||||
rofi-wayland
|
rofi-wayland
|
||||||
slurp
|
slurp
|
||||||
|
@ -78,6 +81,7 @@
|
||||||
swaylock
|
swaylock
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wl-mirror
|
wl-mirror
|
||||||
|
xfce.thunar
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue