Compare commits
1 commit
6565c75062
...
593b32b87f
Author | SHA1 | Date | |
---|---|---|---|
Fabian Montero | 593b32b87f |
24
flake.lock
24
flake.lock
|
@ -998,11 +998,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725930920,
|
"lastModified": 1725826545,
|
||||||
"narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
|
"narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
|
"rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1014,11 +1014,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726249500,
|
"lastModified": 1726022314,
|
||||||
"narHash": "sha256-ykW2dN3jL/UXZMlwBd6OZzY13CkYPkCjS1knkNH7E5M=",
|
"narHash": "sha256-VR7O2VQh5aQ0tEHTWPJNvjGjmdHmfqexu3VoAA/sMLM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "0c3404cce1f91b1582168544584c13c60fb23eb2",
|
"rev": "d1d1e8640bbcff47c11c5d8f575d6c47be956089",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1260,11 +1260,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726062873,
|
"lastModified": 1725634671,
|
||||||
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
|
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
|
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1276,11 +1276,11 @@
|
||||||
},
|
},
|
||||||
"vpsadminos": {
|
"vpsadminos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726208697,
|
"lastModified": 1725810385,
|
||||||
"narHash": "sha256-GRcHU1zuJQozu+F3ejHeT+83/nCGIu/evtAPjAGVYfI=",
|
"narHash": "sha256-+6UULi05KMHmLfhlrNGhMdLZUoQeC5Dc1nLFdINyeyI=",
|
||||||
"owner": "vpsfreecz",
|
"owner": "vpsfreecz",
|
||||||
"repo": "vpsadminos",
|
"repo": "vpsadminos",
|
||||||
"rev": "e6e4245dc1e6365a601ddf5022976b14de789e0e",
|
"rev": "37c5eb47ca3f11deac83e4ada20a6c21d5487f29",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
./i3.nix
|
./i3.nix
|
||||||
./polybar.nix
|
./polybar.nix
|
||||||
./startx.nix
|
./startx.nix
|
||||||
./picom.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
picom.enable = true;
|
||||||
dunst.enable = true;
|
dunst.enable = true;
|
||||||
betterlockscreen.enable = true;
|
betterlockscreen.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.picom = {
|
|
||||||
enable = true;
|
|
||||||
fade = true;
|
|
||||||
fadeSteps = [0.1 0.1];
|
|
||||||
fadeDelta = 10;
|
|
||||||
settings = {
|
|
||||||
animations = [
|
|
||||||
{
|
|
||||||
triggers = [
|
|
||||||
"open"
|
|
||||||
"show"
|
|
||||||
];
|
|
||||||
|
|
||||||
preset = "appear";
|
|
||||||
duration = "1";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
triggers = [
|
|
||||||
"close"
|
|
||||||
"hide"
|
|
||||||
];
|
|
||||||
|
|
||||||
preset = "disappear";
|
|
||||||
duration = "1";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
triggers = [
|
|
||||||
"geometry"
|
|
||||||
];
|
|
||||||
preset = "geometry-change";
|
|
||||||
duration = "1";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -7,10 +7,16 @@
|
||||||
with lib; {
|
with lib; {
|
||||||
xsession.enable = true;
|
xsession.enable = true;
|
||||||
|
|
||||||
|
#TODO: why is intel mentioned here? i dont use intel
|
||||||
home.file.".xinitrc".source = let
|
home.file.".xinitrc".source = let
|
||||||
content = ''
|
content =
|
||||||
exec ~/.xsession
|
if config.local.nixos
|
||||||
'';
|
then ''
|
||||||
|
exec ~/.xsession
|
||||||
|
''
|
||||||
|
else ''
|
||||||
|
exec ${pkgs.nixgl.nixGLIntel}/bin/nixGLIntel ~/.xsession
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
pkgs.writeShellScript "xinitrc" content;
|
pkgs.writeShellScript "xinitrc" content;
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,9 +45,6 @@
|
||||||
vlc
|
vlc
|
||||||
vpsfree-client
|
vpsfree-client
|
||||||
vscodium-fhs
|
vscodium-fhs
|
||||||
yubikey-manager
|
|
||||||
yubico-pam
|
|
||||||
yubikey-personalization
|
|
||||||
zip
|
zip
|
||||||
zola
|
zola
|
||||||
zoom-us
|
zoom-us
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}: with lib; {
|
||||||
with lib; {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
(pkgs.callPackage ./package.nix {})
|
(pkgs.callPackage ./package.nix {})
|
||||||
pkgs.protonup
|
pkgs.protonup
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
lib:
|
lib:
|
||||||
with lib; {
|
with lib; {
|
||||||
android_sdk.accept_license = true; #TODO: what the fuck is this
|
android_sdk.accept_license = true; #TODO: what the fuck is this
|
||||||
allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg);
|
allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./yubikey.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
|
@ -76,6 +75,8 @@
|
||||||
extraGroups = ["wheel"];
|
extraGroups = ["wheel"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
virtualisation.libvirtd.qemu.package = pkgs.qemu_kvm;
|
virtualisation.libvirtd.qemu.package = pkgs.qemu_kvm;
|
||||||
virtualisation.libvirtd.qemu.ovmf.enable = true;
|
virtualisation.libvirtd.qemu.ovmf.enable = true;
|
||||||
virtualisation.libvirtd.qemu.ovmf.packages = [pkgs.OVMFFull.fd];
|
virtualisation.libvirtd.qemu.ovmf.packages = [pkgs.OVMFFull.fd];
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services = {
|
|
||||||
pcscd.enable = true;
|
|
||||||
udev.packages = [pkgs.yubikey-personalization];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.etc."pkcs11/modules/ykcs11".text = ''
|
|
||||||
module: ${pkgs.yubico-piv-tool}/lib/libykcs11.so
|
|
||||||
'';
|
|
||||||
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
security.pam = {
|
|
||||||
services = {
|
|
||||||
login.u2fAuth = true;
|
|
||||||
sudo.u2fAuth = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
u2f = {
|
|
||||||
enable = true;
|
|
||||||
debug = true;
|
|
||||||
cue = true;
|
|
||||||
control = "sufficient";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in a new issue