v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

some updates
Some checks failed
Lint / lint (push) Has been cancelled
Details

Browse source
This commit is contained in:
Vivian 2024-12-30 21:02:16 +01:00
parent afa692e17d
commit 002adf25c2
7 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/desktop/default.nix
View file

@ -32,8 +32,8 @@
}; };
}; };
hardware.pulseaudio.enable = false;
services = { services = {
pulseaudio.enable = false;
# Enable my config for the gnome desktop environment # Enable my config for the gnome desktop environment
v.gnome.enable = lib.mkDefault true; v.gnome.enable = lib.mkDefault true;
@ -80,7 +80,6 @@
sbctl sbctl
]; # ++ (if config.virtualisation.podman.enable then [ pkgs.podman-compose ] else []); ]; # ++ (if config.virtualisation.podman.enable then [ pkgs.podman-compose ] else []);
security.rtkit.enable = true; security.rtkit.enable = true;
virtualisation = { virtualisation = {
@ -123,7 +122,6 @@
adb.enable = true; adb.enable = true;
}; };
networking = { networking = {
# Networking # Networking
networkmanager.enable = true; networkmanager.enable = true;

19
common/modules/gnome/default.nix
View file

@ -56,8 +56,9 @@ in
# Add Home-manager dconf stuff # Add Home-manager dconf stuff
home-manager.sharedModules = mkIf cfg.hm [ ./hm.nix ]; home-manager.sharedModules = mkIf cfg.hm [ ./hm.nix ];
environment.gnome.excludePackages = environment.gnome.excludePackages = (
(with pkgs; [ with pkgs;
[
gnome-photos gnome-photos
gnome-tour gnome-tour
gnome-connections gnome-connections
@ -78,13 +79,21 @@ in
hitori # sudoku game hitori # sudoku game
gnome-notes gnome-notes
gnome-weather gnome-weather
]); gnome-software
]
);
services.gnome.evolution-data-server.enable = lib.mkForce false;
services.gnome.gnome-online-accounts.enable = false;
services.gnome.gnome-remote-desktop.enable = false;
services.gnome.gnome-user-share.enable = false;
services.gnome.rygel.enable = false;
services.gnome.tinysparql.enable = false;
services.gnome.localsearch.enable = false;
# Services required for gnome # Services required for gnome
programs.dconf.enable = true; programs.dconf.enable = true;
# Extra gnome packages # Extra gnome packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome-tweaks gnome-tweaks

8
flake.lock generated
View file

@ -1235,16 +1235,16 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1735581264,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-q4ocr/efe8RXw7/SPpTZVqw6GNRWTEMdOUMt66QephQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "98f9d01a955f7d568df2d1d362481f5423318216",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"type": "indirect" "type": "indirect"
} }
}, },

2
flake.nix
View file

@ -5,7 +5,7 @@
# * https://github.com/Infinidoge/nix-minecraft # * https://github.com/Infinidoge/nix-minecraft
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable-small";
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena";

3
hosts/thalassa/aoife/default.nix
View file

@ -58,10 +58,13 @@
withUWSM = true; withUWSM = true;
}; };
hyprlock.enable = true; hyprlock.enable = true;
evolution.enable = false;
}; };
services = { services = {
hypridle.enable = true; hypridle.enable = true;
xserver.displayManager.gdm.enable = true;
flatpak.enable = true; flatpak.enable = true;

5
hosts/thalassa/aoife/hardware.nix
View file

@ -62,12 +62,11 @@
powerManagement = { powerManagement = {
enable = true; enable = true;
powertop.enable = true; # powertop.enable = true;
}; };
security = { security = {
tpm2 = { tpm2 = {
# tpm
enable = true; enable = true;
pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
tctiEnvironment.enable = true; tctiEnvironment.enable = true;

4
hosts/thalassa/aoife/home/hyprland.nix
View file

@ -158,6 +158,7 @@ in
# Needed as these services normally start after graphical-session-pre # Needed as these services normally start after graphical-session-pre
systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target"; systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
systemd.user.services.waybar.Unit.After = lib.mkForce "graphical-session.target"; systemd.user.services.waybar.Unit.After = lib.mkForce "graphical-session.target";
systemd.user.services.hypridle.Unit.After = lib.mkForce "graphical-session.target";
wayland.windowManager.hyprland = wayland.windowManager.hyprland =
let let
@ -267,6 +268,7 @@ in
preserve_split = "yes"; preserve_split = "yes";
pseudotile = "yes"; pseudotile = "yes";
}; };
gestures.workspace_swipe = true; gestures.workspace_swipe = true;
misc = { misc = {
@ -298,7 +300,7 @@ in
",XF86MonBrightnessDown,exec,${brightnessctl} -q s 5%-" ",XF86MonBrightnessDown,exec,${brightnessctl} -q s 5%-"
]; ];
bindl = [ ",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ]; bindl = [ ",XF86AudioMute, exec,${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ];
bind = bind =
[ [