Compare commits

..

No commits in common. "7f6f36378ce3f8a0b338c58dedd865aef4ceebdf" and "4eea3aa57d7e7b2c51f3cdc2f06a473f1b5b2244" have entirely different histories.

6 changed files with 87 additions and 82 deletions

View file

@ -29,66 +29,62 @@ in {
) )
++ ( ++ (
lib.lists.optionals userConfig.isDesktopUser ( lib.lists.optionals userConfig.isDesktopUser (
(with pkgs; [ with pkgs; [
# helvetica font # helvetica font
aileron aileron
gnomeExtensions.dash-to-dock gnomeExtensions.dash-to-dock
#foss platforms
signal-desktop
bitwarden
ungoogled-chromium
libreoffice
inkscape
gimp
krita
freecad
# cura
# kicad-small
makemkv
transmission_4-gtk
onionshare
# rhythmbox
(lib.mkIf hardware.graphicsAcceleration.enable obs-studio)
# wireshark
# rpi-imager
# fritzing
mfoc
tor-browser
anki
pdfarranger
calibre
qbittorrent
# proprietary platforms
discord
obsidian
# steam
(lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
# development tools # development tools
# androidStudioPackages.canary
jetbrains.idea-community
dbeaver-bin dbeaver-bin
bruno bruno
qFlipper
proxmark3 proxmark3
])
++ (
lib.lists.optionals hardware.directAccess.enable (with pkgs; [
#foss platforms
signal-desktop-bin
bitwarden
ungoogled-chromium
libreoffice
inkscape
gimp
krita
freecad
# cura
# kicad-small
makemkv
onionshare
# rhythmbox
(lib.mkIf hardware.graphicsAcceleration.enable obs-studio)
# wireshark
# rpi-imager
# fritzing
mfoc
tor-browser
anki
pdfarranger
calibre
qbittorrent
# proprietary platforms # system tools
discord protonvpn-gui
obsidian openvpn
# steam noisetorch
(lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
# development tools # hardware management tools
# androidStudioPackages.canary (lib.mkIf hardware.piperMouse.enable piper)
jetbrains.idea-community (lib.mkIf hardware.openRGB.enable openrgb)
qFlipper (lib.mkIf hardware.viaKeyboard.enable via)
]
# system tools
protonvpn-gui
openvpn
noisetorch
# hardware management tools
(lib.mkIf hardware.piperMouse.enable piper)
(lib.mkIf hardware.openRGB.enable openrgb)
(lib.mkIf hardware.viaKeyboard.enable via)
])
)
) )
); );
}; };

View file

@ -17,10 +17,6 @@
}; };
eve.isDesktopUser = true; eve.isDesktopUser = true;
}; };
hardware = {
directAccess.enable = true;
};
}; };
environment.systemPackages = [ environment.systemPackages = [

View file

@ -28,7 +28,6 @@
viaKeyboard.enable = true; viaKeyboard.enable = true;
openRGB.enable = true; openRGB.enable = true;
graphicsAcceleration.enable = true; graphicsAcceleration.enable = true;
directAccess.enable = true;
}; };
}; };

66
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744145203, "lastModified": 1743524395,
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "narHash": "sha256-BXVan1TBC2iDJODFvCoz2XrbAOyZ9KWjwyIkOYwO4Mc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "rev": "f6dbc8952df9e40afafbe38449751bfad12d64f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,17 +22,18 @@
}, },
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1744586538, "lastModified": 1743527765,
"narHash": "sha256-cg6T6QnfIwAino7ruCQdqB4g6mj2aKg8Rbqjo6LiBDs=", "narHash": "sha256-Y7TQ4bseuTjnXu3/Km8ylRIkyiYrZjwp5cqcb/7bJzs=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "a3fe27c14a5cdd64a5319b3f83a1c65e29c9b4e1", "rev": "d7c0454483cf3644c8e5d3094ad2f1ee2cdcc6b0",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -58,6 +59,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@ -82,11 +98,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744600951, "lastModified": 1743527271,
"narHash": "sha256-LNAAfQTDXSwtYYlh/v/tMwnCqeQAEHlBC9PgyQK5b/Q=", "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e980d0e0e216f527ea73cfd12c7b019eceffa7f1", "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +133,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744478979, "lastModified": 1743496612,
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "43975d782b418ebf4969e9ccba82466728c2851b", "rev": "73d59580d01e9b9f957ba749f336a272869c42dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,17 +169,17 @@
}, },
"nix-vscode-extensions": { "nix-vscode-extensions": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1744595919, "lastModified": 1743473153,
"narHash": "sha256-lFuezewhTch2FFZfB6Bx31Ls3+ixt2UYp7rJtpOlgFI=", "narHash": "sha256-RVOgS/5+Nd/Oq3aXhIk8Y3aAILCYwm8nmrvLogy1hI0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "ea3fe071c83dae7e6a485f7f648b4914eabea683", "rev": "57ed10b9d4395687b38277f422fbb0700f65e632",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +190,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1744366945, "lastModified": 1743420942,
"narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +206,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744463964, "lastModified": 1743315132,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +259,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744518500, "lastModified": 1743502316,
"narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -29,6 +29,7 @@
desktopManager.xterm.enable = false; desktopManager.xterm.enable = false;
excludePackages = with pkgs; [ excludePackages = with pkgs; [
xterm xterm
transmission_4-qt
atomix # puzzle game atomix # puzzle game
cheese # webcam tool cheese # webcam tool
epiphany # web browser epiphany # web browser

View file

@ -12,8 +12,5 @@
graphicsAcceleration = { graphicsAcceleration = {
enable = lib.mkEnableOption "host has a gpu for graphical acceleration"; enable = lib.mkEnableOption "host has a gpu for graphical acceleration";
}; };
directAccess = {
enable = lib.mkEnableOption "can a host be used on its own";
};
}; };
} }