maddie/NixFiles
1
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: maddie:a22d49d481871f67bef5af9fc0729c49b983fcd5
Branches Tags
maddie:development
...
compare: maddie:78614bccb93d92ecb94c583fb2ba522fa5e0b916
Branches Tags
maddie:development

2 Commits
a22d49d481 ... 78614bccb9

Author SHA1 Message Date
Madeleine
78614bccb9
updated flake 2023-08-24 11:00:14 +01:00
Madeleine
2b3ea76893
more apps, fixes for deprecations, more ssh keys 2023-08-24 09:36:13 +01:00
14 changed files with 86 additions and 52 deletions
Show Stats Expand all files Collapse all files

18
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689825754, "lastModified": 1692248770,
"narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=", "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "531c3de7eccf95155828e0cd9f18c25e7f937777", "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689802112, "lastModified": 1692763155,
"narHash": "sha256-Se7oHV/L0dHTQ4xp8MvYafaVdkSzF04Hx5NeloUYHtM=", "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0cb3ac57fca6b52c42e4c0f560185540ae1dfb6c", "rev": "6a20e40acaebf067da682661aa67da8b36812606",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689752456, "lastModified": 1692808169,
"narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=", "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7f256d7da238cb627ef189d56ed590739f42f13b", "rev": "9201b5ff357e781bf014d0330d18555695df7ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
maddie/common/ssh/id_ed25519_sk.pub
View File

@ -1 +0,0 @@
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA1jTkcMhBQQoYqNVLofrNnTbB8RCyzSYmdsnPeoOineAAAABHNzaDo= spy@luna (yubikey)

3
maddie/common/ssh/maddie.pub Normal file
View File

@ -0,0 +1,3 @@
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA1jTkcMhBQQoYqNVLofrNnTbB8RCyzSYmdsnPeoOineAAAABHNzaDo= spy@luna (yubikey)
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO9WsQUnglNetqekCoA6WT0wYNxpUVyNxuktPOHJPBCLJmU9P+YErE915vj4HlYcuOW9UhVajQzLQTcelgs/O8w= M.iPad (Termius)
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBD44bc9OdsIxwNBkdIN5Ce+Wer2gWi+QRcFdOV7+ScIo1QS29wkQJxU90ItcKwqiv+oTBlipV2NSH/YroBSHhQI= M.iPad (Secure ShellFish)

7
maddie/nixos/cider.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
cider
];
}

9
maddie/nixos/gtk.nix
View File

@ -9,16 +9,17 @@
size = 10; size = 10;
}; };
theme = { theme = {
package = pkgs.gruvbox-dark-gtk; package = pkgs.lounge-gtk-theme;
name = "gruvbox-dark"; name = "Lounge-night-compact";
}; };
iconTheme = { iconTheme = {
package = pkgs.zafiro-icons; package = pkgs.whitesur-icon-theme;
name = "Zafiro-icons-Dark"; name = "WhiteSur-dark";
}; };
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
gnome.zenity gnome.zenity
libsForQt5.breeze-gtk
]; ];
} }

7
maddie/nixos/osu.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
osu-lazer-bin
];
}

10
maddie/nixos/qt.nix
View File

@ -1,15 +1,19 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
home.packages = with pkgs; [
libsForQt5.breeze-qt5
];
qt = { qt = {
enable = true; enable = true;
style = { style = {
package = pkgs.adwaita-qt; package = pkgs.libsForQt5.breeze-qt5;
name = "adwaita-dark"; name = "Breeze";
}; };
}; };
home.sessionVariables = { home.sessionVariables = {
QT_STYLE_OVERRIDE = "adwaita-dark"; QT_STYLE_OVERRIDE = "Breeze";
}; };
} }

4
overlays.nix
View File

