Compare commits
No commits in common. "cb7105e54b30b27c96a5a3e868033540d9cd3f68" and "cf626fef856abcba25b1e51802fc46777217275d" have entirely different histories.
cb7105e54b
...
cf626fef85
4 changed files with 6 additions and 45 deletions
2
hive.nix
2
hive.nix
|
@ -3,7 +3,7 @@ let
|
||||||
inherit (inputs) nixpkgs nixpkgs-unstable;
|
inherit (inputs) nixpkgs nixpkgs-unstable;
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
||||||
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
|
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
flake = rec {
|
flake = rec {
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
|
# Enable sound.
|
||||||
|
# sound.enable = true;
|
||||||
|
hardware.pulseaudio.enable = true;
|
||||||
|
|
||||||
home-manager.users.sammy.programs.ssh.includes = [
|
home-manager.users.sammy.programs.ssh.includes = [
|
||||||
"./famedly-config"
|
"./famedly-config"
|
||||||
|
@ -23,12 +26,6 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/mnt/Media" = {
|
|
||||||
device = "192.168.0.3:/mnt/user/Media";
|
|
||||||
fsType = "nfs";
|
|
||||||
options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" "noatime" ]; # disconnects after 10 minutes (i.e. 600 seconds)
|
|
||||||
};
|
|
||||||
|
|
||||||
system.stateVersion = "23.11"; # Did you read the comment?
|
system.stateVersion = "23.11"; # Did you read the comment?
|
||||||
|
|
||||||
# Famedly compliance foo - stolen from evelyn :3
|
# Famedly compliance foo - stolen from evelyn :3
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, pkgs-unstable, ... }: {
|
{ pkgs, ... }: {
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./sway
|
./sway
|
||||||
|
@ -9,23 +9,8 @@
|
||||||
users.users.sammy.packages = with pkgs; [
|
users.users.sammy.packages = with pkgs; [
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
mpv
|
mpv
|
||||||
thunderbird
|
|
||||||
pkgs-unstable.obsidian
|
|
||||||
bluez-tools
|
|
||||||
blueman
|
|
||||||
pavucontrol
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.sammy.services.nextcloud-client.enable = true;
|
|
||||||
|
|
||||||
services.rpcbind.enable = true; # needed for NFS
|
|
||||||
|
|
||||||
# Enable sound.
|
|
||||||
sound.enable = true;
|
|
||||||
hardware.pulseaudio.enable = true;
|
|
||||||
hardware.pulseaudio.package = pkgs.pulseaudioFull;
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
services.logind.lidSwitch = "suspend-then-hibernate";
|
services.logind.lidSwitch = "suspend-then-hibernate";
|
||||||
services.logind.powerKey = "hibernate";
|
services.logind.powerKey = "hibernate";
|
||||||
services.logind.powerKeyLongPress = "poweroff";
|
services.logind.powerKeyLongPress = "poweroff";
|
||||||
|
|
|
@ -47,7 +47,6 @@
|
||||||
];
|
];
|
||||||
timeouts = [
|
timeouts = [
|
||||||
{ timeout = 300; command = lockCommand; }
|
{ timeout = 300; command = lockCommand; }
|
||||||
{ timeout = 1800; command = "systemctl hybrid-sleep"; }
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
wayland.windowManager.sway =
|
wayland.windowManager.sway =
|
||||||
|
@ -71,15 +70,9 @@
|
||||||
hideEdgeBorders = "both";
|
hideEdgeBorders = "both";
|
||||||
};
|
};
|
||||||
gaps.inner = 10;
|
gaps.inner = 10;
|
||||||
gaps.smartGaps = true;
|
|
||||||
|
|
||||||
output = {
|
output = {
|
||||||
"eDP-1" = {
|
"*" = { };
|
||||||
position = "0 1080";
|
|
||||||
};
|
|
||||||
"DP-6" = {
|
|
||||||
position = "0 0";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
input = {
|
input = {
|
||||||
|
@ -183,11 +176,6 @@
|
||||||
"${cfg.config.modifier}+9" = "workspace 9";
|
"${cfg.config.modifier}+9" = "workspace 9";
|
||||||
"${cfg.config.modifier}+0" = "workspace 10";
|
"${cfg.config.modifier}+0" = "workspace 10";
|
||||||
|
|
||||||
"${cfg.config.modifier}+Alt+Right" = "workspace next";
|
|
||||||
"${cfg.config.modifier}+Alt+Left" = "workspace prev";
|
|
||||||
"${cfg.config.modifier}+Alt+Up" = "move workspace to output up";
|
|
||||||
"${cfg.config.modifier}+Alt+Down" = "move workspace to output down";
|
|
||||||
|
|
||||||
"${cfg.config.modifier}+Shift+1" = "move container to workspace 1";
|
"${cfg.config.modifier}+Shift+1" = "move container to workspace 1";
|
||||||
"${cfg.config.modifier}+Shift+2" = "move container to workspace 2";
|
"${cfg.config.modifier}+Shift+2" = "move container to workspace 2";
|
||||||
"${cfg.config.modifier}+Shift+3" = "move container to workspace 3";
|
"${cfg.config.modifier}+Shift+3" = "move container to workspace 3";
|
||||||
|
@ -199,9 +187,6 @@
|
||||||
"${cfg.config.modifier}+Shift+9" = "move container to workspace 9";
|
"${cfg.config.modifier}+Shift+9" = "move container to workspace 9";
|
||||||
"${cfg.config.modifier}+Shift+0" = "move container to workspace 10";
|
"${cfg.config.modifier}+Shift+0" = "move container to workspace 10";
|
||||||
|
|
||||||
"${cfg.config.modifier}+Alt+N" = "move container to workspace next";
|
|
||||||
"${cfg.config.modifier}+Alt+P" = "move container to workspace prev";
|
|
||||||
|
|
||||||
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
|
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
|
||||||
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
|
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
|
||||||
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
|
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
|
||||||
|
@ -211,12 +196,6 @@
|
||||||
|
|
||||||
"${cfg.config.modifier}+r" = "mode resize";
|
"${cfg.config.modifier}+r" = "mode resize";
|
||||||
};
|
};
|
||||||
|
|
||||||
startup = [{
|
|
||||||
command = "systemctl --user restart nextcloud-client";
|
|
||||||
always = true;
|
|
||||||
}];
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
Loading…
Reference in a new issue