This commit is contained in:
Tao Tien 2023-10-09 17:54:57 -07:00
parent 42891ebfba
commit b2797a94ba
6 changed files with 37 additions and 44 deletions

View file

@ -1,5 +1,6 @@
{ pkgs, ... }: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
freecad
# alsa-lib # alsa-lib
# alsa-oss # alsa-oss
# clang # clang
@ -10,20 +11,20 @@
# openssl # openssl
# pkg-config # pkg-config
# pkgconfig # pkgconfig
# rustup rustup
# udev # udev
nixpkgs-fmt nixpkgs-fmt
nil nil
expat # expat
fontconfig # fontconfig
freetype # freetype
freetype.dev # freetype.dev
libGL # libGL
pkgconfig # pkgconfig
xorg.libX11 # xorg.libX11
xorg.libXcursor # xorg.libXcursor
xorg.libXi # xorg.libXi
xorg.libXrandr # xorg.libXrandr
bacon bacon
unstable.cargo unstable.cargo
unstable.cargo-feature unstable.cargo-feature
@ -47,25 +48,6 @@
"electron-12.2.3" "electron-12.2.3"
]; ];
environment.variables = {
# LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.libclang.lib ];
# LD_LIBRARY_PATH =
# builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" pkgs;
LD_LIBRARY_PATH = builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" [
pkgs.expat
pkgs.fontconfig
pkgs.freetype
pkgs.freetype.dev
pkgs.libGL
pkgs.pkgconfig
pkgs.xorg.libX11
pkgs.xorg.libXcursor
pkgs.xorg.libXi
pkgs.xorg.libXrandr
pkgs.vulkan-loader
];
};
services.udev.extraRules = '' services.udev.extraRules = ''
SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb"
SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg" SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg"

View file

@ -11,6 +11,7 @@
(opts // { what = "//100.86.160.104/anime"; where = "/mnt/uwuraid/anime"; }) (opts // { what = "//100.86.160.104/anime"; where = "/mnt/uwuraid/anime"; })
(opts // { what = "//100.86.160.104/backup"; where = "/mnt/uwuraid/backup"; }) (opts // { what = "//100.86.160.104/backup"; where = "/mnt/uwuraid/backup"; })
(opts // { what = "//100.86.160.104/everything"; where = "/mnt/uwuraid/everything"; }) (opts // { what = "//100.86.160.104/everything"; where = "/mnt/uwuraid/everything"; })
(opts // { what = "//100.86.160.104/jellyfin"; where = "/mnt/uwuraid/jellyfin"; })
(opts // { what = "//100.86.160.104/movies"; where = "/mnt/uwuraid/movies"; }) (opts // { what = "//100.86.160.104/movies"; where = "/mnt/uwuraid/movies"; })
(opts // { what = "//100.86.160.104/music"; where = "/mnt/uwuraid/music"; }) (opts // { what = "//100.86.160.104/music"; where = "/mnt/uwuraid/music"; })
(opts // { what = "//100.86.160.104/photos"; where = "/mnt/uwuraid/photos"; }) (opts // { what = "//100.86.160.104/photos"; where = "/mnt/uwuraid/photos"; })
@ -28,6 +29,7 @@
(opts // { where = "/mnt/uwuraid/anime"; }) (opts // { where = "/mnt/uwuraid/anime"; })
(opts // { where = "/mnt/uwuraid/backup"; }) (opts // { where = "/mnt/uwuraid/backup"; })
(opts // { where = "/mnt/uwuraid/everything"; }) (opts // { where = "/mnt/uwuraid/everything"; })
(opts // { where = "/mnt/uwuraid/jellyfin"; })
(opts // { where = "/mnt/uwuraid/movies"; }) (opts // { where = "/mnt/uwuraid/movies"; })
(opts // { where = "/mnt/uwuraid/music"; }) (opts // { where = "/mnt/uwuraid/music"; })
(opts // { where = "/mnt/uwuraid/photos"; }) (opts // { where = "/mnt/uwuraid/photos"; })

24
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1695887975, "lastModified": 1696614066,
"narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696019113, "lastModified": 1693663421,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "rev": "e56990880811a451abd32515698c712788be5720",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,11 +66,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1695830400, "lastModified": 1696375444,
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1695825837, "lastModified": 1696374741,
"narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "rev": "8a4c17493e5c39769f79117937c79e1c88de6729",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -25,6 +25,8 @@
services.openssh.enable = true; services.openssh.enable = true;
services.flatpak.enable = lib.mkDefault true; services.flatpak.enable = lib.mkDefault true;
services.printing.enable = lib.mkDefault true; services.printing.enable = lib.mkDefault true;
services.smartd.enable = true;
services.btrfs.autoScrub.enable = lib.mkDefault true; services.btrfs.autoScrub.enable = lib.mkDefault true;
environment.variables = { environment.variables = {

View file

@ -92,7 +92,7 @@
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = true;
# package = config.boot.kernelPackages.nvidiaPackages.beta; # package = config.boot.kernelPackages.nvidiaPackages.beta;
package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.production; package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.vulkan_beta;
}; };
# enable core and mem freq sliders for nvidia # enable core and mem freq sliders for nvidia
services.xserver.deviceSection = '' services.xserver.deviceSection = ''

View file

@ -14,14 +14,17 @@
aspell aspell
aspellDicts.en aspellDicts.en
bottles bottles
cider # cider
darktable darktable
deluge deluge
discord discord
gh gh
jellyfin-media-player
jellyfin-mpv-shim
keepassxc keepassxc
libsForQt5.kcharselect libsForQt5.kcharselect
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde
mosh
obs-studio obs-studio
ocs-url ocs-url
onlyoffice-bin onlyoffice-bin
@ -38,11 +41,15 @@
unstable.starship unstable.starship
unstable.typst unstable.typst
unstable.wezterm unstable.wezterm
unstable.joshuto
unstable.yazi
virt-manager virt-manager
zathura zathura
zoom-us zoom-us
zoxide zoxide
onefetch onefetch
thunderbird
birdtray
]; ];
environment.shells = with pkgs; [ unstable.nushell ]; environment.shells = with pkgs; [ unstable.nushell ];