@ -34,8 +34,8 @@
domain = "git.spyhoodle.me"; domain = "git.spyhoodle.me";
owner = "maddie"; owner = "maddie";
repo = "slstatus"; repo = "slstatus";
rev = "b22f3d8ec8e2d67bbd32f02721d9d8157a46edd4"; rev = "2546de2a4c5ab34d96fb31f75d3a8b7d6840005e";
sha256 = "sha256-OhssKVQArcQAgCavkFaCRvxUM3689t1v3YCv9IW7osU="; sha256 = "sha256-aoEd4GGA+jkoxvJlRlXqMiaxM8mZe4Jt5CtKKtnu+rQ=";
}; };
}); });
slock = prev.slock.overrideAttrs (oldAttrs: { slock = prev.slock.overrideAttrs (oldAttrs: {

1
systems/mdesktop/boot.nix
View File

@ -10,6 +10,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.efi.efiSysMountPoint = "/boot/efi";
boot.initrd.systemd.enable = true;
# Setup crypto keyfile # Setup crypto keyfile
boot.initrd.secrets = { boot.initrd.secrets = {

2
systems/mdesktop/fonts.nix
View File

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts nerdfonts
font-awesome font-awesome
source-han-sans source-han-sans

12
systems/mdesktop/nvidia.nix
View File

@ -1,8 +1,18 @@
{ config, ... }: { config, pkgs, ... }:
{ {
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
hardware.nvidia.open = false;
hardware.nvidia.modesetting.enable = true;
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.opengl.extraPackages = [
(pkgs.runCommand "nvidia-icd" { } ''
mkdir -p $out/share/vulkan/icd.d
cp ${pkgs.linuxPackages.nvidia_x11}/share/vulkan/icd.d/nvidia_icd.x86_64.json $out/share/vulkan/icd.d/nvidia_icd.json
'')
];
} }

2
systems/mdesktop/ssh.nix
View File

@ -9,5 +9,5 @@
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
}; };
}; };
programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" ]; programs.ssh.hostKeyAlgorithms = [ "sk-ssh-ed25519@openssh.com" "ssh-ed25519" "ecdsa-sha2-nistp256" ];
} }

60
systems/mdesktop/syncthing.nix
View File

@ -10,36 +10,38 @@
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
overrideFolders = true; overrideFolders = true;
overrideDevices = true; overrideDevices = true;
devices = { settings = {
"M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; }; devices = {
"M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; }; "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; };
"Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; }; "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; };
}; "Lambda" = { id = "ZYNSFWR-F3ZNDDT-66TSJWB-PRP3KQK-IWTTABU-GGWT5DL-RWC7VAE-LI5AXQQ"; };
folders = {
"Documents" = {
path = "/home/${username}/Documents";
devices = [ "M.Phone.Pixel" "M.MacBookPro" ];
}; };
"Pictures" = { folders = {
path = "/home/${username}/Pictures"; "Documents" = {
devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; path = "/home/${username}/Documents";
}; devices = [ "M.Phone.Pixel" "M.MacBookPro" ];
"Videos" = { };
path = "/home/${username}/Videos"; "Pictures" = {
devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; path = "/home/${username}/Pictures";
}; devices = [ "M.Phone.Pixel" "M.MacBookPro" ];
"Music" = { };
path = "/home/${username}/Music"; "Videos" = {
devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; path = "/home/${username}/Videos";
}; devices = [ "M.Phone.Pixel" "M.MacBookPro" ];
"Android Camera" = { };
id = "pixel_7_pro_2qyx-photos"; "Music" = {
path = "/home/${username}/Pictures/DCIM"; path = "/home/${username}/Music";
devices = [ "M.Phone.Pixel" "M.MacBookPro" ]; devices = [ "M.Phone.Pixel" "M.MacBookPro" ];
}; };
".Hidden" = { "Android Camera" = {
path = "/home/${username}/.Hidden"; id = "pixel_7_pro_2qyx-photos";
devices = [ "M.Phone.Pixel" ]; path = "/home/${username}/Pictures/DCIM";
devices = [ "M.Phone.Pixel" "M.MacBookPro" ];
};
".Hidden" = {
path = "/home/${username}/.Hidden";
devices = [ "M.Phone.Pixel" ];
};
}; };
}; };
}; };

2
systems/mdesktop/users.nix
View File

@ -6,6 +6,6 @@
shell = pkgs.zsh; shell = pkgs.zsh;
description = "Madeleine"; description = "Madeleine";
extraGroups = [ "adbusers" "dialout" "libvirtd" "plugdev" ]; extraGroups = [ "adbusers" "dialout" "libvirtd" "plugdev" ];
openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/id_ed25519_sk.pub ]; openssh.authorizedKeys.keyFiles = [ ../../maddie/common/ssh/maddie.pub ];
}; };
} }