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": {
|
||||
"locked": {
|
||||
"lastModified": 1715458517,
|
||||
"narHash": "sha256-oi4z6RuLnGTR8TbjPcN/D2jFKywCrMRhAtSfgPHY9nE=",
|
||||
"lastModified": 1715534503,
|
||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "09208c1471b96985c809998af55d82e134a750b8",
|
||||
"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",
|
||||
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -54,8 +39,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
12
flake.nix
12
flake.nix
|
|
@ -2,8 +2,7 @@
|
|||
description = "Nydragon's configuration'";
|
||||
|
||||
inputs = {
|
||||
nixpkgs = { url = "github:nixos/nixpkgs"; };
|
||||
nixpkgs-unstable = { url = "github:nixos/nixpkgs?ref=nixos-unstable"; };
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
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
|
||||
inherit (self) outputs;
|
||||
|
||||
|
|
@ -22,18 +21,13 @@
|
|||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
lib = nixpkgs.lib;
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
xps9510 = lib.nixosSystem {
|
||||
inherit system;
|
||||
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
|
||||
, ... }:
|
||||
let scripts = import ./scripts { inherit pkgs; };
|
||||
in {
|
||||
imports = [ ./firefox ./fish ./sway ./neovim ./rofi ./thunderbird ];
|
||||
{
|
||||
stateVersion,
|
||||
username,
|
||||
homeDirectory,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
scripts = import ./scripts { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./firefox
|
||||
./fish
|
||||
./sway
|
||||
./neovim
|
||||
./rofi
|
||||
./thunderbird
|
||||
];
|
||||
|
||||
xdg.configFile."gtk-4.0/gtk.css".source =
|
||||
"${pkgs.catppuccin-gtk}/share/themes/Catppuccin-Frappe-Standard-Blue-Dark/gtk-4.0/gtk.css";
|
||||
xdg.configFile."gtk-4.0/gtk.css".source = "${pkgs.catppuccin-gtk}/share/themes/Catppuccin-Frappe-Standard-Blue-Dark/gtk-4.0/gtk.css";
|
||||
|
||||
dconf = {
|
||||
enable = true;
|
||||
|
|
@ -38,11 +51,11 @@ in {
|
|||
thunderbird
|
||||
gnome.nautilus
|
||||
rofi-power-menu
|
||||
unstable.lollypop
|
||||
lollypop
|
||||
|
||||
# Proprietary
|
||||
unstable.postman
|
||||
unstable.mongodb-compass
|
||||
postman
|
||||
mongodb-compass
|
||||
|
||||
# CLI tools
|
||||
delta
|
||||
|
|
@ -56,11 +69,11 @@ in {
|
|||
lazygit
|
||||
fd
|
||||
ripgrep
|
||||
swaybg
|
||||
|
||||
# Scripts
|
||||
scripts.screenshot
|
||||
scripts.set-background
|
||||
|
||||
];
|
||||
sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ pkgs, config, lib, ... }: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
profiles.nico = {
|
||||
|
|
@ -7,39 +8,31 @@
|
|||
search = {
|
||||
default = "DuckDuckGo";
|
||||
force = true;
|
||||
engines = let
|
||||
nixicon =
|
||||
"${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
engines =
|
||||
let
|
||||
nixicon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
iconUpdateInteval = 24 * 60 * 60 * 1000; # every day
|
||||
in {
|
||||
in
|
||||
{
|
||||
"NixOS Packages" = {
|
||||
urls = [{
|
||||
template =
|
||||
"https://search.nixos.org/packages?query={searchTerms}";
|
||||
}];
|
||||
urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ];
|
||||
icon = nixicon;
|
||||
definedAliases = [ "@nixpkg" ];
|
||||
};
|
||||
"NixOS Wiki" = {
|
||||
urls = [{
|
||||
template =
|
||||
"https://wiki.nixos.org/index.php?search={searchTerms}";
|
||||
}];
|
||||
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}";
|
||||
}];
|
||||
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}";
|
||||
}];
|
||||
urls = [
|
||||
{ template = "https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}"; }
|
||||
];
|
||||
iconUpdateURL = "https://nixos.wiki/favicon.ico";
|
||||
updateInterval = iconUpdateInteval;
|
||||
definedAliases = [ "@archwiki" ];
|
||||
|
|
@ -48,21 +41,23 @@
|
|||
urls = [ { template = "https://duckduckgo.com/?q={searchTerms}"; } ];
|
||||
iconUpdateURL = "https://duckduckgo.com/favicon.ico";
|
||||
updateInterval = iconUpdateInteval;
|
||||
definedAliases = [ "@duckduckgo" "@ddg" ];
|
||||
definedAliases = [
|
||||
"@duckduckgo"
|
||||
"@ddg"
|
||||
];
|
||||
};
|
||||
"MyNixOS" = {
|
||||
urls =
|
||||
[{ template = "https://mynixos.com/search?q={searchTerms}"; }];
|
||||
urls = [ { template = "https://mynixos.com/search?q={searchTerms}"; } ];
|
||||
iconUpdateURL = "https://mynixos.com/favicon.ico";
|
||||
updateInterval = iconUpdateInteval;
|
||||
definedAliases = [ "@hm" "@mynixos" ];
|
||||
definedAliases = [
|
||||
"@hm"
|
||||
"@mynixos"
|
||||
];
|
||||
};
|
||||
"stackoverflow" = {
|
||||
urls = [{
|
||||
template = "https://stackoverflow.com/search?q={searchTerms}";
|
||||
}];
|
||||
iconUpdateURL =
|
||||
"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
|
||||
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 = {
|
||||
enable = true;
|
||||
shellAbbrs = {
|
||||
|
|
@ -12,8 +13,7 @@
|
|||
functions = {
|
||||
gitignore = "curl -sL https://www.gitignore.io/api/$argv";
|
||||
nrun = "nix run nixpkgs#$argv[1] -- $argv[2..]";
|
||||
mv-bad-creation-date = ''
|
||||
exiftool -if 'not $CreateDate' -p '$FileName' "$PWD/$argv[1]" | xargs -I {} mv -i "$PWD/$argv[1]/{}" "$argv[2]"'';
|
||||
mv-bad-creation-date = ''exiftool -if 'not $CreateDate' -p '$FileName' "$PWD/$argv[1]" | xargs -I {} mv -i "$PWD/$argv[1]/{}" "$argv[2]"'';
|
||||
rename-images = ''
|
||||
set -f input "$PWD/$argv[1]"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,15 @@
|
|||
{ pkgs, system, config, lib, ... }: {
|
||||
programs.neovim = let
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.neovim =
|
||||
let
|
||||
customR = pkgs.rWrapper.override {
|
||||
packages = with pkgs.rPackages; [ styler languageserver ];
|
||||
packages = with pkgs.rPackages; [
|
||||
styler
|
||||
languageserver
|
||||
];
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
defaultEditor = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
|
|
@ -13,7 +19,6 @@
|
|||
extraPackages = with pkgs; [
|
||||
# Language Servers
|
||||
rust-analyzer
|
||||
#unstable.rust-analyzer
|
||||
nixd
|
||||
clang
|
||||
nodePackages_latest.pyright
|
||||
|
|
@ -30,7 +35,7 @@
|
|||
taplo # TOML formatter
|
||||
rustfmt # Rust formatter
|
||||
shfmt # Shell, Bash etc.
|
||||
|
||||
nixfmt-rfc-style
|
||||
# Misc
|
||||
ripgrep
|
||||
rustc
|
||||
|
|
@ -40,5 +45,4 @@
|
|||
customR
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ pkgs, config, lib, ... }: {
|
||||
programs.rofi = let conf = "${config.home.homeDirectory}/.config/rofi";
|
||||
in {
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.rofi =
|
||||
let
|
||||
conf = "${config.home.homeDirectory}/.config/rofi";
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
plugins = [ pkgs.rofi-calc ];
|
||||
theme = "${conf}/themes/rounded-gray-dark.rasi";
|
||||
|
|
@ -23,7 +27,14 @@
|
|||
steal-focus = true;
|
||||
drun-use-desktop-cache = true;
|
||||
drun-reload-desktop-cache = true;
|
||||
combi-modes = [ "window" "drun" "filebrowser" "ssh" "calc" "obsidian" ];
|
||||
combi-modes = [
|
||||
"window"
|
||||
"drun"
|
||||
"filebrowser"
|
||||
"ssh"
|
||||
"calc"
|
||||
"obsidian"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{ pkgs, ... }: {
|
||||
screenshot = with pkgs;
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
screenshot =
|
||||
with pkgs;
|
||||
writeShellApplication {
|
||||
name = "screenshot";
|
||||
runtimeInputs = [ slurp wl-clipboard libnotify ];
|
||||
runtimeInputs = [
|
||||
slurp
|
||||
wl-clipboard
|
||||
libnotify
|
||||
];
|
||||
text = ''
|
||||
location="$HOME/Pictures/Screenshots/$(date +%Y-%m-%d-%H%M%S)-screenshot.png";
|
||||
|
||||
|
|
@ -12,11 +18,12 @@
|
|||
fi
|
||||
'';
|
||||
};
|
||||
set-background = pkgs.writers.writeFishBin "set-background" (builtins.readFile
|
||||
(pkgs.fetchurl {
|
||||
url =
|
||||
"https://codeberg.org/Nydragon/scripts/raw/commit/bb7a40545fa5cfce177cdac009d9f46f4823d360/set_background.fish";
|
||||
set-background = pkgs.writers.writeFishBin "set-background" (
|
||||
builtins.readFile (
|
||||
pkgs.fetchurl {
|
||||
url = "https://codeberg.org/Nydragon/scripts/raw/commit/bb7a40545fa5cfce177cdac009d9f46f4823d360/set_background.fish";
|
||||
hash = "sha256-Qoz5nn0tqV6QtsXv9fsOkf3PafL30iO/eIkh8ro6O+c=";
|
||||
}));
|
||||
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,18 @@
|
|||
# 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 =
|
||||
let
|
||||
screenshot = (import ../scripts { inherit pkgs; }).screenshot;
|
||||
set-background = (import ../scripts { inherit pkgs; }).set-background;
|
||||
|
||||
|
|
@ -21,8 +31,8 @@
|
|||
};
|
||||
};
|
||||
wallpaper = "${homeDirectory}/Pictures/backgrounds/catppucchin";
|
||||
scripts = "${homeDirectory}/.config/system_scripts";
|
||||
in {
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
xwayland = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
|
|
@ -44,11 +54,13 @@
|
|||
bars = [ { command = "${pkgs.waybar}/bin/waybar"; } ];
|
||||
modifier = "Mod4";
|
||||
#: Keybindings {{{
|
||||
keybindings = let mod = config.wayland.windowManager.sway.config.modifier;
|
||||
in lib.mkOptionDefault {
|
||||
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";
|
||||
"${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
|
||||
|
|
@ -56,8 +68,7 @@
|
|||
# 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 --";
|
||||
"${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}";
|
||||
|
|
@ -66,18 +77,12 @@
|
|||
"${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 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";
|
||||
|
|
@ -85,62 +90,38 @@
|
|||
"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";
|
||||
"--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.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 nextcloud)" ] && ${pkgs.nextcloud-client}/bin/nextcloud --background'';
|
||||
}
|
||||
{
|
||||
command = ''
|
||||
|
|
@ -152,8 +133,7 @@
|
|||
always = true;
|
||||
}
|
||||
{
|
||||
command =
|
||||
"${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config --reload-css";
|
||||
command = "${pkgs.swaynotificationcenter}/bin/swaync-client --reload-config --reload-css";
|
||||
always = true;
|
||||
}
|
||||
];
|
||||
|
|
@ -190,7 +170,6 @@
|
|||
"com.nextcloud.desktopclient.nextcloud"
|
||||
])
|
||||
})$";
|
||||
|
||||
}
|
||||
{
|
||||
command = ''title_format "[XWayland] %title"'';
|
||||
|
|
@ -212,14 +191,18 @@
|
|||
childBorder = lavender;
|
||||
};
|
||||
};
|
||||
gaps = { inner = 5; };
|
||||
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.builtin}" = {
|
||||
xkb_layout = "fr";
|
||||
};
|
||||
"${inputs.kb.keychron}" = {
|
||||
xkb_layout = "us";
|
||||
xkb_numlock = "enabled";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ pkgs, config, lib, ... }: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.swayidle = {
|
||||
enable = true;
|
||||
events = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
pointer = {
|
||||
|
|
@ -6,8 +6,11 @@ let
|
|||
package = pkgs.catppuccin-cursors.frappeLavender;
|
||||
size = 32;
|
||||
};
|
||||
in {
|
||||
programs.swaylock = { enable = true; };
|
||||
in
|
||||
{
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
};
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ pkgs, config, lib, ... }: {
|
||||
{ ... }:
|
||||
{
|
||||
programs.thunderbird = {
|
||||
enable = true;
|
||||
#settings = { mailnews.wraplength = 80; };
|
||||
profiles.nico = { isDefault = true; };
|
||||
profiles.nico = {
|
||||
isDefault = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,20 @@
|
|||
# vim:fileencoding=utf-8:foldmethod=marker
|
||||
{ config, pkgs, lib, inputs, system, unstable, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
stateVersion = "23.11";
|
||||
username = "nico";
|
||||
hostename = "xps9510";
|
||||
hostname = "xps9510";
|
||||
homeDirectory = "/home/${username}";
|
||||
|
||||
in {
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
../../modules
|
||||
|
|
@ -17,13 +24,9 @@ in {
|
|||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device =
|
||||
"/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
|
||||
networking.hostName = hostename;
|
||||
boot.initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device = "/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
|
||||
networking.hostName = hostname;
|
||||
|
||||
# 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
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
|
@ -52,10 +55,12 @@ in {
|
|||
|
||||
xdg.mime = {
|
||||
enable = true;
|
||||
defaultApplications = let
|
||||
defaultApplications =
|
||||
let
|
||||
fileManager = "org.gnome.Nautilus.desktop";
|
||||
browser = "firefox.desktop";
|
||||
in {
|
||||
in
|
||||
{
|
||||
"inode/directory" = fileManager;
|
||||
"application/zip" = fileManager;
|
||||
"application/pdf" = browser;
|
||||
|
|
@ -70,8 +75,15 @@ in {
|
|||
};
|
||||
|
||||
home-manager.users.${username} = import ../../home {
|
||||
inherit config pkgs system inputs stateVersion username homeDirectory
|
||||
unstable;
|
||||
inherit
|
||||
config
|
||||
pkgs
|
||||
system
|
||||
inputs
|
||||
stateVersion
|
||||
username
|
||||
homeDirectory
|
||||
;
|
||||
};
|
||||
|
||||
# home-manager.users.nico =
|
||||
|
|
@ -79,7 +91,7 @@ in {
|
|||
#{ config, pkgs, ... }:
|
||||
#programs.vscode = {
|
||||
#enable = false;
|
||||
#package = unstable.vscodium;
|
||||
#package = vscodium;
|
||||
#extensions = with pkgs.vscode-extensions; [
|
||||
#yzhang.markdown-all-in-one
|
||||
#rust-lang.rust-analyzer
|
||||
|
|
@ -117,7 +129,6 @@ in {
|
|||
#Optional helps save long term battery health
|
||||
START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
|
||||
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -153,15 +164,19 @@ in {
|
|||
users.users.${username} = {
|
||||
isNormalUser = true;
|
||||
createHome = true;
|
||||
extraGroups = [ "networkmanager" "wheel" "audio" "libvirtd" ];
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
"audio"
|
||||
"libvirtd"
|
||||
];
|
||||
};
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = rec {
|
||||
initial_session = {
|
||||
command =
|
||||
"${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";
|
||||
command = "${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";
|
||||
user = "${username}";
|
||||
};
|
||||
default_session = initial_session;
|
||||
|
|
@ -179,7 +194,7 @@ in {
|
|||
#grim
|
||||
#slurp
|
||||
#wl-clipboard
|
||||
#unstable.swaynotificationcenter
|
||||
#swaynotificationcenter
|
||||
#swaybg
|
||||
#swaylock
|
||||
#swayidle
|
||||
|
|
@ -208,10 +223,11 @@ in {
|
|||
environment.systemPackages = with pkgs; [
|
||||
shared-mime-info
|
||||
fish
|
||||
firefox
|
||||
nextcloud-client
|
||||
git
|
||||
keepassxc
|
||||
firefox
|
||||
htop
|
||||
alacritty
|
||||
eza
|
||||
bat
|
||||
|
|
@ -224,7 +240,6 @@ in {
|
|||
dconf
|
||||
pavucontrol
|
||||
xdg-utils
|
||||
htop
|
||||
brightnessctl
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
|
@ -24,16 +29,14 @@
|
|||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-ef68c7a7-4355-4c37-bd6f-b753f6b9520c".device =
|
||||
"/dev/disk/by-uuid/ef68c7a7-4355-4c37-bd6f-b753f6b9520c";
|
||||
boot.initrd.luks.devices."luks-ef68c7a7-4355-4c37-bd6f-b753f6b9520c".device = "/dev/disk/by-uuid/ef68c7a7-4355-4c37-bd6f-b753f6b9520c";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/83C5-F9F2";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/ba211282-a02a-42d6-9a89-9998ffee4755"; }];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/ba211282-a02a-42d6-9a89-9998ffee4755"; } ];
|
||||
|
||||
# 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
|
||||
|
|
@ -43,6 +46,5 @@
|
|||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue