Compare commits
No commits in common. "main" and "NOlaptop" have entirely different histories.
8 changed files with 52 additions and 48 deletions
|
|
@ -16,13 +16,10 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
/*
|
(with pkgs-last-building; [
|
||||||
(with pkgs-last-building; [
|
# lutris
|
||||||
# lutris
|
])
|
||||||
])
|
++ (with pkgs; [
|
||||||
++
|
|
||||||
*/
|
|
||||||
with pkgs; [
|
|
||||||
# keep-sorted start
|
# keep-sorted start
|
||||||
# parsec-bin
|
# parsec-bin
|
||||||
# yuzu # nintendo can suck the shit out of my asshole
|
# yuzu # nintendo can suck the shit out of my asshole
|
||||||
|
|
@ -38,7 +35,7 @@ in {
|
||||||
temurin-jre-bin-17
|
temurin-jre-bin-17
|
||||||
wine
|
wine
|
||||||
# keep-sorted end
|
# keep-sorted end
|
||||||
];
|
]);
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [25565];
|
networking.firewall.allowedTCPPorts = [25565];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@
|
||||||
opts = {
|
opts = {
|
||||||
type = "cifs";
|
type = "cifs";
|
||||||
mountConfig = {
|
mountConfig = {
|
||||||
Options = "_netdev,noserverino,nounix,nobrl,noperm,noauto,noatime,async,rw,x-systemd.automount,x-systemd.requires=tailscaled.service,x-systemd.automount-idle-timeout=60,nofail,soft,softrw,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777,echo_interval=30,echo_retries=2,closetimeo=0,vers=3.0,iocharset=utf8";
|
# Options = "noauto,noatime,async,users,rw,x-systemd.automount,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777";
|
||||||
|
Options = "_netdev,noserverino,nounix,nobrl,noperm,noauto,noatime,async,users,rw,x-systemd.automount,x-systemd.requires=network-online.target,nofail,soft,credentials=${config.age.secrets.uwuraid.path},file_mode=0777,dir_mode=0777";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in [
|
in [
|
||||||
|
|
|
||||||
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -389,6 +389,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-last-building": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1754028485,
|
||||||
|
"narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "59e69648d345d6e8fef86158c555730fa12af9de",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "59e69648d345d6e8fef86158c555730fa12af9de",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-regression": {
|
"nixpkgs-regression": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1643052045,
|
"lastModified": 1643052045,
|
||||||
|
|
@ -495,6 +511,7 @@
|
||||||
"nixos-facter-modules": "nixos-facter-modules",
|
"nixos-facter-modules": "nixos-facter-modules",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
|
"nixpkgs-last-building": "nixpkgs-last-building",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
# nixpkgs-last-building.url = "github:NixOS/nixpkgs/64c08a7ca051951c8eae34e3e3cb1e202fe36786";
|
nixpkgs-last-building.url = "github:NixOS/nixpkgs/59e69648d345d6e8fef86158c555730fa12af9de";
|
||||||
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
|
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
|
||||||
nur = {
|
nur = {
|
||||||
url = "github:nix-community/NUR";
|
url = "github:nix-community/NUR";
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
nixos,
|
nixos,
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
# nixpkgs-last-building,
|
nixpkgs-last-building,
|
||||||
nur,
|
nur,
|
||||||
nixos-facter-modules,
|
nixos-facter-modules,
|
||||||
nixos-hardware,
|
nixos-hardware,
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
powerManagement.enable = true;
|
powerManagement.enable = true;
|
||||||
open = true;
|
open = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||||
};
|
};
|
||||||
services.tailscale.useRoutingFeatures = "both";
|
services.tailscale.useRoutingFeatures = "both";
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
|
boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
|
||||||
|
|
|
||||||
|
|
@ -5,24 +5,15 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
# pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system};
|
pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system};
|
||||||
in {
|
in {
|
||||||
programs.gphoto2.enable = true;
|
programs.gphoto2.enable = true;
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
# "electron-39.8.10"
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.tao.packages =
|
users.users.tao.packages =
|
||||||
/*
|
(with pkgs-last-building; [
|
||||||
(with pkgs-last-building; [
|
# oculante # https://nixpk.gs/pr-tracker.html?pr=502921
|
||||||
# oculante # https://nixpk.gs/pr-tracker.html?pr=502921
|
|
||||||
# openscad
|
|
||||||
])
|
])
|
||||||
++ (
|
++ (with pkgs; [
|
||||||
*/
|
|
||||||
with pkgs; [
|
|
||||||
# keep-sorted start sticky_comments=no
|
# keep-sorted start sticky_comments=no
|
||||||
# bitwarden-desktop
|
|
||||||
# bottles
|
# bottles
|
||||||
# boxxy
|
# boxxy
|
||||||
# carapace
|
# carapace
|
||||||
|
|
@ -43,6 +34,7 @@ in {
|
||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
|
# bitwarden-desktop
|
||||||
calibre
|
calibre
|
||||||
darktable
|
darktable
|
||||||
deluge
|
deluge
|
||||||
|
|
@ -96,7 +88,7 @@ in {
|
||||||
zotero
|
zotero
|
||||||
zoxide
|
zoxide
|
||||||
# keep-sorted end
|
# keep-sorted end
|
||||||
];
|
]);
|
||||||
virtualisation.waydroid = {
|
virtualisation.waydroid = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.waydroid-nftables;
|
package = pkgs.waydroid-nftables;
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ rustc-wrapper = "/path/to/sccache"
|
||||||
[unstable]
|
[unstable]
|
||||||
codegen-backend = true
|
codegen-backend = true
|
||||||
|
|
||||||
[profile.dev]
|
[provile.dev]
|
||||||
debug = 0
|
debug = 0
|
||||||
strip = "debuginfo"
|
strip = "debuginfo"
|
||||||
opt-level = 1
|
opt-level = 1
|
||||||
|
|
|
||||||
39
users/vy.nix
39
users/vy.nix
|
|
@ -8,27 +8,24 @@
|
||||||
pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system};
|
pkgs-last-building = inputs.nixpkgs-last-building.legacyPackages.${pkgs.system};
|
||||||
in {
|
in {
|
||||||
users.users.vy.packages =
|
users.users.vy.packages =
|
||||||
/*
|
(with pkgs-last-building; [
|
||||||
(with pkgs-last-building; [
|
oculante # https://nixpk.gs/pr-tracker.html?pr=502921
|
||||||
oculante # https://nixpk.gs/pr-tracker.html?pr=502921
|
])
|
||||||
])
|
++ (with pkgs; [
|
||||||
++ (
|
audacity
|
||||||
*/
|
cosmic-store
|
||||||
with pkgs; [
|
google-chrome
|
||||||
audacity
|
jellyfin-media-player
|
||||||
cosmic-store
|
onlyoffice-desktopeditors
|
||||||
google-chrome
|
rnote
|
||||||
jellyfin-media-player
|
signal-desktop
|
||||||
onlyoffice-desktopeditors
|
signal-desktop
|
||||||
rnote
|
snapper
|
||||||
signal-desktop
|
syncthingtray
|
||||||
signal-desktop
|
toastify
|
||||||
snapper
|
yt-dlp
|
||||||
syncthingtray
|
zoom-us
|
||||||
toastify
|
]);
|
||||||
yt-dlp
|
|
||||||
zoom-us
|
|
||||||
];
|
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue