update for 25.05
This commit is contained in:
parent
cac3e749e9
commit
b5a0541aa1
1 changed files with 69 additions and 33 deletions
|
|
@ -12,23 +12,23 @@ let
|
||||||
# #config = config.nixpkgs.config;
|
# #config = config.nixpkgs.config;
|
||||||
# inherit (pkgs) system;
|
# inherit (pkgs) system;
|
||||||
#};
|
#};
|
||||||
hp15c = pkgs.callPackage ./pkgs/hp15c/default.nix { inherit unstable; };
|
#hp15c = pkgs.callPackage ./pkgs/hp15c/default.nix { inherit unstable; };
|
||||||
#nonpareil = pkgs.callPackage ./pkgs/nonpareil/default.nix { inherit pkgs; };
|
#nonpareil = pkgs.callPackage ./pkgs/nonpareil/default.nix { inherit pkgs; };
|
||||||
custom1Password = pkgs.symlinkJoin {
|
#custom1Password = pkgs.symlinkJoin {
|
||||||
name = "1password-gui-custom";
|
# name = "1password-gui-custom";
|
||||||
paths = [ unstable._1password-gui ];
|
# paths = [ unstable._1password-gui ];
|
||||||
buildInputs = [ pkgs.makeWrapper ];
|
# buildInputs = [ pkgs.makeWrapper ];
|
||||||
postBuild = ''
|
# postBuild = ''
|
||||||
# Create directory for our custom policy
|
# # Create directory for our custom policy
|
||||||
mkdir -p $out/share/polkit-1/actions/
|
# mkdir -p $out/share/polkit-1/actions/
|
||||||
|
|
||||||
# Copy the original policy file
|
# # Copy the original policy file
|
||||||
cp ${unstable._1password-gui}/share/polkit-1/actions/com.1password.1Password.policy $out/share/polkit-1/actions/
|
# cp ${unstable._1password-gui}/share/polkit-1/actions/com.1password.1Password.policy $out/share/polkit-1/actions/
|
||||||
|
|
||||||
# Modify the policy file to add the annotation
|
# # Modify the policy file to add the annotation
|
||||||
sed -i '/<action id="com.1password.1Password.unlock">/,/<\/action>/ s|<\/defaults>|<\/defaults>\n <annotate key="org.freedesktop.policykit.owner">unix-user:hunner<\/annotate>|' $out/share/polkit-1/actions/com.1password.1Password.policy
|
# sed -i '/<action id="com.1password.1Password.unlock">/,/<\/action>/ s|<\/defaults>|<\/defaults>\n <annotate key="org.freedesktop.policykit.owner">unix-user:hunner<\/annotate>|' $out/share/polkit-1/actions/com.1password.1Password.policy
|
||||||
'';
|
# '';
|
||||||
};
|
#};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
|
|
@ -67,6 +67,19 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hardware.amdgpu = {
|
||||||
|
opencl.enable = true;
|
||||||
|
amdvlk.enable = true;
|
||||||
|
};
|
||||||
|
hardware.graphics.enable = true;
|
||||||
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
|
services.ollama = {
|
||||||
|
enable = true;
|
||||||
|
loadModels = [ "gemma3" ];
|
||||||
|
acceleration = "rocm";
|
||||||
|
rocmOverrideGfx = "11.0.3";
|
||||||
|
};
|
||||||
|
|
||||||
networking.hostId = "3294c9a2"; # Required for ZFS
|
networking.hostId = "3294c9a2"; # Required for ZFS
|
||||||
networking.hostName = "liminal";
|
networking.hostName = "liminal";
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
@ -157,7 +170,9 @@ in
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
xdgOpenUsePortal = true;
|
||||||
extraPortals = [
|
extraPortals = [
|
||||||
|
pkgs.xdg-desktop-portal-wlr
|
||||||
pkgs.xdg-desktop-portal-gtk
|
pkgs.xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
@ -175,7 +190,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
hardware.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -207,17 +222,21 @@ in
|
||||||
asdf-vm
|
asdf-vm
|
||||||
pinentry-gtk2
|
pinentry-gtk2
|
||||||
gnupg
|
gnupg
|
||||||
unstable.zoom-us
|
#unstable.zoom-us
|
||||||
firefox-devedition
|
firefox-devedition
|
||||||
nodejs
|
nodejs
|
||||||
slack
|
slack
|
||||||
obs-studio
|
|
||||||
mplayer
|
mplayer
|
||||||
ffmpeg
|
ffmpeg
|
||||||
jetbrains-toolbox
|
jetbrains-toolbox
|
||||||
pass
|
pass
|
||||||
diff-so-fancy
|
diff-so-fancy
|
||||||
unstable.webex
|
webex
|
||||||
|
unstable.zed-editor
|
||||||
|
unstable.package-version-server
|
||||||
|
amdgpu_top
|
||||||
|
nixd # for zed
|
||||||
|
goose-cli
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
systemd.user.services = {
|
systemd.user.services = {
|
||||||
|
|
@ -279,21 +298,24 @@ in
|
||||||
xorg.xrandr
|
xorg.xrandr
|
||||||
xorg.xsetroot
|
xorg.xsetroot
|
||||||
xorg.xset
|
xorg.xset
|
||||||
|
xorg.xev
|
||||||
hsetroot
|
hsetroot
|
||||||
redshift
|
redshift
|
||||||
flameshot
|
flameshot
|
||||||
#code-cursor
|
|
||||||
unstable.code-cursor
|
unstable.code-cursor
|
||||||
pwvucontrol
|
pwvucontrol
|
||||||
pamixer
|
pamixer
|
||||||
helvum
|
helvum
|
||||||
hp15c
|
#hp15c
|
||||||
#nonpareil
|
#nonpareil
|
||||||
unstable.framework-tool
|
framework-tool
|
||||||
kitty # for Hyprland
|
kitty # for Hyprland
|
||||||
restic
|
restic
|
||||||
xscreensaver
|
xscreensaver
|
||||||
unzip
|
unzip
|
||||||
|
scarlett2
|
||||||
|
alsa-scarlett-gui
|
||||||
|
xlsx2csv
|
||||||
];
|
];
|
||||||
|
|
||||||
services.clipmenu.enable = true;
|
services.clipmenu.enable = true;
|
||||||
|
|
@ -310,28 +332,34 @@ in
|
||||||
};
|
};
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = unstable.direnv;
|
#package = unstable.direnv;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
nix-direnv.package = unstable.nix-direnv;
|
#nix-direnv.package = unstable.nix-direnv;
|
||||||
};
|
};
|
||||||
programs._1password = {
|
programs._1password = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = unstable._1password-cli;
|
#package = unstable._1password-cli;
|
||||||
};
|
};
|
||||||
#programs._1password-gui = {
|
|
||||||
# enable = true;
|
|
||||||
# package = unstable._1password-gui;
|
|
||||||
# polkitPolicyOwners = [ "hunner" ];
|
|
||||||
#};
|
|
||||||
programs._1password-gui = {
|
programs._1password-gui = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# Use a custom package that includes our modified policy
|
#package = unstable._1password-gui;
|
||||||
package = unstable._1password-gui; #custom1Password;
|
polkitPolicyOwners = [ "hunner" ];
|
||||||
|
};
|
||||||
|
programs.obs-studio = {
|
||||||
|
enable = true;
|
||||||
|
enableVirtualCamera = true;
|
||||||
|
plugins = with pkgs.obs-studio-plugins; [
|
||||||
|
wlrobs
|
||||||
|
obs-backgroundremoval
|
||||||
|
obs-pipewire-audio-capture
|
||||||
|
obs-ndi
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
nerdfonts
|
nerd-fonts.droid-sans-mono
|
||||||
|
nerd-fonts.liberation
|
||||||
|
nerd-fonts.jetbrains-mono
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -371,6 +399,14 @@ in
|
||||||
};
|
};
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
systemd.services.flatpak-repo = {
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
path = [ pkgs.flatpak ];
|
||||||
|
script = ''
|
||||||
|
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
services.fprintd.enable = true;
|
services.fprintd.enable = true;
|
||||||
#security.pam.services = {
|
#security.pam.services = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue