emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updating and trying to simplify

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-01-27 15:34:15 -05:00
parent c079588bdf
commit f5a0090ea0
12 changed files with 348 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

0
dotfiles/dot_config/eww/eww.scss Normal file
View file

12
dotfiles/dot_config/eww/eww.yuck Normal file
View file

@ -0,0 +1,12 @@
(defwindow example
:monitor 0
:geometry (geometry :x "0%"
:y "20px"
:width "90%"
:height "30px"
:anchor "top center")
:stacking "fg"
:reserve (struts :distance "40px" :side "top")
:windowtype "dock"
:wm-ignore false
"example content")

57
dotfiles/dot_config/niri/config.kdl
View file

@ -20,22 +20,34 @@ input {
mouse { mouse {
natural-scroll natural-scroll
// accel-speed 0.2 accel-speed 0.2
// accel-profile "flat" accel-profile "flat"
// scroll-method "no-scroll"
} }
// Uncomment this to make the mouse warp to the center of newly focused windows. workspace-auto-back-and-forth
// warp-mouse-to-focus
} }
output "eDP-1" { output "eDP-1" {
mode "2560x1600" mode "2560x1600"
background-color "#000000" background-color "#000000"
scale 1.5 scale 1
transform "normal" transform "normal"
} }
output "DP-3" {
mode "3840x2160@59.997"
background-color "#000000"
scale 1.1
transform "normal"
}
environment {
DISPLAY ":0"
//QT_QPA_PLATFORM "wayland"
//XDG_CURRENT_DESKTOP "niri"
//XDG_SESSION_TYPE "wayland"
}
layout { layout {
gaps 10 gaps 10
center-focused-column "never" center-focused-column "never"
@ -57,21 +69,31 @@ layout {
} }
} }
prefer-no-csd workspace "main"
workspace "scratchpad"
spawn-at-startup "mako" // prefer-no-csd
spawn-at-startup "yambar"
spawn-at-startup "xwayland-satellite" // spawn-at-startup "mako"
spawn-at-startup "fuzzel" // spawn-at-startup "fuzzel"
// spawn-at-startup "eww" "daemon"
spawn-at-startup "xwayland-satellite" ":0"
spawn-at-startup "clipse" "-listen"
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
animations { animations {
slowdown 3.0 slowdown 1.0
}
window-rule {
match app-id="plexamp"
open-on-workspace "scratchpad"
open-floating true
} }
// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
// Work around WezTerm's initial configure bug // Work around WezTerm initial configure bug
// by setting an empty default-column-width. // by setting an empty default-column-width.
window-rule { window-rule {
match app-id=r#"^org\.wezfurlong\.wezterm$"# match app-id=r#"^org\.wezfurlong\.wezterm$"#
@ -88,7 +110,7 @@ window-rule {
} }
window-rule { window-rule {
geometry-corner-radius 6 geometry-corner-radius 12
clip-to-geometry true clip-to-geometry true
} }
@ -98,7 +120,7 @@ binds {
// Suggested binds for running programs: terminal, app launcher, screen locker. // Suggested binds for running programs: terminal, app launcher, screen locker.
Mod+T { spawn "wezterm"; } Mod+T { spawn "wezterm"; }
Mod+D { spawn "fuzzel"; } Mod+Space { spawn "fuzzel"; }
Super+Alt+L { spawn "swaylock"; } Super+Alt+L { spawn "swaylock"; }
// Example volume keys mappings for PipeWire & WirePlumber. // Example volume keys mappings for PipeWire & WirePlumber.
@ -258,7 +280,8 @@ binds {
// Move the focused window between the floating and the tiling layout. // Move the focused window between the floating and the tiling layout.
Mod+X { toggle-window-floating; } Mod+X { toggle-window-floating; }
Mod+Shift+X { switch-focus-between-floating-and-tiling; } // Mod+Shift+X { switch-focus-between-floating-and-tiling; }
Mod+Shift+X { focus-workspace "scratchpad"; }
// Actions to switch layouts. // Actions to switch layouts.
// Note: if you uncomment these, make sure you do NOT have // Note: if you uncomment these, make sure you do NOT have
@ -274,7 +297,7 @@ binds {
// The quit action will show a confirmation dialog to avoid accidental exits. // The quit action will show a confirmation dialog to avoid accidental exits.
Mod+Shift+E { quit; } Mod+Shift+E { quit; }
Ctrl+Alt+Delete { quit; } //Ctrl+Alt+Delete { quit; }
// Powers off the monitors. To turn them back on, do any input like // Powers off the monitors. To turn them back on, do any input like
// moving the mouse or pressing any other key. // moving the mouse or pressing any other key.

51
dotfiles/dot_config/waybar/config Normal file
View file

@ -0,0 +1,51 @@
{
"modules-left": ["clock", "niri/workspaces", "custom/media"],
"modules-center": ["niri/window"],
"modules-right": ["tray", "pulseaudio", "idle_inhibitor", "custom/power"],
"network": {
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ifname} ",
"format-disconnected": "",
"max-length": 50,
"on-click": "kitty -e 'nmtui'"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
},
},
"tray": {
"icon-size": 15,
"spacing": 10
},
"clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}",
"on-click": "gnome-calendar"
},
"pulseaudio": {
"format": "{volume}% {icon} ",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": "0% {icon} ",
"format-source": "{volume}% ",
"format-source-muted": "",
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["", "", ""]
},
"on-click": "pavucontrol"
},
"custom/power": {
"format": " ",
"on-click": "wlogout"
}
}

