diff --git a/flake.lock b/flake.lock index 38d48f48..8d624cd4 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1765860045, + "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765008770, - "narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", + "lastModified": 1765867692, + "narHash": "sha256-zuAmnzaB5uDqgXh/Y/Cx+zBef2lYKoVAPYErXQfk/4A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "935080f54490e3e7b1eda731cbe1478744546ea8", + "rev": "603ea180e61c6ef143b789a3eaca12ffdfc7c60a", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764966114, - "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", + "lastModified": 1765861551, + "narHash": "sha256-1Bo86J/7nm8sndZz9gGW0agydYzLYimdz9aQEhnf1zY=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", + "rev": "2641356d41199a40ccc9a2e9f61bd34d7e7c8220", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1764841794, - "narHash": "sha256-TcJ2kgFn8qbbNCh7HJLadi4ZvW9CFrbLB02VS7biWlo=", + "lastModified": 1765393498, + "narHash": "sha256-OapXNkISC2JXOFs7c6V7puiYg4+XSJxbGNce3GNVMWo=", "owner": "nix-community", "repo": "nixd", - "rev": "514db907c8a0b32a0bdc1678d480a5278da4b679", + "rev": "72f4dd1fc57114dd0b455d07605de899d6961f29", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764831616, - "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1765858323, + "narHash": "sha256-pRyLIpUN56iG3ipPh5Pcwb2tSXFNr8kMYZNEO5kglsI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "1bbd5cae7ec80241e8b44629d4da503ed7cf18c9", "type": "github" }, "original": { @@ -424,11 +424,11 @@ ] }, "locked": { - "lastModified": 1764745188, - "narHash": "sha256-9H1Izl1vxZVYG/6AQXfl8tyBYDx+KhB0enpjTq2tAT4=", + "lastModified": 1765781868, + "narHash": "sha256-a1X/Z8OgPD1yyW47pmek8UNCRWhGJkkUpXvDIYBNfOU=", "owner": "Benexl", "repo": "yt-x", - "rev": "ba700d7c647bc629ca431f4b9ea4dc48c89c6392", + "rev": "53b2b2155a4b72093119cf1269ccd26d820c8253", "type": "github" }, "original": { diff --git a/global-home.nix b/global-home.nix index c787cc26..6bfb4e19 100644 --- a/global-home.nix +++ b/global-home.nix @@ -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-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 diff --git a/global.nix b/global.nix index 07294d0f..ea95f949 100644 --- a/global.nix +++ b/global.nix @@ -68,6 +68,8 @@ jdt-language-server # Java language server gnumake + gcc + clang-tools #ccls rust-analyzer lua-language-server @@ -84,21 +86,34 @@ python312Packages.jedi-language-server nixd - # For FPGA Development + # For FPGA/Hardware Development verilator 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: { - # 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. - neovim + #neovim neovide xorg.libX11 zoxide # A fast cd command that learns your habits tealdeer # A very fast implementation of tldr in Rust sc-im - emacs-gtk + #emacs-gtk #((inputs.emacs-overlay.packages.x86_64-linux.emacs-unstable-pgtk.overrideAttrs (oldAttrs: { # buildInputs = oldAttrs.buildInputs ++ [ pkgs.webkitgtk ]; #})).override { @@ -312,6 +327,11 @@ ] ++ stablePackages; + + programs.neovim = { + enable = true; + }; + # Enable OpenGL/Vulkan hardware acceleration etc hardware = { ## radv: an open-source Vulkan driver from freedesktop @@ -355,24 +375,24 @@ # Steam Game Platform - programs.steam = { - enable = true; - # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - #gamescopeSession.enable = true; + #programs.steam = { + # enable = true; + # # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + # # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + # #gamescopeSession.enable = true; - package = with pkgs; steam.override { extraPkgs = pkgs: [ - jq - cabextract - wget - git - pkgsi686Linux.libpulseaudio - pkgsi686Linux.freetype - pkgsi686Linux.xorg.libXcursor - pkgsi686Linux.xorg.libXcomposite - pkgsi686Linux.xorg.libXi - ];}; - }; + # package = with pkgs; steam.override { extraPkgs = pkgs: [ + # jq + # cabextract + # wget + # git + # pkgsi686Linux.libpulseaudio + # pkgsi686Linux.freetype + # pkgsi686Linux.xorg.libXcursor + # pkgsi686Linux.xorg.libXcomposite + # pkgsi686Linux.xorg.libXi + # ];}; + #}; programs.gamescope = { enable = true; args = [ "--expose-wayland" ]; @@ -573,13 +593,13 @@ exit 0 fi "; - }; + }; # Emacs install and enable daemon/server mode. - #services.emacs = { - # enable = true; - # package = pkgs.emacs-gtk; - #}; + services.emacs = { + enable = true; + package = pkgs.emacs-gtk; + }; #systemd.services.emacs = { # description = "Emacs server daemon for root"; # wantedBy = [ "multi-user.target" ]; diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix index 12406467..e2830a10 100644 --- a/modules/nixos/cspark-desktop-niri/home.nix +++ b/modules/nixos/cspark-desktop-niri/home.nix @@ -89,6 +89,11 @@ else wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1 fi '') + + (writeShellScriptBin "emacs-term" + '' + emacsclient -c -e '(eshell)' + '') ]; home.sessionVariables = { diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl index 69e218a5..8a143d7f 100644 --- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl @@ -314,7 +314,8 @@ binds { Alt+Shift+Slash { show-hotkey-overlay; } // 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+D { spawn "fuzzel-xwayland"; } Super+L { spawn "swaylock"; } @@ -439,7 +440,7 @@ binds { // Similarly, you can bind touchpad scroll "ticks". // Touchpad scrolling is continuous, so for these binds it is split into // 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 // touchpads by default. // Alt+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }