Update deltaflyer
config
Still not working
This commit is contained in:
parent
e0d5144389
commit
6849194702
3 changed files with 52 additions and 37 deletions
|
@ -14,20 +14,22 @@
|
||||||
deltaflyer = {
|
deltaflyer = {
|
||||||
nixpkgs =
|
nixpkgs =
|
||||||
let
|
let
|
||||||
# keep in sync with https://github.com/NixOS/mobile-nixos/blob/development/pkgs.nix
|
# keep in sync with https://github.com/mobile-nixos/mobile-nixos/blob/development/npins/sources.json
|
||||||
rev = "44d0940ea560dee511026a53f0e2e2cde489b4d4";
|
rev = "d3c42f187194c26d9f0309a8ecc469d6c878ce33";
|
||||||
in
|
in
|
||||||
builtins.getFlake "github:NixOS/nixpkgs/${rev}";
|
builtins.getFlake "github:NixOS/nixpkgs/${rev}";
|
||||||
extraHmModules = [
|
extraHmModules = [
|
||||||
# inputs.ccrEmacs.hmModules.default
|
inputs.catppuccin.homeManagerModules.catppuccin
|
||||||
];
|
];
|
||||||
vpn = {
|
vpn = {
|
||||||
ip = "10.100.0.5";
|
ip = "10.100.0.5";
|
||||||
publicKey = "6bzmBx2b5yzMdW0aK0KapoBesNcxTv5+qdo+pGmG+jc=";
|
publicKey = "6bzmBx2b5yzMdW0aK0KapoBesNcxTv5+qdo+pGmG+jc=";
|
||||||
};
|
};
|
||||||
homeManager = builtins.getFlake "github:nix-community/home-manager/670d9ecc3e46a6e3265c203c2d136031a3d3548e";
|
# homeManager = builtins.getFlake "github:nix-community/home-manager/670d9ecc3e46a6e3265c203c2d136031a3d3548e";
|
||||||
extraModules = [
|
extraModules = [
|
||||||
(import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-fajita"; })
|
(import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-fajita"; })
|
||||||
|
inputs.catppuccin.nixosModules.catppuccin
|
||||||
|
inputs.lix-module.nixosModules.default
|
||||||
];
|
];
|
||||||
secrets = {
|
secrets = {
|
||||||
"deltaflyer-wireguard-private-key" = { };
|
"deltaflyer-wireguard-private-key" = { };
|
||||||
|
|
|
@ -30,6 +30,13 @@
|
||||||
# INSECURE STUFF FIRST
|
# INSECURE STUFF FIRST
|
||||||
# Users and hardcoded passwords.
|
# Users and hardcoded passwords.
|
||||||
{
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(prev: final: {
|
||||||
|
gcc7 = final.gcc;
|
||||||
|
gcc8 = final.gcc;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
users.users.root.password = "nixos";
|
users.users.root.password = "nixos";
|
||||||
# users.users.ccr.password = "1234";
|
# users.users.ccr.password = "1234";
|
||||||
|
|
||||||
|
@ -66,11 +73,13 @@
|
||||||
"git"
|
"git"
|
||||||
"shell"
|
"shell"
|
||||||
"helix"
|
"helix"
|
||||||
"hyprland"
|
# "hyprland"
|
||||||
|
"niri"
|
||||||
"emacs"
|
"emacs"
|
||||||
"firefox"
|
"firefox"
|
||||||
"mpv"
|
"mpv"
|
||||||
"xdg"
|
"xdg"
|
||||||
|
"catppuccin"
|
||||||
];
|
];
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"dialout"
|
"dialout"
|
||||||
|
@ -99,18 +108,18 @@
|
||||||
ccr.extraModules = [
|
ccr.extraModules = [
|
||||||
{
|
{
|
||||||
programs.fish.loginShellInit = ''
|
programs.fish.loginShellInit = ''
|
||||||
pgrep Hypr >/dev/null || exec dbus-run-session Hyprland
|
pgrep niri >/dev/null || exec niri-session
|
||||||
'';
|
|
||||||
wayland.windowManager.hyprland.extraConfig = lib.mkAfter ''
|
|
||||||
monitor = DSI-1, 1080x2340, 0x0, 2, transform, 1
|
|
||||||
input {
|
|
||||||
touchdevice {
|
|
||||||
transform = 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
bind = $mod, r, exec, rotate-screen hor
|
|
||||||
bind = $mod SHIFT, r, exec, rotate-screen ver
|
|
||||||
'';
|
'';
|
||||||
|
# wayland.windowManager.hyprland.extraConfig = lib.mkAfter ''
|
||||||
|
# monitor = DSI-1, 1080x2340, 0x0, 2, transform, 1
|
||||||
|
# input {
|
||||||
|
# touchdevice {
|
||||||
|
# transform = 1
|
||||||
|
# }
|
||||||
|
# }
|
||||||
|
# bind = $mod, r, exec, rotate-screen hor
|
||||||
|
# bind = $mod SHIFT, r, exec, rotate-screen ver
|
||||||
|
# '';
|
||||||
home.packages =
|
home.packages =
|
||||||
let
|
let
|
||||||
rotateScript = pkgs.writeShellApplication {
|
rotateScript = pkgs.writeShellApplication {
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#
|
#
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
@ -16,35 +17,38 @@
|
||||||
|
|
||||||
# # desktopManager.plasma5.mobile.enable = true;
|
# # desktopManager.plasma5.mobile.enable = true;
|
||||||
|
|
||||||
# displayManager.autoLogin = {
|
displayManager.autoLogin = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# };
|
user = "ccr";
|
||||||
|
};
|
||||||
|
|
||||||
# displayManager.session = [{
|
displayManager.session = [
|
||||||
# manage = "desktop";
|
{
|
||||||
# name = "hyprland";
|
manage = "desktop";
|
||||||
# start = ''
|
name = "niri";
|
||||||
# ${pkgs.hyprland}/bin/Hyprland &
|
start = ''
|
||||||
# waitPID=$!
|
${pkgs.niri}/bin/niri-session &
|
||||||
# '';
|
waitPID=$!
|
||||||
# }];
|
'';
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
# displayManager.defaultSession = "hyprland";
|
displayManager.defaultSession = "niri";
|
||||||
|
|
||||||
# displayManager.lightdm = {
|
displayManager.lightdm = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# # Workaround for autologin only working at first launch.
|
# Workaround for autologin only working at first launch.
|
||||||
# # A logout or session crashing will show the login screen otherwise.
|
# A logout or session crashing will show the login screen otherwise.
|
||||||
# extraSeatDefaults = ''
|
extraSeatDefaults = ''
|
||||||
# session-cleanup-script=${pkgs.procps}/bin/pkill -P1 -fx ${pkgs.lightdm}/sbin/lightdm
|
session-cleanup-script=${pkgs.procps}/bin/pkill -P1 -fx ${pkgs.lightdm}/sbin/lightdm
|
||||||
# '';
|
'';
|
||||||
# };
|
};
|
||||||
|
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
hardware.pulseaudio.enable = lib.mkDefault true; # mkDefault to help out users wanting pipewire
|
hardware.pulseaudio.enable = lib.mkDefault false; # mkDefault to help out users wanting pipewire
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.wireless.enable = false;
|
networking.wireless.enable = false;
|
||||||
powerManagement.enable = true;
|
powerManagement.enable = true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue