run nixfmt
This commit is contained in:
parent
477bce6897
commit
9415d40508
41 changed files with 384 additions and 262 deletions
38
flake.nix
38
flake.nix
|
|
@ -20,11 +20,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self
|
{
|
||||||
, nixpkgs
|
self,
|
||||||
, home-manager
|
nixpkgs,
|
||||||
, ...
|
home-manager,
|
||||||
} @ inputs:
|
...
|
||||||
|
}@inputs:
|
||||||
let
|
let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
|
|
@ -33,10 +34,13 @@
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
];
|
];
|
||||||
forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
|
forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
|
||||||
pkgsFor = lib.genAttrs systems (system: import nixpkgs {
|
pkgsFor = lib.genAttrs systems (
|
||||||
inherit system;
|
system:
|
||||||
config.allowUnfree = true;
|
import nixpkgs {
|
||||||
});
|
inherit system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
}
|
||||||
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit lib;
|
inherit lib;
|
||||||
|
|
@ -50,24 +54,32 @@
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
enoko = lib.nixosSystem {
|
enoko = lib.nixosSystem {
|
||||||
specialArgs = { inherit inputs outputs; };
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./nixos/enoko/configuration.nix
|
./nixos/enoko/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.extraSpecialArgs = { inherit inputs outputs; };
|
home-manager.extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
home-manager.users.lu = import ./home/enoko.nix;
|
home-manager.users.lu = import ./home/enoko.nix;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
yukari = lib.nixosSystem {
|
yukari = lib.nixosSystem {
|
||||||
specialArgs = { inherit inputs outputs; };
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./nixos/yukari/configuration.nix
|
./nixos/yukari/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.extraSpecialArgs = { inherit inputs outputs; };
|
home-manager.extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
home-manager.users.lu = import ./home/yukari.nix;
|
home-manager.users.lu = import ./home/yukari.nix;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
# Configures programs that primarily run via the command line
|
# Configures programs that primarily run via the command line
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./fish.nix # fish shell configuration
|
./fish.nix # fish shell configuration
|
||||||
./neovim.nix # neovim configuration, my "escape" editor
|
./neovim.nix # neovim configuration, my "escape" editor
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nix-direnv.enable = true;
|
nix-direnv.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -116,13 +116,12 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "plugin-foreign-env";
|
name = "plugin-foreign-env";
|
||||||
src = pkgs.fetchFromGitHub
|
src = pkgs.fetchFromGitHub {
|
||||||
{
|
owner = "oh-my-fish";
|
||||||
owner = "oh-my-fish";
|
repo = "plugin-foreign-env";
|
||||||
repo = "plugin-foreign-env";
|
rev = "7f0cf099ae1e1e4ab38f46350ed6757d54471de7";
|
||||||
rev = "7f0cf099ae1e1e4ab38f46350ed6757d54471de7";
|
sha256 = "0d16mdgjdwln41zk44qa5vcilmlia4w15r8z2rc3p49i5ankksg3";
|
||||||
sha256 = "0d16mdgjdwln41zk44qa5vcilmlia4w15r8z2rc3p49i5ankksg3";
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
programs.lazygit.enable = true;
|
programs.lazygit.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
_1password-gui
|
_1password-gui
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, lib, ... }: {
|
{ config, lib, ... }:
|
||||||
|
{
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./font.nix
|
./font.nix
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
fira
|
fira
|
||||||
];
|
];
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
profiles ={
|
profiles = {
|
||||||
"user" = {
|
"user" = {
|
||||||
userChrome = ''
|
userChrome = ''
|
||||||
* {
|
* {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
fontProfiles = {
|
fontProfiles = {
|
||||||
enable = true;
|
enable = true;
|
||||||
monospace = {
|
monospace = {
|
||||||
family = "JetBrains Mono Nerd Font";
|
family = "JetBrains Mono Nerd Font";
|
||||||
package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; };
|
package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
|
||||||
};
|
};
|
||||||
regular = {
|
regular = {
|
||||||
family = "Fira Sans";
|
family = "Fira Sans";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
vscode
|
vscode
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./mako.nix
|
./mako.nix
|
||||||
./wofi.nix
|
./wofi.nix
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, lib, ... }: {
|
{ config, lib, ... }:
|
||||||
|
{
|
||||||
services.mako = {
|
services.mako = {
|
||||||
enable = true;
|
enable = true;
|
||||||
font = lib.mkForce "${config.fontProfiles.regular.family} 12";
|
font = lib.mkForce "${config.fontProfiles.regular.family} 12";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
# additional deps for cava support
|
# additional deps for cava support
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
iniparser
|
iniparser
|
||||||
|
|
@ -73,61 +74,63 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
style = let
|
style =
|
||||||
inherit (config.lib.stylix.colors) withHashtag;
|
let
|
||||||
in ''
|
inherit (config.lib.stylix.colors) withHashtag;
|
||||||
* {
|
in
|
||||||
font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
|
''
|
||||||
font-size: 11pt;
|
* {
|
||||||
padding: 0;
|
font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
|
||||||
}
|
font-size: 11pt;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
window#waybar {
|
window#waybar {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
border-radius: 0.5em;
|
border-radius: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces {
|
#workspaces {
|
||||||
transition: background-color .5s, color .5s;
|
transition: background-color .5s, color .5s;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button {
|
#workspaces button {
|
||||||
padding: 0 6px;
|
padding: 0 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button.active,
|
#workspaces button.active,
|
||||||
#workspaces button.focused {
|
#workspaces button.focused {
|
||||||
background-color: ${withHashtag.base05};
|
background-color: ${withHashtag.base05};
|
||||||
color: ${withHashtag.base00};
|
color: ${withHashtag.base00};
|
||||||
}
|
}
|
||||||
|
|
||||||
#cpu,
|
#cpu,
|
||||||
#memory {
|
#memory {
|
||||||
color: ${withHashtag.base04};
|
color: ${withHashtag.base04};
|
||||||
}
|
}
|
||||||
|
|
||||||
#mpris {
|
#mpris {
|
||||||
font-size: 10pt;
|
font-size: 10pt;
|
||||||
margin-right: 6px;
|
margin-right: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tray {
|
#tray {
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
background-color: ${withHashtag.base02};
|
background-color: ${withHashtag.base02};
|
||||||
}
|
}
|
||||||
|
|
||||||
#pulseaudio {
|
#pulseaudio {
|
||||||
color: ${withHashtag.base0D};
|
color: ${withHashtag.base0D};
|
||||||
}
|
}
|
||||||
|
|
||||||
#network {
|
#network {
|
||||||
color: ${withHashtag.base0C};
|
color: ${withHashtag.base0C};
|
||||||
}
|
}
|
||||||
|
|
||||||
#language {
|
#language {
|
||||||
color: ${withHashtag.base02};
|
color: ${withHashtag.base02};
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, lib, ... }: {
|
{ config, lib, ... }:
|
||||||
|
{
|
||||||
programs.wofi = {
|
programs.wofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./mise.nix
|
./mise.nix
|
||||||
./php.nix
|
./php.nix
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
python3 # needed for installing node.js
|
python3 # needed for installing node.js
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
# install php from nixpkgs because mise wants to compile it from source,
|
# install php from nixpkgs because mise wants to compile it from source,
|
||||||
# and that's a whole can of beans i'm not getting into
|
# and that's a whole can of beans i'm not getting into
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
php83
|
php83
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
xivlauncher
|
xivlauncher
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,9 @@
|
||||||
{ lib, config, pkgs, ... }:
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../common/desktop
|
../../common/desktop
|
||||||
|
|
@ -100,101 +105,109 @@
|
||||||
"SUPER,mouse:273,resizewindow"
|
"SUPER,mouse:273,resizewindow"
|
||||||
];
|
];
|
||||||
|
|
||||||
bind = let
|
bind =
|
||||||
terminal = "${pkgs.alacritty}/bin/alacritty";
|
|
||||||
grimblast = lib.getExe pkgs.grimblast;
|
|
||||||
workspaces = [
|
|
||||||
"1"
|
|
||||||
"2"
|
|
||||||
"3"
|
|
||||||
"4"
|
|
||||||
"5"
|
|
||||||
];
|
|
||||||
directions = rec {
|
|
||||||
left = "l";
|
|
||||||
right = "r";
|
|
||||||
up = "u";
|
|
||||||
down = "d";
|
|
||||||
h = left;
|
|
||||||
l = right;
|
|
||||||
k = up;
|
|
||||||
j = down;
|
|
||||||
};
|
|
||||||
in [
|
|
||||||
"SUPER,Return,exec,${terminal}"
|
|
||||||
"SUPERSHIFT,q,killactive" # exit program
|
|
||||||
"SUPERSHIFT,e,exit" # exit hyprland
|
|
||||||
"SUPERSHIFT,r,exec,hyprctl reload" # reload currently running hyprland
|
|
||||||
|
|
||||||
"SUPER,s,togglesplit" # horizontal split
|
|
||||||
"SUPER,f,fullscreen,1" # borderless window
|
|
||||||
"SUPERSHIFT,f,fullscreen,0" # proper fullscreen
|
|
||||||
"ALTSHIFT,space,togglefloating" # floating window
|
|
||||||
|
|
||||||
"SUPER,minus,splitratio,-0.25" # split gets slightly smaller
|
|
||||||
"SUPERSHIFT,minus,splitratio,-0.3333333" # split gets smaller
|
|
||||||
"SUPER,equal,splitratio,0.25" # split gets slightly larger
|
|
||||||
"SUPERSHIFT,equal,splitratio,0.3333333" # split gets larger
|
|
||||||
|
|
||||||
"SUPER,g,togglegroup" # make a window group
|
|
||||||
"SUPER,t,lockactivegroup,toggle" # lock/unlock the current group
|
|
||||||
"SUPER,tab,changegroupactive,f" # switch to next window in group
|
|
||||||
"SUPERSHIFT,tab,changegroupactive,p" # switch to prev window in group
|
|
||||||
|
|
||||||
"SUPER,dead_grave,workspace,previous" # prev workspace
|
|
||||||
"SUPER,dead_grave,workspace,next" # next workspace
|
|
||||||
|
|
||||||
"SUPER,u,togglespecialworkspace" # toggle special workspace
|
|
||||||
"SUPERSHIFT,u,movetoworkspacesilent,special" # move to special workspace
|
|
||||||
|
|
||||||
",Print,exec,${grimblast} --notify --freeze copy area" # screenshot area
|
|
||||||
"SHIFT,Print,exec,${grimblast} --notify --freeze copy output" # screenshot all
|
|
||||||
|
|
||||||
",XF86AudioRaiseVolume,exec,pamixer -i 5" # raise volume
|
|
||||||
",XF86AudioLowerVolume,exec,pamixer -d 5" # lower volume
|
|
||||||
",XF86AudioPlay,exec,playerctl play-pause" # play/pause
|
|
||||||
",XF86AudioNext,exec,playerctl next" # next song
|
|
||||||
",XF86AudioPrev,exec,playerctl previous" # previous song
|
|
||||||
]
|
|
||||||
++
|
|
||||||
# change workspace
|
|
||||||
(map (n: "SUPER,${n},workspace,name:${n}") workspaces)
|
|
||||||
++
|
|
||||||
# move window to workspace
|
|
||||||
(map (n: "SUPERSHIFT,${n},movetoworkspacesilent,name:${n}") workspaces)
|
|
||||||
++
|
|
||||||
# move focus
|
|
||||||
(lib.mapAttrsToList (key: direction: "SUPER,${key},movefocus,${direction}") directions)
|
|
||||||
++
|
|
||||||
# swap windows
|
|
||||||
(lib.mapAttrsToList (key: direction: "SUPERSHIFT,${key},swapwindow,${direction}") directions)
|
|
||||||
++
|
|
||||||
# move windows
|
|
||||||
(lib.mapAttrsToList (key: direction: "SUPERCONTROL,${key},movewindoworgroup,${direction}") directions)
|
|
||||||
++
|
|
||||||
# move monitor focus
|
|
||||||
(lib.mapAttrsToList (key: direction: "SUPERALT,${key},focusmonitor,${direction}") directions)
|
|
||||||
++
|
|
||||||
# move workspace to other monitor
|
|
||||||
(lib.mapAttrsToList (key: direction: "SUPERALTSHIFT,${key},movecurrentworkspacetomonitor,${direction}") directions)
|
|
||||||
++
|
|
||||||
# launcher
|
|
||||||
(
|
|
||||||
let
|
let
|
||||||
wofi = lib.getExe pkgs.wofi;
|
terminal = "${pkgs.alacritty}/bin/alacritty";
|
||||||
in
|
grimblast = lib.getExe pkgs.grimblast;
|
||||||
lib.optionals config.programs.wofi.enable [
|
workspaces = [
|
||||||
"SUPER,Space,exec,${wofi} -S drun -W 20% -H 15%"
|
"1"
|
||||||
"SHIFTSUPER,Space,exec,${wofi} -S run -W 20% -H 15%"
|
"2"
|
||||||
]
|
"3"
|
||||||
);
|
"4"
|
||||||
|
"5"
|
||||||
|
];
|
||||||
|
directions = rec {
|
||||||
|
left = "l";
|
||||||
|
right = "r";
|
||||||
|
up = "u";
|
||||||
|
down = "d";
|
||||||
|
h = left;
|
||||||
|
l = right;
|
||||||
|
k = up;
|
||||||
|
j = down;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
[
|
||||||
|
"SUPER,Return,exec,${terminal}"
|
||||||
|
"SUPERSHIFT,q,killactive" # exit program
|
||||||
|
"SUPERSHIFT,e,exit" # exit hyprland
|
||||||
|
"SUPERSHIFT,r,exec,hyprctl reload" # reload currently running hyprland
|
||||||
|
|
||||||
|
"SUPER,s,togglesplit" # horizontal split
|
||||||
|
"SUPER,f,fullscreen,1" # borderless window
|
||||||
|
"SUPERSHIFT,f,fullscreen,0" # proper fullscreen
|
||||||
|
"ALTSHIFT,space,togglefloating" # floating window
|
||||||
|
|
||||||
|
"SUPER,minus,splitratio,-0.25" # split gets slightly smaller
|
||||||
|
"SUPERSHIFT,minus,splitratio,-0.3333333" # split gets smaller
|
||||||
|
"SUPER,equal,splitratio,0.25" # split gets slightly larger
|
||||||
|
"SUPERSHIFT,equal,splitratio,0.3333333" # split gets larger
|
||||||
|
|
||||||
|
"SUPER,g,togglegroup" # make a window group
|
||||||
|
"SUPER,t,lockactivegroup,toggle" # lock/unlock the current group
|
||||||
|
"SUPER,tab,changegroupactive,f" # switch to next window in group
|
||||||
|
"SUPERSHIFT,tab,changegroupactive,p" # switch to prev window in group
|
||||||
|
|
||||||
|
"SUPER,dead_grave,workspace,previous" # prev workspace
|
||||||
|
"SUPER,dead_grave,workspace,next" # next workspace
|
||||||
|
|
||||||
|
"SUPER,u,togglespecialworkspace" # toggle special workspace
|
||||||
|
"SUPERSHIFT,u,movetoworkspacesilent,special" # move to special workspace
|
||||||
|
|
||||||
|
",Print,exec,${grimblast} --notify --freeze copy area" # screenshot area
|
||||||
|
"SHIFT,Print,exec,${grimblast} --notify --freeze copy output" # screenshot all
|
||||||
|
|
||||||
|
",XF86AudioRaiseVolume,exec,pamixer -i 5" # raise volume
|
||||||
|
",XF86AudioLowerVolume,exec,pamixer -d 5" # lower volume
|
||||||
|
",XF86AudioPlay,exec,playerctl play-pause" # play/pause
|
||||||
|
",XF86AudioNext,exec,playerctl next" # next song
|
||||||
|
",XF86AudioPrev,exec,playerctl previous" # previous song
|
||||||
|
]
|
||||||
|
++
|
||||||
|
# change workspace
|
||||||
|
(map (n: "SUPER,${n},workspace,name:${n}") workspaces)
|
||||||
|
++
|
||||||
|
# move window to workspace
|
||||||
|
(map (n: "SUPERSHIFT,${n},movetoworkspacesilent,name:${n}") workspaces)
|
||||||
|
++
|
||||||
|
# move focus
|
||||||
|
(lib.mapAttrsToList (key: direction: "SUPER,${key},movefocus,${direction}") directions)
|
||||||
|
++
|
||||||
|
# swap windows
|
||||||
|
(lib.mapAttrsToList (key: direction: "SUPERSHIFT,${key},swapwindow,${direction}") directions)
|
||||||
|
++
|
||||||
|
# move windows
|
||||||
|
(lib.mapAttrsToList (
|
||||||
|
key: direction: "SUPERCONTROL,${key},movewindoworgroup,${direction}"
|
||||||
|
) directions)
|
||||||
|
++
|
||||||
|
# move monitor focus
|
||||||
|
(lib.mapAttrsToList (key: direction: "SUPERALT,${key},focusmonitor,${direction}") directions)
|
||||||
|
++
|
||||||
|
# move workspace to other monitor
|
||||||
|
(lib.mapAttrsToList (
|
||||||
|
key: direction: "SUPERALTSHIFT,${key},movecurrentworkspacetomonitor,${direction}"
|
||||||
|
) directions)
|
||||||
|
++
|
||||||
|
# launcher
|
||||||
|
(
|
||||||
|
let
|
||||||
|
wofi = lib.getExe pkgs.wofi;
|
||||||
|
in
|
||||||
|
lib.optionals config.programs.wofi.enable [
|
||||||
|
"SUPER,Space,exec,${wofi} -S drun -W 20% -H 15%"
|
||||||
|
"SHIFTSUPER,Space,exec,${wofi} -S run -W 20% -H 15%"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
monitor = map (
|
monitor = map (
|
||||||
m: "${m.name},${
|
m:
|
||||||
if m.enabled
|
"${m.name},${
|
||||||
then "${toString m.width}x${toString m.height}@${toString m.refreshRate},${m.position},${m.scale}"
|
if m.enabled then
|
||||||
else "disable"
|
"${toString m.width}x${toString m.height}@${toString m.refreshRate},${m.position},${m.scale}"
|
||||||
}"
|
else
|
||||||
|
"disable"
|
||||||
|
}"
|
||||||
) config.monitors;
|
) config.monitors;
|
||||||
|
|
||||||
workspace = map (m: "name:${m.workspace},monitor:${m.name}") (
|
workspace = map (m: "name:${m.workspace},monitor:${m.name}") (
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, ... }: let
|
{ config, ... }:
|
||||||
|
let
|
||||||
swaylock = "${config.programs.swaylock.package}/bin/swaylock";
|
swaylock = "${config.programs.swaylock.package}/bin/swaylock";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.swayidle = {
|
services.swayidle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
systemdTarget = "graphical-session.target";
|
systemdTarget = "graphical-session.target";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
programs.swaylock = {
|
programs.swaylock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.swaylock-effects;
|
package = pkgs.swaylock-effects;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
# enoko is my framework 13-inch AMD laptop, running nixos
|
# enoko is my framework 13-inch AMD laptop, running nixos
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./global.nix
|
./global.nix
|
||||||
./common/desktop
|
./common/desktop
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,12 @@
|
||||||
{ inputs, lib, pkgs, config, outputs, ... }: {
|
{
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
outputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nix-index-database.hmModules.nix-index
|
inputs.nix-index-database.hmModules.nix-index
|
||||||
inputs.stylix.homeManagerModules.stylix
|
inputs.stylix.homeManagerModules.stylix
|
||||||
|
|
@ -17,13 +25,16 @@
|
||||||
nix = {
|
nix = {
|
||||||
package = lib.mkDefault pkgs.nixVersions.nix_2_22;
|
package = lib.mkDefault pkgs.nixVersions.nix_2_22;
|
||||||
settings = {
|
settings = {
|
||||||
experimental-features = ["nix-command" "flakes"];
|
experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
warn-dirty = false;
|
warn-dirty = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.startServices = "sd-switch";
|
systemd.user.startServices = "sd-switch";
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
@ -38,7 +49,7 @@
|
||||||
username = lib.mkDefault "lu";
|
username = lib.mkDefault "lu";
|
||||||
homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
||||||
stateVersion = lib.mkDefault "24.05";
|
stateVersion = lib.mkDefault "24.05";
|
||||||
sessionPath = ["$HOME/.local/bin"];
|
sessionPath = [ "$HOME/.local/bin" ];
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
FLAKE = "$HOME/nix-config";
|
FLAKE = "$HOME/nix-config";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
# yukari my main desktop workstation, running nixos
|
# yukari my main desktop workstation, running nixos
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./global.nix
|
./global.nix
|
||||||
./desktop/hyprland
|
./desktop/hyprland
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
mkFontOption = kind: {
|
mkFontOption = kind: {
|
||||||
family = lib.mkOption {
|
family = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
|
|
@ -18,7 +19,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
cfg = config.fontProfiles;
|
cfg = config.fontProfiles;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.fontProfiles = {
|
options.fontProfiles = {
|
||||||
enable = lib.mkEnableOption "Whether to enable font profiles";
|
enable = lib.mkEnableOption "Whether to enable font profiles";
|
||||||
monospace = mkFontOption "monospace";
|
monospace = mkFontOption "monospace";
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,11 @@
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
inherit (lib) mkOption types;
|
inherit (lib) mkOption types;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.monitors = mkOption {
|
options.monitors = mkOption {
|
||||||
type = types.listOf (
|
type = types.listOf (
|
||||||
types.submodule {
|
types.submodule {
|
||||||
|
|
@ -48,7 +50,7 @@ in {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
default = [];
|
default = [ ];
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
assertions = [
|
assertions = [
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -9,5 +10,5 @@
|
||||||
};
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
pavucontrol
|
pavucontrol
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ lib, pkgs, ... }: {
|
{ lib, pkgs, ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./audio.nix
|
./audio.nix
|
||||||
./tailscale.nix
|
./tailscale.nix
|
||||||
|
|
@ -26,7 +27,7 @@
|
||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.lu.extraGroups = ["audio"];
|
users.users.lu.extraGroups = [ "audio" ];
|
||||||
|
|
||||||
# auto mount external drives
|
# auto mount external drives
|
||||||
services.devmon.enable = true;
|
services.devmon.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
services.tailscale = {
|
services.tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
security.pam.services.swaylock = {};
|
{
|
||||||
|
security.pam.services.swaylock = { };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
services.displayManager.sddm.enable = true;
|
services.displayManager.sddm.enable = true;
|
||||||
services.displayManager.sddm.wayland.enable = true;
|
services.displayManager.sddm.wayland.enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,11 @@
|
||||||
{ inputs
|
{
|
||||||
, lib
|
inputs,
|
||||||
, config
|
lib,
|
||||||
, pkgs
|
config,
|
||||||
, ...
|
pkgs,
|
||||||
}: {
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../common
|
../common
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
@ -63,7 +65,10 @@
|
||||||
lu = {
|
lu = {
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "storage" ];
|
extraGroups = [
|
||||||
|
"wheel"
|
||||||
|
"storage"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -90,7 +95,9 @@
|
||||||
# enable ppd specifically for the framework
|
# enable ppd specifically for the framework
|
||||||
services.power-profiles-daemon.enable = true;
|
services.power-profiles-daemon.enable = true;
|
||||||
|
|
||||||
boot.kernelParams = lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") ["rtc_cmos.use_acpi_alarm=1"] ;
|
boot.kernelParams =
|
||||||
|
lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8")
|
||||||
|
[ "rtc_cmos.use_acpi_alarm=1" ];
|
||||||
|
|
||||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,42 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"thunderbolt"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/8e4fa7a2-0690-4276-b47d-0aa9fe3e62fd";
|
device = "/dev/disk/by-uuid/8e4fa7a2-0690-4276-b47d-0aa9fe3e62fd";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/6157-ADC8";
|
device = "/dev/disk/by-uuid/6157-ADC8";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [
|
||||||
};
|
"fmask=0022"
|
||||||
|
"dmask=0022"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,15 @@
|
||||||
{ ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
{ name = "lu"; ensureClauses = { superuser = true; }; }
|
{
|
||||||
|
name = "lu";
|
||||||
|
ensureClauses = {
|
||||||
|
superuser = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,11 @@
|
||||||
{ inputs
|
{
|
||||||
, lib
|
inputs,
|
||||||
, config
|
lib,
|
||||||
, pkgs
|
config,
|
||||||
, ...
|
pkgs,
|
||||||
}: {
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../common
|
../common
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
@ -34,7 +36,7 @@
|
||||||
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.initrd.kernelModules = ["amdgpu"];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
hardware.graphics.enable = true;
|
hardware.graphics.enable = true;
|
||||||
|
|
||||||
networking.hostName = "yukari";
|
networking.hostName = "yukari";
|
||||||
|
|
@ -63,7 +65,10 @@
|
||||||
lu = {
|
lu = {
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "storage" ];
|
extraGroups = [
|
||||||
|
"wheel"
|
||||||
|
"storage"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,48 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/d8551435-6a35-4ae9-b977-fd5a261c9be7";
|
device = "/dev/disk/by-uuid/d8551435-6a35-4ae9-b977-fd5a261c9be7";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/5704-1642";
|
device = "/dev/disk/by-uuid/5704-1642";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
};
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/d52209e9-f625-46a9-800a-88598ed6fcd5"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-uuid/d52209e9-f625-46a9-800a-88598ed6fcd5"; }
|
||||||
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
# This file defines overlays
|
# This file defines overlays
|
||||||
{inputs, ...}: {
|
{ inputs, ... }:
|
||||||
|
{
|
||||||
# This one brings our custom packages from the 'pkgs' directory
|
# This one brings our custom packages from the 'pkgs' directory
|
||||||
additions = final: _prev: import ../pkgs final.pkgs;
|
additions = final: _prev: import ../pkgs final.pkgs;
|
||||||
|
|
||||||
|
|
|
||||||
23
shell.nix
23
shell.nix
|
|
@ -1,14 +1,17 @@
|
||||||
# Shell for bootstrapping flake-enabled nix and other tooling
|
# Shell for bootstrapping flake-enabled nix and other tooling
|
||||||
{ pkgs ? let
|
{
|
||||||
lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
|
pkgs ?
|
||||||
nixpkgs = fetchTarball {
|
let
|
||||||
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
|
lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
|
||||||
sha256 = lock.narHash;
|
nixpkgs = fetchTarball {
|
||||||
};
|
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
|
||||||
in
|
sha256 = lock.narHash;
|
||||||
import nixpkgs { overlays = [ ]; }
|
};
|
||||||
, ...
|
in
|
||||||
}: {
|
import nixpkgs { overlays = [ ]; },
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
NIX_CONFIG = "extra-experimental-features = nix-command flakes";
|
NIX_CONFIG = "extra-experimental-features = nix-command flakes";
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue