From b500763572454f6808903f7280ff56bd4e6bcf10 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sat, 9 Nov 2024 14:14:31 -0500 Subject: [PATCH] flakeup --- dotfiles/dot_config/fish/functions/yabup.fish | 5 +++ flake.lock | 12 +++---- home/home.nix | 34 ++++++++++++++----- system/eddie/configuration.nix | 32 ++++++++++++++--- 4 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 dotfiles/dot_config/fish/functions/yabup.fish diff --git a/dotfiles/dot_config/fish/functions/yabup.fish b/dotfiles/dot_config/fish/functions/yabup.fish new file mode 100644 index 0000000..f810df4 --- /dev/null +++ b/dotfiles/dot_config/fish/functions/yabup.fish @@ -0,0 +1,5 @@ +#!/usr/bin/env fish + +function yabup --description 'update yabridge' + yabridgectl sync --prune $argv +end diff --git a/flake.lock b/flake.lock index e1c258b..16241a2 100644 --- a/flake.lock +++ b/flake.lock @@ -266,11 +266,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1730963269, + "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1730913476, - "narHash": "sha256-lnTw/I9EiMDS7g0kuZpj8f3djeuv2lCapqD0jdqibjg=", + "lastModified": 1731165699, + "narHash": "sha256-qkxvRHurayf5uLHCkynfVR2dam5PX7pIOE8GjMbN2mw=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "555bbbedcfa9a167a2d7659f9346b891c90750d9", + "rev": "a795450dbf55a9a184fa974e97f7cbe8fdae6e87", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 2818469..f8c6856 100644 --- a/home/home.nix +++ b/home/home.nix @@ -21,17 +21,20 @@ htop dconf dconf2nix + readline gnupg gcc gnutls gettext xorg.libX11 + xorg.libxcb freetype.dev gnumake flex bison mesa neofetch + xwayland nitch ripgrep-all silver-searcher @@ -62,7 +65,8 @@ aspellDicts.en aspellDicts.en-computers texlive.combined.scheme-full - appimage-run + # appimage-run + # libappimage transmission_4-gtk lsof ruby @@ -124,7 +128,9 @@ libGL # fontconfig # freetype - nix-ld + # nix-ld + + prusa-slicer # node packages nodePackages.typescript-language-server @@ -137,6 +143,7 @@ nodePackages.js-beautify nixd + nixdoc # bottles-unwrapped @@ -248,7 +255,7 @@ # Audio plugins (LV2, VST2, VST3, LADSPA) eq10q - lsp-plugins + # lsp-plugins geonkick bespokesynth pkgs-stable.helm @@ -261,8 +268,10 @@ chow-tape-model easyeffects vcv-rack + distrho-ports cardinal roomeqwizard + guitarix # Fonts fira-code @@ -284,7 +293,7 @@ sessionPath = [ "/home/emenel/.config/emacs/bin" "/home/emenel/.npm-packages/bin" "/home/emenel/Applications" "/home/emenel/.local/bin" "/home/emenel/.local/share" ]; sessionVariables = { - EDITOR = "emacsclient -r"; + # EDITOR = "emacsclient -tr"; WINEFSYNC = 1; PKG_CONFIG_PATH = "/home/emenel/.nix-profile/lib/pkgconfig:/home/emenel/.nix-profile/lib64/pkgconfig:/home/emenal/.nix-profile/share/pkgconfig"; GI_TYPELIB_PATH = "/run/current-system/sw/lib/girepository-1.0"; @@ -308,6 +317,7 @@ shellAliases = { "ls" = "eza"; ".j" = "just -g"; + "em" = "emacsclient -n -r"; }; }; starship = { @@ -319,7 +329,6 @@ msmtp.enable = true; emacs = { enable = true; - package = pkgs.emacs; extraPackages = epkgs: [ epkgs.mu4e epkgs.vterm @@ -455,7 +464,7 @@ flatpak.enable = true; syncthing = { enable = true; - #tray.enable = true; + tray.enable = true; }; borgmatic = { enable = true; @@ -464,6 +473,13 @@ enable = true; enableFishIntegration = true; }; + emacs = { + enable = true; + defaultEditor = true; + package = pkgs.emacs; + startWithUserSession = true; + socketActivation.enable = true; + }; }; xdg.systemDirs.data = [ @@ -493,9 +509,9 @@ PartOf=["grapical-session.target"]; }; - # Install = { - # WantedBy = [ "graphical-session.target" ]; - # }; + Install = { + after = [ "graphical-session.target" ]; + }; Service = { ExecStart = ''${pkgs.ulauncher}/bin/ulauncher --hide-window''; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 106a6f9..1388f77 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -129,10 +129,25 @@ services.xserver.videoDrivers = [ "nvidia" ]; - networking.hostName = "eddie"; + networking = { + hostName = "eddie"; + domain = "local"; + nameservers = [ "1.1.1.1" "1.0.0.1" ]; + networkmanager = { + enable = true; + wifi.powersave = true; + # connectionConfig = "connection.mdns=2"; + }; + }; - # Enable networking - networking.networkmanager.enable = true; + services.resolved = { + enable = true; + extraConfig = '' + LLMNR=no + ReadEtcHosts=no + DNSSEC=no + ''; + }; # Set your time zone. time.timeZone = "America/Toronto"; @@ -173,7 +188,6 @@ #services.emacs = { # enable = true; - # package = pkgs.emacs; #}; # Enable sound with pipewire. @@ -260,6 +274,7 @@ config = builtins.readFile ../../dotfiles/dot_config/kmonad/snap.kbd; }; razer = { + extraGroups = [ "openrazer" ]; device = "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd"; config = builtins.readFile ../../dotfiles/dot_config/kmonad/razer.kbd; }; @@ -294,7 +309,7 @@ zlib zstd stdenv.cc.cc - curl + curlFull openssl attr libssh @@ -307,6 +322,8 @@ systemd fontconfig freetype + gnutls + util-linux ]; fonts.fontconfig.enable = true; @@ -320,6 +337,11 @@ # enable the OpenSSH daemon. services.openssh.enable = true; + # services.avahi = { + # enable = true; + # nssmdns = true; + # }; + # add user accounts users.users.emenel = { isNormalUser = true;