tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Various tweaks

Browse source 
- add nix-alien
- switch to nix-ld-rs from nix-ld
- fix envfs by upgrading to flake version from nixpkgs
- add rustdesk to nix-pulse
- fix rust-motd config for other systems
This commit is contained in:
Tristan D. 2024-01-18 18:08:19 +01:00
parent 0bb77dcf90
commit 72c93dbff4
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
7 changed files with 326 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

301
flake.lock generated
View file

@ -82,7 +82,60 @@
"type": "github" "type": "github"
} }
}, },
"envfs": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1704757366,
"narHash": "sha256-0jgkqJkx9+C2WO4GXTizrAa9nVEWqhFru2Zjf5TNPvg=",
"owner": "Mic92",
"repo": "envfs",
"rev": "2c4a85dd313618199593cc266c63dc2e44e06322",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "envfs",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -99,6 +152,27 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"envfs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@ -116,7 +190,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixtheplanet", "nixtheplanet",
@ -170,6 +244,42 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -208,8 +318,8 @@
}, },
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1701009247, "lastModified": 1701009247,
@ -266,7 +376,66 @@
"type": "github" "type": "github"
} }
}, },
"nix-alien": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nix-filter": "nix-filter",
"nix-index-database": "nix-index-database",
"nixpkgs": [
"nix-alien",
"nix-index-database",
"nixpkgs"
]
},
"locked": {
"lastModified": 1705306460,
"narHash": "sha256-tV42EZ0GAYDKUu8IUaeZgSsOBtp/1IO9jEkHpOj5K94=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "f43ce845467ad2b90df34323dbed3de9f17471d7",
"type": "github"
},
"original": {
"owner": "thiagokokada",
"repo": "nix-alien",
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1701697642,
"narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "c843418ecfd0344ecb85844b082ff5675e02c443",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1705282324,
"narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-index-database_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -286,9 +455,29 @@
"type": "github" "type": "github"
} }
}, },
"nix-ld-rs": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1699781621,
"narHash": "sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM=",
"owner": "nix-community",
"repo": "nix-ld-rs",
"rev": "5806f307048a9ae9e3e88cc48006d4d0b2df4410",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-ld-rs",
"type": "github"
}
},
"nix-wallpaper": { "nix-wallpaper": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -310,7 +499,7 @@
}, },
"nixinate": { "nixinate": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1702325609, "lastModified": 1702325609,
@ -407,6 +596,38 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1704722960,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1699099776,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1653060744, "lastModified": 1653060744,
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
@ -422,7 +643,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1704874635, "lastModified": 1704874635,
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
@ -438,7 +659,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1697723726, "lastModified": 1697723726,
"narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
@ -454,7 +675,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1701718080, "lastModified": 1701718080,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
@ -472,9 +693,9 @@
}, },
"nixtheplanet": { "nixtheplanet": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts_2",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_7",
"osx-kvm": "osx-kvm" "osx-kvm": "osx-kvm"
}, },
"locked": { "locked": {
@ -547,7 +768,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_3",
"flake-utils": [ "flake-utils": [
"nix-wallpaper", "nix-wallpaper",
"flake-utils" "flake-utils"
@ -578,12 +799,15 @@
"chaotic": "chaotic", "chaotic": "chaotic",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"envfs": "envfs",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-index-database": "nix-index-database", "nix-alien": "nix-alien",
"nix-index-database": "nix-index-database_2",
"nix-ld-rs": "nix-ld-rs",
"nix-wallpaper": "nix-wallpaper", "nix-wallpaper": "nix-wallpaper",
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixtheplanet": "nixtheplanet", "nixtheplanet": "nixtheplanet",
"nur": "nur", "nur": "nur",
@ -620,6 +844,57 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"envfs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"yafas": { "yafas": {
"inputs": { "inputs": {
"flake-schemas": [ "flake-schemas": [

35
flake.nix
View file

@ -47,7 +47,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
nix-alien.url = "github:thiagokokada/nix-alien";
nixtheplanet.url = "github:matthewcroughan/nixtheplanet"; nixtheplanet.url = "github:matthewcroughan/nixtheplanet";
envfs = {
url = "github:Mic92/envfs";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-ld-rs.url = "github:nix-community/nix-ld-rs";
}; };
outputs = outputs =
@ -64,6 +70,7 @@
, nix-index-database , nix-index-database
, disko , disko
, chaotic , chaotic
, envfs
, ... , ...
} @ inputs: } @ inputs:
let let
@ -80,6 +87,8 @@
unstable-os-overlay unstable-os-overlay
unstable-pkgs-overlay unstable-pkgs-overlay
emacs-overlay.overlay emacs-overlay.overlay
inputs.nix-alien.overlays.default
inputs.nix-ld-rs.overlays.default
]; ];
pkgs-args = { pkgs-args = {
inherit system; inherit system;
@ -88,18 +97,19 @@
allowUnfree = true; allowUnfree = true;
packageOverrides = pkgs: { packageOverrides = pkgs: {
steam = pkgs.steam.override { steam = pkgs.steam.override {
extraPkgs = pkgs: with pkgs.unstable-os; [ extraPkgs = pkgs:
xorg.libXcursor with pkgs.unstable-os; [
xorg.libXi xorg.libXcursor
xorg.libXinerama xorg.libXi
xorg.libXScrnSaver xorg.libXinerama
libpng xorg.libXScrnSaver
libpulseaudio libpng
libvorbis libpulseaudio
stdenv.cc.cc.lib libvorbis
libkrb5 stdenv.cc.cc.lib
keyutils libkrb5
]; keyutils
];
}; };
}; };
permittedInsecurePackages = [ permittedInsecurePackages = [
@ -122,6 +132,7 @@
nur.nixosModules.nur nur.nixosModules.nur
chaotic.nixosModules.default chaotic.nixosModules.default
nixtheplanet.nixosModules.macos-ventura nixtheplanet.nixosModules.macos-ventura
envfs.nixosModules.envfs
]; ];
args = { args = {
inherit self; inherit self;

3
home-mods/firefox/default.nix
View file

@ -51,6 +51,9 @@
clearurls clearurls
consent-o-matic consent-o-matic
darkreader darkreader
dearrow
deutsch-de-language-pack
dictionary-german
localcdn localcdn
plasma-integration plasma-integration
privacy-badger privacy-badger

10
os-mods/amdgpu/default.nix
View file

@ -18,7 +18,7 @@
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" "L+ /opt/rocm/hip - - - - ${pkgs.unstable-os.rocmPackages.clr}"
]; ];
hardware.opengl = { hardware.opengl = {
driSupport = true; driSupport = true;
@ -34,8 +34,6 @@
obs-studio-plugins.obs-vaapi # TODO check if obs is enabled obs-studio-plugins.obs-vaapi # TODO check if obs is enabled
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-vaapi gst_all_1.gst-vaapi
vulkan-tools
libva-utils
]; ];
extraPackages32 = with pkgs.unstable-os; [ extraPackages32 = with pkgs.unstable-os; [
driversi686Linux.amdvlk driversi686Linux.amdvlk
@ -46,4 +44,10 @@
# Force radv # Force radv
environment.variables.AMD_VULKAN_ICD = "RADV"; environment.variables.AMD_VULKAN_ICD = "RADV";
environment.systemPackages = with pkgs.unstable-os; [
vulkan-tools
libva-utils
# nixgl.nixGLIntel
# nixgl.nixVulkanIntel
];
} }

6
os-mods/common/default.nix
View file

@ -65,6 +65,7 @@
fish fish
figlet figlet
neovim # editor neovim # editor
nix-alien
veracrypt veracrypt
git git
vim # fallback ed vim # fallback ed
@ -101,8 +102,8 @@
}; };
filesystems = { filesystems = {
btrfsroot = "/media/@btrfsroot"; root = "/";
sandisk = "/media/SanDisk"; home = "/home";
}; };
memory.swap_pos = "beside"; memory.swap_pos = "beside";
@ -123,6 +124,7 @@
]; ];
}; };
nix-ld.enable = true; nix-ld.enable = true;
nix-ld.package = pkgs.nix-ld-rs;
command-not-found.enable = false; command-not-found.enable = false;
nix-index-database.comma.enable = true; nix-index-database.comma.enable = true;

1
systems/nixos-he4/disko.nix
View file

@ -65,7 +65,6 @@
# #
############################## ##############################
{ {
# The manual definitions are generated by nixos-generate-config # The manual definitions are generated by nixos-generate-config
# the commented out stuff are partitions created by disko # the commented out stuff are partitions created by disko
# bcachefs is not handled well by disko so it is handled seperately # bcachefs is not handled well by disko so it is handled seperately

1
systems/nixos-pulse/default.nix
View file

@ -147,6 +147,7 @@
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs.unstable-os; [
android-tools android-tools
android-udev-rules android-udev-rules
rustdesk
]; ];
hardware = { hardware = {