From 0bf25f5e5bb8132d7869d702eb0b585ce54c2a1e Mon Sep 17 00:00:00 2001 From: mehbark Date: Tue, 5 Dec 2023 22:56:54 -0500 Subject: [PATCH] =?UTF-8?q?YAY!=20emacs=20with=20(boolean=3D=3F=20#t=20(nu?= =?UTF-8?q?ll=3F=20errors))?= --- configuration.nix | 4 ++- flake.lock | 75 +++++++++++++++++++++++------------------------ flake.nix | 3 +- home.nix | 19 +++++++----- init.el | 23 ++------------- 5 files changed, 55 insertions(+), 69 deletions(-) diff --git a/configuration.nix b/configuration.nix index b90d95d..d4f694a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -53,6 +53,7 @@ in # Enable networking networking.networkmanager.enable = true; + networking.networkmanager.wifi.powersave = false; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Set your time zone. @@ -195,7 +196,8 @@ in git curl # just too nice - busybox + # just too many slightly outdated things + # busybox ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/flake.lock b/flake.lock index 05a0fcc..7689485 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,12 @@ "nixpkgs": "nixpkgs" }, "locked": { - "narHash": "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=", - "rev": "d72db6283e6b6bef7216c8586c16d9f648652400", - "revCount": 353, + "lastModified": 1701704947, + "narHash": "sha256-G2bLYand61E/s652Q+5XSfXdM6XUWixiXRRMd3HvfM4=", + "rev": "b79c8fd3dc0aa174f0918dccfbca66efcd0e9e4e", + "revCount": 405, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.7/018b3a46-fd61-77fb-9a59-239ed49dfff1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.9/018c3585-e222-75a9-ac61-c5916f086445/source.tar.gz" }, "original": { "type": "tarball", @@ -70,11 +71,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -90,11 +91,11 @@ ] }, "locked": { - "lastModified": 1693713564, - "narHash": "sha256-00w2uwb4O6Y1e2W5LG5UFyl1ZN3KFG7aoRdYEvT/BqA=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8e49b883890ccb52c059abb152b00a416342ec1c", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { @@ -112,11 +113,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1693825916, - "narHash": "sha256-DGHMrk5Uxl+biq8n4+XT1zKavJBt+iTVuoGVXfBCU/k=", + "lastModified": 1701819597, + "narHash": "sha256-X0K2v/SOMQj18/O9daDlizlnlGRDMWuuGoU3jm06b7k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "35df4693eaacaf95054af93eca687047355fcd26", + "rev": "8bd86cf37e245088433156796f1bc72542ca09ad", "type": "github" }, "original": { @@ -158,17 +159,15 @@ ] }, "locked": { - "lastModified": 1694081375, - "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=", - "owner": "nix-community", - "repo": "naersk", - "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89", - "type": "github" + "narHash": "sha256-TunvZMCxXHvU6fz5kq3XTLfojIvTDlbFGfPUFtwCU5o=", + "rev": "06a99941d72e2202ed62b8aa08b9869817fea56f", + "revCount": 332, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.332%2Brev-06a99941d72e2202ed62b8aa08b9869817fea56f/018b61d4-48e5-77e8-8893-9f917732b11a/source.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/naersk/0.1.332.tar.gz" } }, "nixlib": { @@ -194,11 +193,11 @@ ] }, "locked": { - "lastModified": 1693791338, - "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", + "lastModified": 1701689616, + "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", + "rev": "246219bc21b943c6f6812bb7744218ba0df08600", "type": "github" }, "original": { @@ -222,11 +221,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693158576, - "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -238,11 +237,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "lastModified": 1701626906, + "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361", "type": "github" }, "original": { @@ -335,18 +334,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1692976565, - "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", + "lastModified": 1701368958, + "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" } }, @@ -366,11 +365,11 @@ ] }, "locked": { - "lastModified": 1691841170, - "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5948527..9df056e 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,8 @@ hyprland, fh, pesterchum, - ... }: + ... + }: let # :( # could do like nix-i3, nix-hyprland but that would be LAME diff --git a/home.nix b/home.nix index b4841a9..9289d0b 100644 --- a/home.nix +++ b/home.nix @@ -27,7 +27,7 @@ in # wineWowPackages.stable # winetricks # foliate - # thunderbird + # thunderbird starship eza dmenu @@ -43,6 +43,10 @@ in chez racket clojure + ruby_3_3 + gcc + + watchexec cargo clippy @@ -51,11 +55,11 @@ in idris2 - # emacs likes this semgrep discord steam + gamemode rare # drm more like pooprm # might as well use a newer version @@ -63,17 +67,16 @@ in fzf kolourpaint + # yeah audacious audacity akku - # managing with elpas :( - # emacsPackages.idris2-mode - # emacsPackages.evil ripgrep tldr htop pv + helix lm_sensors libnotify @@ -84,6 +87,7 @@ in mpv yt-dlp + qbittorrent (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) @@ -288,12 +292,12 @@ in # services.emacs.client.enable = true; # not working right now programs.emacs = { - enable = false; + enable = true; package = pkgs.emacs29; extraPackages = epkgs: with epkgs; [ which-key - emacs all-the-icons-ivy + bind-key counsel gruvbox-theme lsp-mode @@ -316,7 +320,6 @@ in json-mode eglot org - org org-roam paredit rainbow-delimiters diff --git a/init.el b/init.el index 807b424..27325ce 100644 --- a/init.el +++ b/init.el @@ -1,20 +1,11 @@ -;;; ________ _______ __ __ -;;; / | / \ / | / | -;;; $$$$$$$$/ _____ ____ ______ _______ _______ $$$$$$$ | ______ ____$$ | ______ ______ _______$$ | __ -;;; $$ |__ / \/ \ / \ / |/ | $$ |__$$ |/ \ / $$ |/ \ / \ / $$ | / | -;;; $$ | $$$$$$ $$$$ |$$$$$$ /$$$$$$$//$$$$$$$/ $$ $$