Compare commits
5 Commits
e7b1f5acaf
...
90c612bb57
| Author | SHA1 | Date | |
|---|---|---|---|
| 90c612bb57 | |||
| f08555296c | |||
| 44404e02a0 | |||
| 65e5fd2d99 | |||
| ddb1d3c8d2 |
@@ -4,9 +4,7 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
/etc/nixos/hardware-configuration.nix
|
||||
];
|
||||
@@ -50,6 +48,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
# Set <nixpkgs> correctly
|
||||
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||
|
||||
## Optimise Nix store on rebuild and collect garbage as a service
|
||||
nix.optimise.automatic = true;
|
||||
nix.gc = {
|
||||
@@ -154,17 +155,13 @@
|
||||
"docker"
|
||||
"wheel"
|
||||
];
|
||||
packages =
|
||||
with pkgs;
|
||||
let
|
||||
input =
|
||||
{
|
||||
packages = with pkgs; let
|
||||
input = {
|
||||
package,
|
||||
output ? "default",
|
||||
}:
|
||||
inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
|
||||
wrap =
|
||||
{
|
||||
wrap = {
|
||||
name,
|
||||
pkg,
|
||||
modules,
|
||||
@@ -178,8 +175,7 @@
|
||||
--prefix PATH : ${pkgs.lib.makeBinPath modules}
|
||||
'';
|
||||
};
|
||||
in
|
||||
[
|
||||
in [
|
||||
# Ricing
|
||||
## Desktop
|
||||
bibata-cursors
|
||||
@@ -218,6 +214,7 @@
|
||||
|
||||
## Tools
|
||||
lazygit
|
||||
git-secret
|
||||
p7zip-rar
|
||||
any-nix-shell
|
||||
bluetui
|
||||
@@ -240,6 +237,7 @@
|
||||
syncthing
|
||||
jellyfin-tui
|
||||
devenv
|
||||
nix-output-monitor
|
||||
|
||||
# Apps
|
||||
## Actual Useful Stuff
|
||||
@@ -304,7 +302,6 @@
|
||||
|
||||
# System Packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
||||
# Utilities
|
||||
inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
|
||||
vim
|
||||
@@ -330,8 +327,11 @@
|
||||
libnotify
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
pinentryPackage = pkgs.pinentry-all;
|
||||
};
|
||||
|
||||
# The comment
|
||||
system.stateVersion = "25.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
networking.hostName = "mobile02"; # Define your hostname.
|
||||
|
||||
# Opengl and vulkan
|
||||
@@ -48,5 +46,4 @@
|
||||
};
|
||||
|
||||
programs.steam.enable = true;
|
||||
|
||||
}
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
}: {
|
||||
networking.hostName = "HACKSTATION";
|
||||
|
||||
# Enable nix-ld to run unpatched binaries
|
||||
@@ -30,10 +28,16 @@
|
||||
extraPackages = with pkgs; [
|
||||
libva-vdpau-driver
|
||||
libvdpau-va-gl
|
||||
rocmPackages.clr.icd
|
||||
];
|
||||
enable32Bit = true;
|
||||
};
|
||||
|
||||
# For rOCM
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}"
|
||||
];
|
||||
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
|
||||
boot.kernelParams = [
|
||||
@@ -128,6 +132,7 @@
|
||||
ffmpeg
|
||||
inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
inputs.cracked-davinci.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
inputs.woomer.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
|
||||
# wine
|
||||
wineWow64Packages.stable
|
||||
|
||||
87
flake.lock
generated
87
flake.lock
generated
@@ -84,6 +84,21 @@
|
||||
"url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1781825982,
|
||||
"narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"doot": {
|
||||
"inputs": {
|
||||
"doot-src": "doot-src",
|
||||
@@ -233,6 +248,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fsel": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
@@ -765,11 +798,11 @@
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1781074563,
|
||||
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
|
||||
"lastModified": 1782467914,
|
||||
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
|
||||
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -821,11 +854,11 @@
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781453653,
|
||||
"narHash": "sha256-5XhbIAdcoVblquSRVbg5HUnRni96ksMqzGNTEGSb3Cg=",
|
||||
"lastModified": 1782650144,
|
||||
"narHash": "sha256-E6SKjvY6Vz2mRok6ml8Dm4lMgUyfgtwHgwLlo93SLpI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "e46d931775275918876fcde65d03e4dcffa45efa",
|
||||
"revCount": 83,
|
||||
"rev": "45739fc4cf0ba3cdefab6593a0d629b637bb341a",
|
||||
"revCount": 88,
|
||||
"type": "git",
|
||||
"url": "file:///home/user01/.dotfiles/.config/nvim"
|
||||
},
|
||||
@@ -916,6 +949,7 @@
|
||||
"otter-launcher": "otter-launcher",
|
||||
"sls-steam": "sls-steam",
|
||||
"way-edges": "way-edges",
|
||||
"woomer": "woomer",
|
||||
"wshowkeys": "wshowkeys"
|
||||
}
|
||||
},
|
||||
@@ -1065,6 +1099,21 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_7": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
@@ -1104,9 +1153,31 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"woomer": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1782507996,
|
||||
"narHash": "sha256-hO+SIA6Q41hiwZBFGHBjkOsRQFUcO0SbJqmYeyy2sfM=",
|
||||
"owner": "voidarclabs",
|
||||
"repo": "woomer",
|
||||
"rev": "572844bdae8dded0bbad9e23ca354dcd857f6b98",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "voidarclabs",
|
||||
"repo": "woomer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wshowkeys": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
||||
19
flake.nix
19
flake.nix
@@ -10,6 +10,10 @@
|
||||
|
||||
# Apps
|
||||
sls-steam.url = "github:AceSLS/SLSsteam";
|
||||
woomer = {
|
||||
url = "github:voidarclabs/woomer";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
chataigne.url = "./modules/chataigne";
|
||||
norgolith = {
|
||||
url = "github:NTBBloodbath/norgolith";
|
||||
@@ -47,31 +51,28 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
|
||||
hardwareConfig = import /etc/nixos/hardware-configuration.nix;
|
||||
common = import ./configs/common.nix;
|
||||
|
||||
mkSystem =
|
||||
extraModules:
|
||||
mkSystem = extraModules:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {inherit inputs;};
|
||||
modules = [
|
||||
modules =
|
||||
[
|
||||
common
|
||||
hardwareConfig
|
||||
]
|
||||
++ extraModules;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
mobile02 = mkSystem [./configs/configuration-laptop.nix];
|
||||
hackstation = mkSystem [
|
||||
|
||||
@@ -5,9 +5,10 @@
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, nixpkgs }:
|
||||
let
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs {inherit system;};
|
||||
|
||||
@@ -55,8 +56,7 @@
|
||||
"Development"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
# packages.${system}.default = chataigne-bin;
|
||||
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
services.libinput.enable = true;
|
||||
|
||||
services.displayManager.defaultSession = "hyprland";
|
||||
|
||||
Reference in New Issue
Block a user