101
dotfiles/dot_config/waybar/style.css Normal file
View file

@ -0,0 +1,101 @@
* {
border: none;
font-size: 14px;
font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF" ;
min-height: 25px;
}
window#waybar {
background: transparent;
margin: 5px;
}
#custom-logo {
padding: 0 10px;
}
.modules-right {
padding-left: 5px;
border-radius: 15px 0 0 15px;
margin-top: 2px;
background: #000000;
}
.modules-center {
padding: 0 15px;
margin-top: 2px;
border-radius: 15px 15px 15px 15px;
background: #000000;
}
.modules-left {
border-radius: 0 15px 15px 0;
margin-top: 2px;
background: #000000;
}
#battery,
#custom-clipboard,
#custom-colorpicker,
#custom-powerDraw,
#bluetooth,
#pulseaudio,
#network,
#disk,
#memory,
#backlight,
#cpu,
#temperature,
#custom-weather,
#idle_inhibitor,
#jack,
#tray,
#window,
#workspaces,
#clock {
padding: 0 5px;
}
#pulseaudio {
padding-top: 3px;
}
#temperature.critical,
#pulseaudio.muted {
color: #FF0000;
padding-top: 0;
}
#clock{
color: #5fd1fa;
}
#battery.charging {
color: #ffffff;
background-color: #26A65B;
}
#battery.warning:not(.charging) {
background-color: #ffbe61;
color: black;
}
#battery.critical:not(.charging) {
background-color: #f53c3c;
color: #ffffff;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes blink {
to {
background-color: #ffffff;
color: #000000;
}
}

2
dotfiles/dot_config/wezterm/wezterm.lua
View file

@ -43,7 +43,7 @@ local workspace_switcher = wezterm.plugin.require("https://github.com/MLFlexer/s
config.enable_wayland = false; config.enable_wayland = false;
config.front_end = "WebGpu"; config.front_end = "WebGpu";
config.font_size = 11 config.font_size = 13
config.font = wezterm.font { config.font = wezterm.font {
family = 'JetBrains Mono', family = 'JetBrains Mono',
weight = 'Medium' weight = 'Medium'

12
dotfiles/dot_config/yambar/config.yml Normal file
View file

@ -0,0 +1,12 @@
bar:
height: 26
location: top
spacing: 5
margin: 7
background: 000000ff
right:
- clock:
time-format: "%H:%M %Z"
content:
- string: {text: "{time}"}

91
flake.lock generated
View file

@ -263,11 +263,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1737762889, "lastModified": 1737968762,
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,11 +290,11 @@
"uv2nix": "uv2nix" "uv2nix": "uv2nix"
}, },
"locked": { "locked": {
"lastModified": 1737906146, "lastModified": 1737961863,
"narHash": "sha256-Mjw+78n0oAT5lZfGI+d7QMPdqEGcBfDz13XlGCXfNnE=", "narHash": "sha256-OTkGVz75+CuRnwng+fwdv0LuRzDX5TesFMAN5uRjOaI=",
"owner": "isd-project", "owner": "isd-project",
"repo": "isd", "repo": "isd",
"rev": "01ffd8464018d08c4e1d44dc06b4dc2edec1742b", "rev": "9c1a95c5cc66fa847f46e5f76c71022daf5ec1fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,6 +364,28 @@
"type": "github" "type": "github"
} }
}, },
"niri": {
"inputs": {
"nix-filter": "nix-filter_2",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1737956052,
"narHash": "sha256-Gr+tkCSuhQ5NT04hv/PoHExCgbuqRA/GZQv+le40LNY=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "9b4d73f13a6906537faf01b5c5e5e2fee9dd602e",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"repo": "niri",
"type": "github"
}
},
"nix-appimage": { "nix-appimage": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -399,6 +421,21 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter_2": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1737806078, "lastModified": 1737806078,
@ -479,11 +516,11 @@
}, },
"nixpkgs-unstable_2": { "nixpkgs-unstable_2": {
"locked": { "locked": {
"lastModified": 1737746512, "lastModified": 1737885589,
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "825479c345a7f806485b7f00dbe3abb50641b083", "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -495,11 +532,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1737469691, "lastModified": 1737746512,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +564,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1737672001, "lastModified": 1737885640,
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -641,6 +678,7 @@
"isd": "isd", "isd": "isd",
"kmonad": "kmonad", "kmonad": "kmonad",
"musnix": "musnix", "musnix": "musnix",
"niri": "niri",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
@ -651,6 +689,27 @@
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"niri",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733106880,
"narHash": "sha256-aJmAIjZfWfPSWSExwrYBLRgXVvgF5LP1vaeUGOOIQ98=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "e66c0d43abf5bdefb664c3583ca8994983c332ae",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"wezterm", "wezterm",
@ -821,7 +880,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay_2",
"zlib": "zlib" "zlib": "zlib"
}, },
"locked": { "locked": {

5
flake.nix
View file

@ -55,6 +55,11 @@
url = "github:paperwm/PaperWM"; url = "github:paperwm/PaperWM";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
niri = {
url = "github:YaLTeR/niri";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = {nixpkgs, home-manager, sops-nix, kmonad, musnix, self, ... } @ inputs: outputs = {nixpkgs, home-manager, sops-nix, kmonad, musnix, self, ... } @ inputs:

59
home/home.nix
View file

@ -20,7 +20,6 @@
inputs.affinity-nix.packages.x86_64-linux.designer inputs.affinity-nix.packages.x86_64-linux.designer
guix guix
# uv
unstable.thonny unstable.thonny
@ -121,9 +120,10 @@
serapeum serapeum
])) ]))
fuzzel # fuzzel
kdlfmt kdlfmt
kdotool
ccl ccl
racket racket
gdu gdu
@ -136,6 +136,7 @@
openssl.out openssl.out
nixfmt-rfc-style nixfmt-rfc-style
wl-clipboard wl-clipboard
unstable.clipse
maim maim
php php
rustup rustup
@ -285,7 +286,7 @@
onlyoffice-desktopeditors onlyoffice-desktopeditors
libreoffice libreoffice
hyphenDicts.en_US hyphenDicts.en_US
plexamp unstable.plexamp
rmpc rmpc
resources resources
carla carla
@ -330,7 +331,11 @@
parinfer-rust-emacs parinfer-rust-emacs
dockfmt dockfmt
unstable.playerctl
mioctl mioctl
rmpc
unstable.door-knocker
unstable.hyprpicker
# Audio plugins (LV2, VST2, VST3, LADSPA) # Audio plugins (LV2, VST2, VST3, LADSPA)
eq10q eq10q
@ -395,6 +400,9 @@
BW_CLIENTID = "$(cat ${config.sops.defaultSymlinkPath}/bw_client_id)"; BW_CLIENTID = "$(cat ${config.sops.defaultSymlinkPath}/bw_client_id)";
BW_CLIENTSECRET = "$(cat ${config.sops.defaultSymlinkPath}/bw_api_key)"; BW_CLIENTSECRET = "$(cat ${config.sops.defaultSymlinkPath}/bw_api_key)";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
GSK_RENDERER = "ngl";
MOZ_ENABLE_WAYLAND = 1;
DISPLAY = ":0";
}; };
stateVersion = "24.05"; stateVersion = "24.05";
@ -429,13 +437,23 @@
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
yambar = { fuzzel = {
enable = true; enable = true;
settings = {
main = {
terminal = "${pkgs.wezterm}/bin/wezterm";
};
};
}; };
direnv = { direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
yazi = {
enable = true;
enableFishIntegration = true;
package = pkgs.unstable.yazi;
};
fish = { fish = {
enable = true; enable = true;
shellAliases = { shellAliases = {
@ -577,14 +595,27 @@
}; };
pandoc.enable = true; pandoc.enable = true;
password-store.enable = true; password-store.enable = true;
#waybar.enable = true; wlogout = {
enable = true;
};
swaylock = {
enable = true;
};
waybar = {
enable = true;
package = pkgs.unstable.waybar;
systemd = {
enable = true;
# target = "graphical-session.target";
};
};
eww = {
enable = true;
configDir = ../dotfiles/dot_config/eww;
};
lazygit.enable = true; lazygit.enable = true;
jq.enable = true; jq.enable = true;
firefox.enable = true; firefox.enable = true;
# thunderbird = {
# enable = true;
# package = pkgs.thunderbird-latest;
# };
rbw = { rbw = {
enable = true; enable = true;
package = pkgs.rbw-latest; package = pkgs.rbw-latest;
@ -627,10 +658,10 @@
}; };
services = { services = {
# mpd = { playerctld = {
# enable = true; enable = true;
# # musicDirectory = ; package = pkgs.unstable.playerctl;
# }; };
mako = { mako = {
enable = true; enable = true;
}; };
@ -667,7 +698,6 @@
services.flatpak.packages = [ services.flatpak.packages = [
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"nl.hjdskes.gcolor3" "nl.hjdskes.gcolor3"
"org.linuxshowplayer.LinuxShowPlayer"
]; ];
systemd.user = { systemd.user = {
@ -702,6 +732,7 @@
}; };
# moving files! # moving files!
xdg.configFile."waybar".source = ../dotfiles/dot_config/waybar;
xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile; xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile;
xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml; xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml;
xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty; xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty;

2
packages/amplocker/package.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "latest"; version = "latest";
src = fetchurl { src = fetchurl {
url = "https://audioassaultdownloads.s3.amazonaws.com/AmpLocker/AmpLocker109/AmpLockerLinux.zip"; url = "https://audioassaultdownloads.s3.amazonaws.com/AmpLocker/AmpLocker109/AmpLockerLinux.zip";
sha256 = "sha256-adHle4A59DxJFR3KiLyuZp79vUK0QkGDnHRu6PWMVJQ="; sha256 = "sha256-p4mmq/g0bA2d1ophcbXf/Tn2n0tkXzAKoLWUMe95RhU=";
}; };
nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [

6
system/eddie/configuration.nix
View file

@ -212,7 +212,11 @@
vSync = true; vSync = true;
}; };
programs.niri.enable = true; programs.niri = {
enable = true;
package = inputs.niri.packages.x86_64-linux.default;
};
# programs.waybar.enable = true; # programs.waybar.enable = true;
programs.nh = { programs.nh = {