format: update formatting to new rfc style
This commit is contained in:
Nydragon
parent
e9371c3a15
commit
ce7de9b9a6
15 changed files with 478 additions and 462 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
./result/
|
||||||
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -22,26 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715458517,
|
"lastModified": 1715534503,
|
||||||
"narHash": "sha256-oi4z6RuLnGTR8TbjPcN/D2jFKywCrMRhAtSfgPHY9nE=",
|
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "09208c1471b96985c809998af55d82e134a750b8",
|
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715266358,
|
|
||||||
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -54,8 +39,7 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs"
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
12
flake.nix
12
flake.nix
|
|
@ -2,8 +2,7 @@
|
||||||
description = "Nydragon's configuration'";
|
description = "Nydragon's configuration'";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs = { url = "github:nixos/nixpkgs"; };
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-unstable = { url = "github:nixos/nixpkgs?ref=nixos-unstable"; };
|
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
|
|
@ -11,7 +10,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager }:
|
outputs = inputs@{ self, nixpkgs, home-manager }:
|
||||||
let
|
let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
|
|
||||||
|
|
@ -22,18 +21,13 @@
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
unstable = import nixpkgs-unstable {
|
|
||||||
inherit system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
in {
|
in {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
xps9510 = lib.nixosSystem {
|
xps9510 = lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [ ./hosts/xps9510/configuration.nix ];
|
modules = [ ./hosts/xps9510/configuration.nix ];
|
||||||
specialArgs = { inherit inputs outputs system unstable; };
|
specialArgs = { inherit inputs outputs system pkgs; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,24 @@
|
||||||
{ config, inputs, system, stateVersion, username, homeDirectory, pkgs, unstable
|
{
|
||||||
, ... }:
|
stateVersion,
|
||||||
let scripts = import ./scripts { inherit pkgs; };
|
username,
|
||||||
in {
|
homeDirectory,
|
||||||
imports = [ ./firefox ./fish ./sway ./neovim ./rofi ./thunderbird ];
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
scripts = import ./scripts { inherit pkgs; };
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./firefox
|
||||||
|
./fish
|
||||||
|
./sway
|
||||||
|
./neovim
|
||||||
|
./rofi
|
||||||
|
./thunderbird
|
||||||
|
];
|
||||||
|
|
||||||
xdg.configFile."gtk-4.0/gtk.css".source =
|
xdg.configFile."gtk-4.0/gtk.css".source = "${pkgs.catppuccin-gtk}/share/themes/Catppuccin-Frappe-Standard-Blue-Dark/gtk-4.0/gtk.css";
|
||||||
"${pkgs.catppuccin-gtk}/share/themes/Catppuccin-Frappe-Standard-Blue-Dark/gtk-4.0/gtk.css";
|
|
||||||
|
|
||||||
dconf = {
|
dconf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -38,11 +51,11 @@ in {
|
||||||
thunderbird
|
thunderbird
|
||||||
gnome.nautilus
|
gnome.nautilus
|
||||||
rofi-power-menu
|
rofi-power-menu
|
||||||
unstable.lollypop
|
lollypop
|
||||||
|
|
||||||
# Proprietary
|
# Proprietary
|
||||||
unstable.postman
|
postman
|
||||||
unstable.mongodb-compass
|
mongodb-compass
|
||||||
|
|
||||||
# CLI tools
|
# CLI tools
|
||||||
delta
|
delta
|
||||||
|
|
@ -56,11 +69,11 @@ in {
|
||||||
lazygit
|
lazygit
|
||||||
fd
|
fd
|
||||||
ripgrep
|
ripgrep
|
||||||
|
swaybg
|
||||||
|
|
||||||
# Scripts
|
# Scripts
|
||||||
scripts.screenshot
|
scripts.screenshot
|
||||||
scripts.set-background
|
scripts.set-background
|
||||||
|
|
||||||
];
|
];
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, config, lib, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
profiles.nico = {
|
profiles.nico = {
|
||||||
|
|
@ -7,66 +8,60 @@
|
||||||
search = {
|
search = {
|
||||||
default = "DuckDuckGo";
|
default = "DuckDuckGo";
|
||||||
force = true;
|
force = true;
|
||||||
engines = let
|
engines =
|
||||||
nixicon =
|
let
|
||||||
"${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
nixicon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
iconUpdateInteval = 24 * 60 * 60 * 1000; # every day
|
iconUpdateInteval = 24 * 60 * 60 * 1000; # every day
|
||||||
in {
|
in
|
||||||
"NixOS Packages" = {
|
{
|
||||||
urls = [{
|
"NixOS Packages" = {
|
||||||
template =
|
urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ];
|
||||||
"https://search.nixos.org/packages?query={searchTerms}";
|
icon = nixicon;
|
||||||
}];
|
definedAliases = [ "@nixpkg" ];
|
||||||
icon = nixicon;
|
};
|
||||||
definedAliases = [ "@nixpkg" ];
|
"NixOS Wiki" = {
|
||||||
|
urls = [ { template = "https://wiki.nixos.org/index.php?search={searchTerms}"; } ];
|
||||||
|
icon = nixicon;
|
||||||
|
definedAliases = [ "@nixwiki" ];
|
||||||
|
};
|
||||||
|
"NixOS Options" = {
|
||||||
|
urls = [ { template = "https://search.nixos.org/options?query={searchTerms}"; } ];
|
||||||
|
icon = nixicon;
|
||||||
|
definedAliases = [ "@nixoptions" ];
|
||||||
|
};
|
||||||
|
"Arch Wiki" = {
|
||||||
|
urls = [
|
||||||
|
{ template = "https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}"; }
|
||||||
|
];
|
||||||
|
iconUpdateURL = "https://nixos.wiki/favicon.ico";
|
||||||
|
updateInterval = iconUpdateInteval;
|
||||||
|
definedAliases = [ "@archwiki" ];
|
||||||
|
};
|
||||||
|
"DuckDuckGo" = {
|
||||||
|
urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ];
|
||||||
|
iconUpdateURL = "https://duckduckgo.com/favicon.ico";
|
||||||
|
updateInterval = iconUpdateInteval;
|
||||||
|
definedAliases = [
|
||||||
|
"@duckduckgo"
|
||||||
|
"@ddg"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"MyNixOS" = {
|
||||||
|
urls = [ { template = "https://mynixos.com/search?q={searchTerms}"; } ];
|
||||||
|
iconUpdateURL = "https://mynixos.com/favicon.ico";
|
||||||
|
updateInterval = iconUpdateInteval;
|
||||||
|
definedAliases = [
|
||||||
|
"@hm"
|
||||||
|
"@mynixos"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"stackoverflow" = {
|
||||||
|
urls = [ { template = "https://stackoverflow.com/search?q={searchTerms}"; } ];
|
||||||
|
iconUpdateURL = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
|
||||||
|
updateInterval = iconUpdateInteval;
|
||||||
|
definedAliases = [ "@stackoverflow" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
"NixOS Wiki" = {
|
|
||||||
urls = [{
|
|
||||||
template =
|
|
||||||
"https://wiki.nixos.org/index.php?search={searchTerms}";
|
|
||||||
}];
|
|
||||||
icon = nixicon;
|
|
||||||
definedAliases = [ "@nixwiki" ];
|
|
||||||
};
|
|
||||||
"NixOS Options" = {
|
|
||||||
urls = [{
|
|
||||||
template = "https://search.nixos.org/options?query={searchTerms}";
|
|
||||||
}];
|
|
||||||
icon = nixicon;
|
|
||||||
definedAliases = [ "@nixoptions" ];
|
|
||||||
};
|
|
||||||
"Arch Wiki" = {
|
|
||||||
urls = [{
|
|
||||||
template =
|
|
||||||
"https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}";
|
|
||||||
}];
|
|
||||||
iconUpdateURL = "https://nixos.wiki/favicon.ico";
|
|
||||||
updateInterval = iconUpdateInteval;
|
|
||||||
definedAliases = [ "@archwiki" ];
|
|
||||||
};
|
|
||||||
"DuckDuckGo" = {
|
|
||||||
urls = [{ template = "https://duckduckgo.com/?q={searchTerms}"; }];
|
|
||||||
iconUpdateURL = "https://duckduckgo.com/favicon.ico";
|
|
||||||
updateInterval = iconUpdateInteval;
|
|
||||||
definedAliases = [ "@duckduckgo" "@ddg" ];
|
|
||||||
};
|
|
||||||
"MyNixOS" = {
|
|
||||||
urls =
|
|
||||||
[{ template = "https://mynixos.com/search?q={searchTerms}"; }];
|
|
||||||
iconUpdateURL = "https://mynixos.com/favicon.ico";
|
|
||||||
updateInterval = iconUpdateInteval;
|
|
||||||
definedAliases = [ "@hm" "@mynixos" ];
|
|
||||||
};
|
|
||||||
"stackoverflow" = {
|
|
||||||
urls = [{
|
|
||||||
template = "https://stackoverflow.com/search?q={searchTerms}";
|
|
||||||
}];
|
|
||||||
iconUpdateURL =
|
|
||||||
"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
|
|
||||||
updateInterval = iconUpdateInteval;
|
|
||||||
definedAliases = [ "@stackoverflow" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, config, lib, ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
shellAbbrs = {
|
shellAbbrs = {
|
||||||
|
|
@ -12,8 +13,7 @@
|
||||||
functions = {
|
functions = {
|
||||||
gitignore = "curl -sL https://www.gitignore.io/api/$argv";
|
gitignore = "curl -sL https://www.gitignore.io/api/$argv";
|
||||||
nrun = "nix run nixpkgs#$argv[1] -- $argv[2..]";
|
nrun = "nix run nixpkgs#$argv[1] -- $argv[2..]";
|
||||||
mv-bad-creation-date = ''
|
mv-bad-creation-date = ''exiftool -if 'not $CreateDate' -p '$FileName' "$PWD/$argv[1]" | xargs -I {} mv -i "$PWD/$argv[1]/{}" "$argv[2]"'';
|
||||||
exiftool -if 'not $CreateDate' -p '$FileName' "$PWD/$argv[1]" | xargs -I {} mv -i "$PWD/$argv[1]/{}" "$argv[2]"'';
|
|
||||||
rename-images = ''
|
rename-images = ''
|
||||||
set -f input "$PWD/$argv[1]"
|
set -f input "$PWD/$argv[1]"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,44 +1,48 @@
|
||||||
{ pkgs, system, config, lib, ... }: {
|
{ pkgs, ... }:
|
||||||
programs.neovim = let
|
{
|
||||||
customR = pkgs.rWrapper.override {
|
programs.neovim =
|
||||||
packages = with pkgs.rPackages; [ styler languageserver ];
|
let
|
||||||
|
customR = pkgs.rWrapper.override {
|
||||||
|
packages = with pkgs.rPackages; [
|
||||||
|
styler
|
||||||
|
languageserver
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
defaultEditor = true;
|
||||||
|
viAlias = true;
|
||||||
|
vimAlias = true;
|
||||||
|
enable = true;
|
||||||
|
withPython3 = false;
|
||||||
|
withRuby = false;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
# Language Servers
|
||||||
|
rust-analyzer
|
||||||
|
nixd
|
||||||
|
clang
|
||||||
|
nodePackages_latest.pyright
|
||||||
|
nodePackages_latest.bash-language-server
|
||||||
|
lua-language-server
|
||||||
|
zls
|
||||||
|
#rPackages.languageserver
|
||||||
|
|
||||||
|
# Formatter
|
||||||
|
python311Packages.black # Python formatter
|
||||||
|
#rPackages.styler # R formatter
|
||||||
|
nodePackages_latest.prettier # JSON, JS, TS formatter
|
||||||
|
yamlfmt # YAML formatter
|
||||||
|
taplo # TOML formatter
|
||||||
|
rustfmt # Rust formatter
|
||||||
|
shfmt # Shell, Bash etc.
|
||||||
|
nixfmt-rfc-style
|
||||||
|
# Misc
|
||||||
|
ripgrep
|
||||||
|
rustc
|
||||||
|
cargo
|
||||||
|
|
||||||
|
# R
|
||||||
|
customR
|
||||||
|
];
|
||||||
};
|
};
|
||||||
in {
|
|
||||||
defaultEditor = true;
|
|
||||||
viAlias = true;
|
|
||||||
vimAlias = true;
|
|
||||||
enable = true;
|
|
||||||
withPython3 = false;
|
|
||||||
withRuby = false;
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
# Language Servers
|
|
||||||
rust-analyzer
|
|
||||||
#unstable.rust-analyzer
|
|
||||||
nixd
|
|
||||||
clang
|
|
||||||
nodePackages_latest.pyright
|
|
||||||
nodePackages_latest.bash-language-server
|
|
||||||
lua-language-server
|
|
||||||
zls
|
|
||||||
#rPackages.languageserver
|
|
||||||
|
|
||||||
# Formatter
|
|
||||||
python311Packages.black # Python formatter
|
|
||||||
#rPackages.styler # R formatter
|
|
||||||
nodePackages_latest.prettier # JSON, JS, TS formatter
|
|
||||||
yamlfmt # YAML formatter
|
|
||||||
taplo # TOML formatter
|
|
||||||
rustfmt # Rust formatter
|
|
||||||
shfmt # Shell, Bash etc.
|
|
||||||
|
|
||||||
# Misc
|
|
||||||
ripgrep
|
|
||||||
rustc
|
|
||||||
cargo
|
|
||||||
|
|
||||||
# R
|
|
||||||
customR
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,40 @@
|
||||||
{ pkgs, config, lib, ... }: {
|
{ pkgs, config, ... }:
|
||||||
programs.rofi = let conf = "${config.home.homeDirectory}/.config/rofi";
|
{
|
||||||
in {
|
programs.rofi =
|
||||||
enable = true;
|
let
|
||||||
plugins = [ pkgs.rofi-calc ];
|
conf = "${config.home.homeDirectory}/.config/rofi";
|
||||||
theme = "${conf}/themes/rounded-gray-dark.rasi";
|
in
|
||||||
terminal = "${pkgs.alacritty}/bin/alacritty";
|
{
|
||||||
extraConfig = {
|
enable = true;
|
||||||
modes = [
|
plugins = [ pkgs.rofi-calc ];
|
||||||
"combi"
|
theme = "${conf}/themes/rounded-gray-dark.rasi";
|
||||||
"filebrowser"
|
terminal = "${pkgs.alacritty}/bin/alacritty";
|
||||||
"ssh"
|
extraConfig = {
|
||||||
"drun"
|
modes = [
|
||||||
"run"
|
"combi"
|
||||||
"calc"
|
"filebrowser"
|
||||||
"vm:${conf}/scripts/libvirt-controller.py"
|
"ssh"
|
||||||
"obsidian:rofi-obsidian"
|
"drun"
|
||||||
];
|
"run"
|
||||||
matching = "fuzzy";
|
"calc"
|
||||||
sort = true;
|
"vm:${conf}/scripts/libvirt-controller.py"
|
||||||
sorting-method = "fzf";
|
"obsidian:rofi-obsidian"
|
||||||
show-icons = true;
|
];
|
||||||
steal-focus = true;
|
matching = "fuzzy";
|
||||||
drun-use-desktop-cache = true;
|
sort = true;
|
||||||
drun-reload-desktop-cache = true;
|
sorting-method = "fzf";
|
||||||
combi-modes = [ "window" "drun" "filebrowser" "ssh" "calc" "obsidian" ];
|
show-icons = true;
|
||||||
|
steal-focus = true;
|
||||||
|
drun-use-desktop-cache = true;
|
||||||
|
drun-reload-desktop-cache = true;
|
||||||
|
combi-modes = [
|
||||||
|
"window"
|
||||||
|
"drun"
|
||||||
|
"filebrowser"
|
||||||
|
"ssh"
|
||||||
|
"calc"
|
||||||
|
"obsidian"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,14 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
screenshot = with pkgs;
|
{
|
||||||
|
screenshot =
|
||||||
|
with pkgs;
|
||||||
writeShellApplication {
|
writeShellApplication {
|
||||||
name = "screenshot";
|
name = "screenshot";
|
||||||
runtimeInputs = [ slurp wl-clipboard libnotify ];
|
runtimeInputs = [
|
||||||
|
slurp
|
||||||
|
wl-clipboard
|
||||||
|
libnotify
|
||||||
|
];
|
||||||
text = ''
|
text = ''
|
||||||
location="$HOME/Pictures/Screenshots/$(date +%Y-%m-%d-%H%M%S)-screenshot.png";
|
location="$HOME/Pictures/Screenshots/$(date +%Y-%m-%d-%H%M%S)-screenshot.png";
|
||||||
|
|
||||||
|
|
@ -12,11 +18,12 @@
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
set-background = pkgs.writers.writeFishBin "set-background" (builtins.readFile
|
set-background = pkgs.writers.writeFishBin "set-background" (
|
||||||
(pkgs.fetchurl {
|
builtins.readFile (
|
||||||
url =
|
pkgs.fetchurl {
|
||||||
"https://codeberg.org/Nydragon/scripts/raw/commit/bb7a40545fa5cfce177cdac009d9f46f4823d360/set_background.fish";
|
url = "https://codeberg.org/Nydragon/scripts/raw/commit/bb7a40545fa5cfce177cdac009d9f46f4823d360/set_background.fish";
|
||||||
hash = "sha256-Qoz5nn0tqV6QtsXv9fsOkf3PafL30iO/eIkh8ro6O+c=";
|
hash = "sha256-Qoz5nn0tqV6QtsXv9fsOkf3PafL30iO/eIkh8ro6O+c=";
|
||||||
}));
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,188 +1,168 @@
|
||||||
# vim:fileencoding=utf-8:foldmethod=marker
|
# vim:fileencoding=utf-8:foldmethod=marker
|
||||||
{ pkgs, config, lib, ... }: {
|
{
|
||||||
imports = [ ./swayidle.nix ];
|
pkgs,
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./swayidle.nix
|
||||||
|
./swaylock.nix
|
||||||
|
];
|
||||||
|
|
||||||
wayland.windowManager.sway = let
|
wayland.windowManager.sway =
|
||||||
screenshot = (import ../scripts { inherit pkgs; }).screenshot;
|
let
|
||||||
set-background = (import ../scripts { inherit pkgs; }).set-background;
|
screenshot = (import ../scripts { inherit pkgs; }).screenshot;
|
||||||
|
set-background = (import ../scripts { inherit pkgs; }).set-background;
|
||||||
|
|
||||||
homeDirectory = config.home.homeDirectory;
|
homeDirectory = config.home.homeDirectory;
|
||||||
term = "${pkgs.alacritty}/bin/alacritty";
|
term = "${pkgs.alacritty}/bin/alacritty";
|
||||||
filemanager = "${pkgs.gnome.nautilus}/bin/nautilus";
|
filemanager = "${pkgs.gnome.nautilus}/bin/nautilus";
|
||||||
colors = {
|
colors = {
|
||||||
lavender = "#babbf1";
|
lavender = "#babbf1";
|
||||||
black = "#000000";
|
black = "#000000";
|
||||||
};
|
|
||||||
inputs = {
|
|
||||||
kb = {
|
|
||||||
builtin = "1:1:AT_Translated_Set_2_keyboard";
|
|
||||||
keychron = "1452:591:Keychron_K4_Keychron_K4";
|
|
||||||
keychron_bt = "1452:591:Keychron_K4";
|
|
||||||
};
|
};
|
||||||
};
|
inputs = {
|
||||||
wallpaper = "${homeDirectory}/Pictures/backgrounds/catppucchin";
|
kb = {
|
||||||
scripts = "${homeDirectory}/.config/system_scripts";
|
builtin = "1:1:AT_Translated_Set_2_keyboard";
|
||||||
in {
|
keychron = "1452:591:Keychron_K4_Keychron_K4";
|
||||||
enable = true;
|
keychron_bt = "1452:591:Keychron_K4";
|
||||||
xwayland = true;
|
|
||||||
wrapperFeatures.gtk = true;
|
|
||||||
extraConfigEarly = ''
|
|
||||||
exec systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service
|
|
||||||
'';
|
|
||||||
extraConfig = ''
|
|
||||||
titlebar_padding 1
|
|
||||||
floating_modifier Mod4 normal
|
|
||||||
bindgesture {
|
|
||||||
swipe:right workspace prev
|
|
||||||
swipe:left workspace next
|
|
||||||
swipe:up focus up
|
|
||||||
swipe:down focus down
|
|
||||||
}
|
|
||||||
workspace 1
|
|
||||||
'';
|
|
||||||
config = {
|
|
||||||
bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
|
|
||||||
modifier = "Mod4";
|
|
||||||
#: Keybindings {{{
|
|
||||||
keybindings = let mod = config.wayland.windowManager.sway.config.modifier;
|
|
||||||
in lib.mkOptionDefault {
|
|
||||||
"${mod}+p" = "exec ${pkgs.swaylock}/bin/swaylock";
|
|
||||||
"${mod}+Shift+p" =
|
|
||||||
"exec ${pkgs.rofi}/bin/rofi -show p -modi p:rofi-power-menu";
|
|
||||||
# Reload the config file
|
|
||||||
"${mod}+Shift+c" = "reload";
|
|
||||||
# Kill the focused window
|
|
||||||
"${mod}+Shift+q" = "kill";
|
|
||||||
# Make focused window fullscreen
|
|
||||||
"${mod}+f" = "fullscreen";
|
|
||||||
# Start launcher
|
|
||||||
"${mod}+d" =
|
|
||||||
"exec rofi -config ${homeDirectory}/.config/rofi/config.rasi -show combi -automatic-save-to-history | xargs swaymsg exec --";
|
|
||||||
# Toggle the current focus between tiling and floating mode
|
|
||||||
"${mod}+Shift+space" = "floating toggle";
|
|
||||||
"${mod}+Return" = "exec ${term}";
|
|
||||||
"${mod}+e" = "exec ${filemanager}";
|
|
||||||
"${mod}+x" = "layout toggle stacking split";
|
|
||||||
"${mod}+Control+Left" = "workspace prev";
|
|
||||||
"${mod}+Control+Right" = "workspace next";
|
|
||||||
"${mod}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t";
|
|
||||||
"--locked XF86MonBrightnessUp" =
|
|
||||||
"exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl s +10%";
|
|
||||||
"--locked XF86MonBrightnessDown" =
|
|
||||||
"exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl s 10%-";
|
|
||||||
"--locked XF86AudioRaiseVolume" =
|
|
||||||
"exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
|
|
||||||
"--locked XF86AudioLowerVolume" =
|
|
||||||
"exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
|
|
||||||
"--locked XF86AudioMicMute" =
|
|
||||||
"exec --no-startup-id ${pkgs.pamixer}/bin/pamixer --default-source -m";
|
|
||||||
"--locked XF86AudioMute" =
|
|
||||||
"exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
|
|
||||||
"--locked XF86AudioPlay" = "exec playerctl play-pause";
|
|
||||||
"--locked XF86AudioPause" = "exec playerctl play-pause";
|
|
||||||
"--locked XF86AudioNext" = "exec playerctl next";
|
|
||||||
"--locked XF86AudioPrev" = "exec playerctl previous";
|
|
||||||
"Print" = "exec ${screenshot}/bin/screenshot";
|
|
||||||
"${mod}+u" = "exec ${screenshot}/bin/screenshot";
|
|
||||||
#: {{{
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+ampersand" =
|
|
||||||
"workspace number 1";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+eacute" =
|
|
||||||
"workspace number 2";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+quotedbl" =
|
|
||||||
"workspace number 3";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+apostrophe" =
|
|
||||||
"workspace number 4";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+parenleft" =
|
|
||||||
"workspace number 5";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+minus" =
|
|
||||||
"workspace number 6";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+egrave" =
|
|
||||||
"workspace number 7";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+underscore" =
|
|
||||||
"workspace number 8";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+ccedilla" =
|
|
||||||
"workspace number 9";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+agrave" =
|
|
||||||
"workspace number 10";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+ampersand" =
|
|
||||||
"move container to workspace number 1";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+eacute" =
|
|
||||||
"move container to workspace number 2";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+quotedbl" =
|
|
||||||
"move container to workspace number 3";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+apostrophe" =
|
|
||||||
"move container to workspace number 4";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+parenleft" =
|
|
||||||
"move container to workspace number 5";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+minus" =
|
|
||||||
"move container to workspace number 6";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+egrave" =
|
|
||||||
"move container to workspace number 7";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+underscore" =
|
|
||||||
"move container to workspace number 8";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+ccedilla" =
|
|
||||||
"move container to workspace number 9";
|
|
||||||
"--input-device=${inputs.kb.builtin} ${mod}+Shift+agrave" =
|
|
||||||
"move container to workspace number 10";
|
|
||||||
#: }}}
|
|
||||||
};
|
|
||||||
#: }}}
|
|
||||||
#: Startup {{{
|
|
||||||
startup = [
|
|
||||||
{
|
|
||||||
command =
|
|
||||||
"${pkgs.swayidle}/bin/swayidle -C ${homeDirectory}/.config/swayidle/config";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
|
|
||||||
command = "${pkgs.swaynotificationcenter}/bin/swaync";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
command = ''
|
|
||||||
[ -z "$(pidof nextcloud)" ] && ${pkgs.nextcloud-client}/bin/nextcloud --background'';
|
|
||||||
}
|
|
||||||
{
|
|
||||||
command = ''
|
|
||||||
[ -z "$(pidof kdeconnect-indicator)" ] && ${pkgs.kdeconnect}/bin/kdeconnect-indicator
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
{
|
|
||||||
command = "${set-background}/bin/set-background -f ${wallpaper}";
|
|
||||||
always = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
command =
|
|
||||||
"${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config --reload-css";
|
|
||||||
always = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
#: }}}
|
|
||||||
assigns = {
|
|
||||||
"2" = [{ app_id = "firefox"; }];
|
|
||||||
"3" = [ ];
|
|
||||||
"4" = [{ class = "discord"; }];
|
|
||||||
"5" = [{ app_id = "lollypop"; }];
|
|
||||||
};
|
|
||||||
seat = {
|
|
||||||
"*" = {
|
|
||||||
xcursor_theme = "Catppuccin-Frappe-Lavender-Cursors 32";
|
|
||||||
keyboard_grouping = "none";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
window = {
|
wallpaper = "${homeDirectory}/Pictures/backgrounds/catppucchin";
|
||||||
border = 3;
|
in
|
||||||
commands = [
|
{
|
||||||
|
enable = true;
|
||||||
|
xwayland = true;
|
||||||
|
wrapperFeatures.gtk = true;
|
||||||
|
extraConfigEarly = ''
|
||||||
|
exec systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service
|
||||||
|
'';
|
||||||
|
extraConfig = ''
|
||||||
|
titlebar_padding 1
|
||||||
|
floating_modifier Mod4 normal
|
||||||
|
bindgesture {
|
||||||
|
swipe:right workspace prev
|
||||||
|
swipe:left workspace next
|
||||||
|
swipe:up focus up
|
||||||
|
swipe:down focus down
|
||||||
|
}
|
||||||
|
workspace 1
|
||||||
|
'';
|
||||||
|
config = {
|
||||||
|
bars = [ { command = "${pkgs.waybar}/bin/waybar"; } ];
|
||||||
|
modifier = "Mod4";
|
||||||
|
#: Keybindings {{{
|
||||||
|
keybindings =
|
||||||
|
let
|
||||||
|
mod = config.wayland.windowManager.sway.config.modifier;
|
||||||
|
in
|
||||||
|
lib.mkOptionDefault {
|
||||||
|
"${mod}+p" = "exec ${pkgs.swaylock}/bin/swaylock";
|
||||||
|
"${mod}+Shift+p" = "exec ${pkgs.rofi}/bin/rofi -show p -modi p:rofi-power-menu";
|
||||||
|
# Reload the config file
|
||||||
|
"${mod}+Shift+c" = "reload";
|
||||||
|
# Kill the focused window
|
||||||
|
"${mod}+Shift+q" = "kill";
|
||||||
|
# Make focused window fullscreen
|
||||||
|
"${mod}+f" = "fullscreen";
|
||||||
|
# Start launcher
|
||||||
|
"${mod}+d" = "exec rofi -config ${homeDirectory}/.config/rofi/config.rasi -show combi -automatic-save-to-history | xargs swaymsg exec --";
|
||||||
|
# Toggle the current focus between tiling and floating mode
|
||||||
|
"${mod}+Shift+space" = "floating toggle";
|
||||||
|
"${mod}+Return" = "exec ${term}";
|
||||||
|
"${mod}+e" = "exec ${filemanager}";
|
||||||
|
"${mod}+x" = "layout toggle stacking split";
|
||||||
|
"${mod}+Control+Left" = "workspace prev";
|
||||||
|
"${mod}+Control+Right" = "workspace next";
|
||||||
|
"${mod}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t";
|
||||||
|
"--locked XF86MonBrightnessUp" = "exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl s +10%";
|
||||||
|
"--locked XF86MonBrightnessDown" = "exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl s 10%-";
|
||||||
|
"--locked XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
|
||||||
|
"--locked XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
|
||||||
|
"--locked XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer --default-source -m";
|
||||||
|
"--locked XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
|
||||||
|
"--locked XF86AudioPlay" = "exec playerctl play-pause";
|
||||||
|
"--locked XF86AudioPause" = "exec playerctl play-pause";
|
||||||
|
"--locked XF86AudioNext" = "exec playerctl next";
|
||||||
|
"--locked XF86AudioPrev" = "exec playerctl previous";
|
||||||
|
"Print" = "exec ${screenshot}/bin/screenshot";
|
||||||
|
"${mod}+u" = "exec ${screenshot}/bin/screenshot";
|
||||||
|
#: {{{
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+ampersand" = "workspace number 1";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+eacute" = "workspace number 2";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+quotedbl" = "workspace number 3";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+apostrophe" = "workspace number 4";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+parenleft" = "workspace number 5";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+minus" = "workspace number 6";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+egrave" = "workspace number 7";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+underscore" = "workspace number 8";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+ccedilla" = "workspace number 9";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+agrave" = "workspace number 10";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+ampersand" = "move container to workspace number 1";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+eacute" = "move container to workspace number 2";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+quotedbl" = "move container to workspace number 3";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+apostrophe" = "move container to workspace number 4";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+parenleft" = "move container to workspace number 5";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+minus" = "move container to workspace number 6";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+egrave" = "move container to workspace number 7";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+underscore" = "move container to workspace number 8";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+ccedilla" = "move container to workspace number 9";
|
||||||
|
"--input-device=${inputs.kb.builtin} ${mod}+Shift+agrave" = "move container to workspace number 10";
|
||||||
|
#: }}}
|
||||||
|
};
|
||||||
|
#: }}}
|
||||||
|
#: Startup {{{
|
||||||
|
startup = [
|
||||||
|
{ command = "${pkgs.swayidle}/bin/swayidle -C ${homeDirectory}/.config/swayidle/config"; }
|
||||||
{
|
{
|
||||||
command = "inhibit_idle fullscreen";
|
|
||||||
criteria = {
|
command = "${pkgs.swaynotificationcenter}/bin/swaync";
|
||||||
class = "^.*$";
|
|
||||||
app_id = "^.*$";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
command = "floating enable";
|
command = ''[ -z "$(pidof nextcloud)" ] && ${pkgs.nextcloud-client}/bin/nextcloud --background'';
|
||||||
criteria.app_id = "^(${
|
}
|
||||||
|
{
|
||||||
|
command = ''
|
||||||
|
[ -z "$(pidof kdeconnect-indicator)" ] && ${pkgs.kdeconnect}/bin/kdeconnect-indicator
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
{
|
||||||
|
command = "${set-background}/bin/set-background -f ${wallpaper}";
|
||||||
|
always = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
command = "${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config --reload-css";
|
||||||
|
always = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
#: }}}
|
||||||
|
assigns = {
|
||||||
|
"2" = [ { app_id = "firefox"; } ];
|
||||||
|
"3" = [ ];
|
||||||
|
"4" = [ { class = "discord"; } ];
|
||||||
|
"5" = [ { app_id = "lollypop"; } ];
|
||||||
|
};
|
||||||
|
seat = {
|
||||||
|
"*" = {
|
||||||
|
xcursor_theme = "Catppuccin-Frappe-Lavender-Cursors 32";
|
||||||
|
keyboard_grouping = "none";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
window = {
|
||||||
|
border = 3;
|
||||||
|
commands = [
|
||||||
|
{
|
||||||
|
command = "inhibit_idle fullscreen";
|
||||||
|
criteria = {
|
||||||
|
class = "^.*$";
|
||||||
|
app_id = "^.*$";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
command = "floating enable";
|
||||||
|
criteria.app_id = "^(${
|
||||||
(lib.strings.concatStringsSep "|" [
|
(lib.strings.concatStringsSep "|" [
|
||||||
"org.keepassxc.KeePassXC"
|
"org.keepassxc.KeePassXC"
|
||||||
"xdg-desktop-portal-gtk"
|
"xdg-desktop-portal-gtk"
|
||||||
|
|
@ -190,61 +170,64 @@
|
||||||
"com.nextcloud.desktopclient.nextcloud"
|
"com.nextcloud.desktopclient.nextcloud"
|
||||||
])
|
])
|
||||||
})$";
|
})$";
|
||||||
|
}
|
||||||
}
|
{
|
||||||
{
|
command = ''title_format "[XWayland] %title"'';
|
||||||
command = ''title_format "[XWayland] %title"'';
|
criteria.shell = "xwayland";
|
||||||
criteria.shell = "xwayland";
|
}
|
||||||
}
|
{
|
||||||
{
|
command = "move position mouse";
|
||||||
command = "move position mouse";
|
criteria.app_id = "com.nextcloud.desktopclient.nextcloud";
|
||||||
criteria.app_id = "com.nextcloud.desktopclient.nextcloud";
|
}
|
||||||
}
|
];
|
||||||
];
|
};
|
||||||
|
terminal = "${term}";
|
||||||
|
colors = with colors; {
|
||||||
|
focused = {
|
||||||
|
border = lavender;
|
||||||
|
background = lavender;
|
||||||
|
text = black;
|
||||||
|
indicator = "#00d4ff";
|
||||||
|
childBorder = lavender;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
gaps = {
|
||||||
|
inner = 5;
|
||||||
|
};
|
||||||
|
#: Input {{{
|
||||||
|
input = {
|
||||||
|
"*" = {
|
||||||
|
xkb_layout = "fr,us";
|
||||||
|
xkb_options = "grp:alt_shift_toggle,compose:caps";
|
||||||
|
};
|
||||||
|
"${inputs.kb.builtin}" = {
|
||||||
|
xkb_layout = "fr";
|
||||||
|
};
|
||||||
|
"${inputs.kb.keychron}" = {
|
||||||
|
xkb_layout = "us";
|
||||||
|
xkb_numlock = "enabled";
|
||||||
|
};
|
||||||
|
"${inputs.kb.keychron_bt}" = {
|
||||||
|
xkb_layout = "us";
|
||||||
|
xkb_numlock = "enabled";
|
||||||
|
};
|
||||||
|
"type:touchpad" = {
|
||||||
|
tap = "enabled";
|
||||||
|
natural_scroll = "enabled";
|
||||||
|
click_method = "clickfinger";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
#: }}}
|
||||||
|
#: Output {{{
|
||||||
|
output = {
|
||||||
|
eDP-1 = {
|
||||||
|
scale = "2";
|
||||||
|
pos = "0 0";
|
||||||
|
res = "3840x2400";
|
||||||
|
adaptive_sync = "on";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
#: }}}
|
||||||
};
|
};
|
||||||
terminal = "${term}";
|
|
||||||
colors = with colors; {
|
|
||||||
focused = {
|
|
||||||
border = lavender;
|
|
||||||
background = lavender;
|
|
||||||
text = black;
|
|
||||||
indicator = "#00d4ff";
|
|
||||||
childBorder = lavender;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
gaps = { inner = 5; };
|
|
||||||
#: Input {{{
|
|
||||||
input = {
|
|
||||||
"*" = {
|
|
||||||
xkb_layout = "fr,us";
|
|
||||||
xkb_options = "grp:alt_shift_toggle,compose:caps";
|
|
||||||
};
|
|
||||||
"${inputs.kb.builtin}" = { xkb_layout = "fr"; };
|
|
||||||
"${inputs.kb.keychron}" = {
|
|
||||||
xkb_layout = "us";
|
|
||||||
xkb_numlock = "enabled";
|
|
||||||
};
|
|
||||||
"${inputs.kb.keychron_bt}" = {
|
|
||||||
xkb_layout = "us";
|
|
||||||
xkb_numlock = "enabled";
|
|
||||||
};
|
|
||||||
"type:touchpad" = {
|
|
||||||
tap = "enabled";
|
|
||||||
natural_scroll = "enabled";
|
|
||||||
click_method = "clickfinger";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
#: }}}
|
|
||||||
#: Output {{{
|
|
||||||
output = {
|
|
||||||
eDP-1 = {
|
|
||||||
scale = "2";
|
|
||||||
pos = "0 0";
|
|
||||||
res = "3840x2400";
|
|
||||||
adaptive_sync = "on";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
#: }}}
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ pkgs, config, lib, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
services.swayidle = {
|
services.swayidle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
events = [
|
events = [
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pointer = {
|
pointer = {
|
||||||
|
|
@ -6,8 +6,11 @@ let
|
||||||
package = pkgs.catppuccin-cursors.frappeLavender;
|
package = pkgs.catppuccin-cursors.frappeLavender;
|
||||||
size = 32;
|
size = 32;
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
programs.swaylock = { enable = true; };
|
{
|
||||||
|
programs.swaylock = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = {
|
theme = {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
{ pkgs, config, lib, ... }: {
|
{ ... }:
|
||||||
|
{
|
||||||
programs.thunderbird = {
|
programs.thunderbird = {
|
||||||
enable = true;
|
enable = true;
|
||||||
#settings = { mailnews.wraplength = 80; };
|
#settings = { mailnews.wraplength = 80; };
|
||||||
profiles.nico = { isDefault = true; };
|
profiles.nico = {
|
||||||
|
isDefault = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,20 @@
|
||||||
# vim:fileencoding=utf-8:foldmethod=marker
|
# vim:fileencoding=utf-8:foldmethod=marker
|
||||||
{ config, pkgs, lib, inputs, system, unstable, ... }:
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
system,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
stateVersion = "23.11";
|
stateVersion = "23.11";
|
||||||
username = "nico";
|
username = "nico";
|
||||||
hostename = "xps9510";
|
hostname = "xps9510";
|
||||||
homeDirectory = "/home/${username}";
|
homeDirectory = "/home/${username}";
|
||||||
|
in
|
||||||
in {
|
{
|
||||||
imports = [ # Include the results of the hardware scan.
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
../../modules
|
../../modules
|
||||||
|
|
@ -17,13 +24,9 @@ in {
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device =
|
boot.initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device = "/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
|
||||||
"/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
|
networking.hostName = hostname;
|
||||||
networking.hostName = hostename;
|
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
|
@ -52,26 +55,35 @@ in {
|
||||||
|
|
||||||
xdg.mime = {
|
xdg.mime = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultApplications = let
|
defaultApplications =
|
||||||
fileManager = "org.gnome.Nautilus.desktop";
|
let
|
||||||
browser = "firefox.desktop";
|
fileManager = "org.gnome.Nautilus.desktop";
|
||||||
in {
|
browser = "firefox.desktop";
|
||||||
"inode/directory" = fileManager;
|
in
|
||||||
"application/zip" = fileManager;
|
{
|
||||||
"application/pdf" = browser;
|
"inode/directory" = fileManager;
|
||||||
"x-www-browser" = browser;
|
"application/zip" = fileManager;
|
||||||
"text/html" = browser;
|
"application/pdf" = browser;
|
||||||
"image/*" = "org.gnome.Loupe.desktop";
|
"x-www-browser" = browser;
|
||||||
"image/png" = "org.gnome.Loupe.desktop";
|
"text/html" = browser;
|
||||||
"image/jpeg" = "org.gnome.Loupe.desktop";
|
"image/*" = "org.gnome.Loupe.desktop";
|
||||||
"x-scheme-handler/http" = browser;
|
"image/png" = "org.gnome.Loupe.desktop";
|
||||||
"x-scheme-handler/https" = browser;
|
"image/jpeg" = "org.gnome.Loupe.desktop";
|
||||||
};
|
"x-scheme-handler/http" = browser;
|
||||||
|
"x-scheme-handler/https" = browser;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.${username} = import ../../home {
|
home-manager.users.${username} = import ../../home {
|
||||||
inherit config pkgs system inputs stateVersion username homeDirectory
|
inherit
|
||||||
unstable;
|
config
|
||||||
|
pkgs
|
||||||
|
system
|
||||||
|
inputs
|
||||||
|
stateVersion
|
||||||
|
username
|
||||||
|
homeDirectory
|
||||||
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
# home-manager.users.nico =
|
# home-manager.users.nico =
|
||||||
|
|
@ -79,7 +91,7 @@ in {
|
||||||
#{ config, pkgs, ... }:
|
#{ config, pkgs, ... }:
|
||||||
#programs.vscode = {
|
#programs.vscode = {
|
||||||
#enable = false;
|
#enable = false;
|
||||||
#package = unstable.vscodium;
|
#package = vscodium;
|
||||||
#extensions = with pkgs.vscode-extensions; [
|
#extensions = with pkgs.vscode-extensions; [
|
||||||
#yzhang.markdown-all-in-one
|
#yzhang.markdown-all-in-one
|
||||||
#rust-lang.rust-analyzer
|
#rust-lang.rust-analyzer
|
||||||
|
|
@ -117,7 +129,6 @@ in {
|
||||||
#Optional helps save long term battery health
|
#Optional helps save long term battery health
|
||||||
START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
|
START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
|
||||||
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -153,15 +164,19 @@ in {
|
||||||
users.users.${username} = {
|
users.users.${username} = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
extraGroups = [ "networkmanager" "wheel" "audio" "libvirtd" ];
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
"audio"
|
||||||
|
"libvirtd"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.greetd = {
|
services.greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = rec {
|
settings = rec {
|
||||||
initial_session = {
|
initial_session = {
|
||||||
command =
|
command = "${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";
|
||||||
"${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";
|
|
||||||
user = "${username}";
|
user = "${username}";
|
||||||
};
|
};
|
||||||
default_session = initial_session;
|
default_session = initial_session;
|
||||||
|
|
@ -179,7 +194,7 @@ in {
|
||||||
#grim
|
#grim
|
||||||
#slurp
|
#slurp
|
||||||
#wl-clipboard
|
#wl-clipboard
|
||||||
#unstable.swaynotificationcenter
|
#swaynotificationcenter
|
||||||
#swaybg
|
#swaybg
|
||||||
#swaylock
|
#swaylock
|
||||||
#swayidle
|
#swayidle
|
||||||
|
|
@ -208,10 +223,11 @@ in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
shared-mime-info
|
shared-mime-info
|
||||||
fish
|
fish
|
||||||
firefox
|
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
git
|
git
|
||||||
keepassxc
|
keepassxc
|
||||||
|
firefox
|
||||||
|
htop
|
||||||
alacritty
|
alacritty
|
||||||
eza
|
eza
|
||||||
bat
|
bat
|
||||||
|
|
@ -224,7 +240,6 @@ in {
|
||||||
dconf
|
dconf
|
||||||
pavucontrol
|
pavucontrol
|
||||||
xdg-utils
|
xdg-utils
|
||||||
htop
|
|
||||||
brightnessctl
|
brightnessctl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,12 @@
|
||||||
# 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,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
@ -24,16 +29,14 @@
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-ef68c7a7-4355-4c37-bd6f-b753f6b9520c".device =
|
boot.initrd.luks.devices."luks-ef68c7a7-4355-4c37-bd6f-b753f6b9520c".device = "/dev/disk/by-uuid/ef68c7a7-4355-4c37-bd6f-b753f6b9520c";
|
||||||
"/dev/disk/by-uuid/ef68c7a7-4355-4c37-bd6f-b753f6b9520c";
|
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/83C5-F9F2";
|
device = "/dev/disk/by-uuid/83C5-F9F2";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [ { device = "/dev/disk/by-uuid/ba211282-a02a-42d6-9a89-9998ffee4755"; } ];
|
||||||
[{ device = "/dev/disk/by-uuid/ba211282-a02a-42d6-9a89-9998ffee4755"; }];
|
|
||||||
|
|
||||||
# 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
|
||||||
|
|
@ -43,6 +46,5 @@
|
||||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode =
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue