cspark
/
Personal-NixOS-Configuration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch back to emacs and hardware project additions

This commit is contained in:
Curt Spark 2025-12-25 11:07:36 +00:00
parent afd3878760
commit 182218718a
5 changed files with 79 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock
View File

@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764998300, "lastModified": 1765860045,
"narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,11 +111,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1765008770, "lastModified": 1765867692,
"narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", "narHash": "sha256-zuAmnzaB5uDqgXh/Y/Cx+zBef2lYKoVAPYErXQfk/4A=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "935080f54490e3e7b1eda731cbe1478744546ea8", "rev": "603ea180e61c6ef143b789a3eaca12ffdfc7c60a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764966114, "lastModified": 1765861551,
"narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "narHash": "sha256-1Bo86J/7nm8sndZz9gGW0agydYzLYimdz9aQEhnf1zY=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "rev": "2641356d41199a40ccc9a2e9f61bd34d7e7c8220",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1764841794, "lastModified": 1765393498,
"narHash": "sha256-TcJ2kgFn8qbbNCh7HJLadi4ZvW9CFrbLB02VS7biWlo=", "narHash": "sha256-OapXNkISC2JXOFs7c6V7puiYg4+XSJxbGNce3GNVMWo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "514db907c8a0b32a0bdc1678d480a5278da4b679", "rev": "72f4dd1fc57114dd0b455d07605de899d6961f29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,11 +182,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764950072, "lastModified": 1765779637,
"narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f61125a668a320878494449750330ca58b78c557", "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1764831616, "lastModified": 1765762245,
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +403,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764721075, "lastModified": 1765858323,
"narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "narHash": "sha256-pRyLIpUN56iG3ipPh5Pcwb2tSXFNr8kMYZNEO5kglsI=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "rev": "1bbd5cae7ec80241e8b44629d4da503ed7cf18c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764745188, "lastModified": 1765781868,
"narHash": "sha256-9H1Izl1vxZVYG/6AQXfl8tyBYDx+KhB0enpjTq2tAT4=", "narHash": "sha256-a1X/Z8OgPD1yyW47pmek8UNCRWhGJkkUpXvDIYBNfOU=",
"owner": "Benexl", "owner": "Benexl",
"repo": "yt-x", "repo": "yt-x",
"rev": "ba700d7c647bc629ca431f4b9ea4dc48c89c6392", "rev": "53b2b2155a4b72093119cf1269ccd26d820c8253",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
global-home.nix
View File

@ -173,7 +173,7 @@ fi
#".local/share/applications/arch-nyxt-gstfix.desktop".source = ./global-resources/home-manager/.local/share/applications/arch-nyxt-gstfix.desktop; #".local/share/applications/arch-nyxt-gstfix.desktop".source = ./global-resources/home-manager/.local/share/applications/arch-nyxt-gstfix.desktop;
#".local/share/applications/arch-nyxt-run-gstfix.sh".source = ./global-resources/home-manager/.local/share/applications/arch-nyxt-run-gstfix.sh; #".local/share/applications/arch-nyxt-run-gstfix.sh".source = ./global-resources/home-manager/.local/share/applications/arch-nyxt-run-gstfix.sh;
".local/share/applications/Arch-steam.desktop".source = ./global-resources/home-manager/.local/share/applications/Arch-steam.desktop; #".local/share/applications/Arch-steam.desktop".source = ./global-resources/home-manager/.local/share/applications/Arch-steam.desktop;
}; };
# Emacs Config Init Service # Emacs Config Init Service

70
global.nix
View File

@ -68,6 +68,8 @@
jdt-language-server # Java language server jdt-language-server # Java language server
gnumake gnumake
gcc
clang-tools
#ccls #ccls
rust-analyzer rust-analyzer
lua-language-server lua-language-server
@ -84,21 +86,34 @@
python312Packages.jedi-language-server python312Packages.jedi-language-server
nixd nixd
# For FPGA Development # For FPGA/Hardware Development
verilator verilator
gtkwave gtkwave
#(ltspice.overrideAttrs (oldAttrs: {
# src = fetchurl {
# url = "https://web.archive.org/web/20251210201306/https://ltspice.analog.com/software/LTspice64.msi";
# hash = "sha256-r5P3kW/nDN99mbTklDrmegc3wfIoatmQC8HeAooemH8=";
# };
#}))
qucs-s
#xournalpp
elmerfem
saber
#(neovim.overrideAttrs (oldAttrs: { #(neovim.overrideAttrs (oldAttrs: {
# buildInputs = oldAttrs.buildInputs ++ [ pkgs.xorg.libX11 ]; # buildInputs = [
# #pkgs.xorg.libX11
# pkgs.gcc
# ];
#})) # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. #})) # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
neovim #neovim
neovide neovide
xorg.libX11 xorg.libX11
zoxide # A fast cd command that learns your habits zoxide # A fast cd command that learns your habits
tealdeer # A very fast implementation of tldr in Rust tealdeer # A very fast implementation of tldr in Rust
sc-im sc-im
emacs-gtk #emacs-gtk
#((inputs.emacs-overlay.packages.x86_64-linux.emacs-unstable-pgtk.overrideAttrs (oldAttrs: { #((inputs.emacs-overlay.packages.x86_64-linux.emacs-unstable-pgtk.overrideAttrs (oldAttrs: {
# buildInputs = oldAttrs.buildInputs ++ [ pkgs.webkitgtk ]; # buildInputs = oldAttrs.buildInputs ++ [ pkgs.webkitgtk ];
#})).override { #})).override {
@ -312,6 +327,11 @@
] ++ stablePackages; ] ++ stablePackages;
programs.neovim = {
enable = true;
};
# Enable OpenGL/Vulkan hardware acceleration etc # Enable OpenGL/Vulkan hardware acceleration etc
hardware = { hardware = {
## radv: an open-source Vulkan driver from freedesktop ## radv: an open-source Vulkan driver from freedesktop
@ -355,24 +375,24 @@
# Steam Game Platform # Steam Game Platform
programs.steam = { #programs.steam = {
enable = true; # enable = true;
# remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play # # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
# dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server # # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
#gamescopeSession.enable = true; # #gamescopeSession.enable = true;
package = with pkgs; steam.override { extraPkgs = pkgs: [ # package = with pkgs; steam.override { extraPkgs = pkgs: [
jq # jq
cabextract # cabextract
wget # wget
git # git
pkgsi686Linux.libpulseaudio # pkgsi686Linux.libpulseaudio
pkgsi686Linux.freetype # pkgsi686Linux.freetype
pkgsi686Linux.xorg.libXcursor # pkgsi686Linux.xorg.libXcursor
pkgsi686Linux.xorg.libXcomposite # pkgsi686Linux.xorg.libXcomposite
pkgsi686Linux.xorg.libXi # pkgsi686Linux.xorg.libXi
];}; # ];};
}; #};
programs.gamescope = { programs.gamescope = {
enable = true; enable = true;
args = [ "--expose-wayland" ]; args = [ "--expose-wayland" ];
@ -576,10 +596,10 @@
}; };
# Emacs install and enable daemon/server mode. # Emacs install and enable daemon/server mode.
#services.emacs = { services.emacs = {
# enable = true; enable = true;
# package = pkgs.emacs-gtk; package = pkgs.emacs-gtk;
#}; };
#systemd.services.emacs = { #systemd.services.emacs = {
# description = "Emacs server daemon for root"; # description = "Emacs server daemon for root";
# wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];

5
modules/nixos/cspark-desktop-niri/home.nix
View File

@ -89,6 +89,11 @@ else
wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1 wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1
fi fi
'') '')
(writeShellScriptBin "emacs-term"
''
emacsclient -c -e '(eshell)'
'')
]; ];
home.sessionVariables = { home.sessionVariables = {

5
modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl
View File

@ -314,7 +314,8 @@ binds {
Alt+Shift+Slash { show-hotkey-overlay; } Alt+Shift+Slash { show-hotkey-overlay; }
// Suggested binds for running programs: terminal, app launcher, screen locker. // Suggested binds for running programs: terminal, app launcher, screen locker.
Alt+Return { spawn "foot"; } //Alt+Return { spawn "foot"; }
Alt+Return { spawn "emacs-term"; }
//Alt+Return { spawn "ghostty"; } //Alt+Return { spawn "ghostty"; }
Alt+D { spawn "fuzzel-xwayland"; } Alt+D { spawn "fuzzel-xwayland"; }
Super+L { spawn "swaylock"; } Super+L { spawn "swaylock"; }
@ -439,7 +440,7 @@ binds {
// Similarly, you can bind touchpad scroll "ticks". // Similarly, you can bind touchpad scroll "ticks".
// Touchpad scrolling is continuous, so for these binds it is split into // Touchpad scrolling is continuous, so for these binds it is split into
// discrete intervals. // discrete intervals.
// These binds are also affected by touchpad's natural-scroll, so these // These binds are also affected by touchpads natural-scroll, so these
// example binds are "inverted", since we have natural-scroll enabled for // example binds are "inverted", since we have natural-scroll enabled for
// touchpads by default. // touchpads by default.
// Alt+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } // Alt+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }