From 9b60f9e5b6786c647ca5753b3c6ccc316f43d3eb Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Fri, 11 Apr 2025 17:14:21 -0700 Subject: [PATCH] transfer to toughbook --- agenda.org | 3 ++ config/emacs.el | 1 + config/emacs.org | 1 + config/nix.org | 54 +++++++++++++----------------- nix/flake.lock | 62 +++++++++++++++++------------------ nix/modules/configuration.nix | 2 +- nix/modules/home/default.nix | 4 +-- nix/modules/home/emacs.nix | 2 +- nix/modules/home/hyprland.nix | 36 ++++++++++---------- nix/modules/home/user.nix | 3 +- nix/modules/ollama.nix | 5 --- 11 files changed, 81 insertions(+), 92 deletions(-) diff --git a/agenda.org b/agenda.org index 9f241e2..61e474a 100644 --- a/agenda.org +++ b/agenda.org @@ -24,6 +24,9 @@ Update the nullring to be in org mode, and also include a couple more sites. ** TODO [#B] Umami My client server protocol needs to continue to be written. I also need to make a git repository for it. +** TODO RTOS +Write an RTOS for ARM and an emulator maybe? +** TODO Advanced Amateur Radio License ** Music and Media *** TODO [#B] Write Another Song I want to write another song. diff --git a/config/emacs.el b/config/emacs.el index ef85f0c..ddde018 100644 --- a/config/emacs.el +++ b/config/emacs.el @@ -20,6 +20,7 @@ (use-short-answers t "Use y instead of yes") (make-backup-files nil "Don't make backups") (display-fill-column-indicator-column 150 "Draw a line at 100 characters") + (fill-column 150) (line-spacing 2 "Default line spacing") (c-doc-comment-style '((c-mode . doxygen) (c++-mode . doxygen))) diff --git a/config/emacs.org b/config/emacs.org index 47cdc06..ca040d4 100644 --- a/config/emacs.org +++ b/config/emacs.org @@ -41,6 +41,7 @@ Emacs is self documenting, after all! (use-short-answers t "Use y instead of yes") (make-backup-files nil "Don't make backups") (display-fill-column-indicator-column 150 "Draw a line at 100 characters") + (fill-column 150) (line-spacing 2 "Default line spacing") (c-doc-comment-style '((c-mode . doxygen) (c++-mode . doxygen))) diff --git a/config/nix.org b/config/nix.org index eb37f90..36fbee2 100644 --- a/config/nix.org +++ b/config/nix.org @@ -22,7 +22,7 @@ so that adding new configurations that add modifications is made simple. description = "Emacs centric configurations for a complete networked system"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; sops-nix.url = "github:Mic92/sops-nix"; scripts.url = "github:ret2pop/scripts"; @@ -642,11 +642,6 @@ Use ollama for serving large language models to my other computers. host = "0.0.0.0"; openFirewall = true; }; - - services.nextjs-ollama-llm-ui = { - enable = lib.mkDefault config.services.ollama.enable; - port = 3000; - }; } #+end_src ** Bitcoind @@ -1025,7 +1020,6 @@ because they enhance security. enableAllFirmware = true; cpu.intel.updateMicrocode = true; graphics.enable = ! config.monorepo.profiles.ttyonly.enable; - pulseaudio.enable = ! config.monorepo.profiles.pipewire.enable; bluetooth = { enable = true; @@ -1034,6 +1028,7 @@ because they enhance security. }; services = { + pulseaudio.enable = ! config.monorepo.profiles.pipewire.enable; chrony = { enable = true; enableNTS = true; @@ -1351,7 +1346,6 @@ I have many imports that we'll go through next. ./mpd.nix ./mako.nix ./user.nix - ./pantalaimon.nix ]; options = { @@ -1414,7 +1408,6 @@ I have many imports that we'll go through next. ]) else []) ++ (if config.monorepo.profiles.workstation.enable then (with pkgs; [ - open-webui mumble ]) else []) ++ @@ -1498,7 +1491,7 @@ I have many imports that we'll go through next. qpwgraph imagemagick inkscape - kdenlive + kdePackages.kdenlive kicad reaper murmur @@ -1831,7 +1824,7 @@ as an org file which gets automatically tangled to an emacs-lisp file. programs.emacs = { enable = lib.mkDefault config.monorepo.profiles.graphics.enable; - package = pkgs.emacs30-pgtk; + package = pkgs.emacs-pgtk; extraConfig = '' (setq debug-on-error t) (org-babel-load-file @@ -2016,24 +2009,24 @@ to use this component will come soon. "Unknown-1,disable" ]; windowrule = [ - "workspace 1, ^(.*emacs.*)$" - "workspace 2, ^(.*firefox.*)$" - "workspace 2, ^(.*Tor Browser.*)$" - "workspace 2, ^(.*Chromium-browser.*)$" - "workspace 2, ^(.*chromium.*)$" - "workspace 3, ^(.*discord.*)$" - "workspace 3, ^(.*vesktop.*)$" - "workspace 3, ^(.*fluffychat.*)$" - "workspace 3, ^(.*element-desktop.*)$" - "workspace 4, ^(.*qpwgraph.*)$" - "workspace 4, ^(.*mpv.*)$" - "workspace 5, ^(.*Monero.*)$" - "workspace 5, ^(.*org\.bitcoin\..*)$" - "workspace 5, ^(.*Bitcoin Core - preston.*)$" - "workspace 5, ^(.*org\.getmonero\..*)$" - "workspace 5, ^(.*Monero - preston.*)$" - "workspace 5, ^(.*electrum.*)$" - "pseudo,fcitx" + "workspace 1, title:(^(.*emacs.*)$)" + "workspace 2, title:(^(.*firefox.*)$)" + "workspace 2, title:(^(.*Tor Browser.*)$)" + "workspace 2, title:(^(.*Chromium-browser.*)$)" + "workspace 2, title:(^(.*chromium.*)$)" + "workspace 3, title:(^(.*discord.*)$)" + "workspace 3, title:^(.*vesktop.*)$)" + "workspace 3, title:(^(.*fluffychat.*)$)" + "workspace 3, title:(^(.*element-desktop.*)$)" + "workspace 4, title:(^(.*qpwgraph.*)$)" + "workspace 4, title:(^(.*mpv.*)$)" + "workspace 5, title:(^(.*Monero.*)$)" + "workspace 5, title:(^(.*org\.bitcoin\..*)$)" + "workspace 5, title:(^(.*Bitcoin Core - preston.*)$)" + "workspace 5, title:(^(.*org\.getmonero\..*)$)" + "workspace 5, title:(^(.*Monero - preston.*)$)" + "workspace 5, title:(^(.*electrum.*)$)" + "pseudo,title:fcitx" ]; bind = [ "$mod, F, exec, firefox" @@ -2985,10 +2978,9 @@ for these configurations. torsocks tor-browser # fonts - noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 + nerd-fonts.iosevka noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ])) - (nerdfonts.override { fonts = [ "Iosevka" ]; }) # Misc. pinentry diff --git a/nix/flake.lock b/nix/flake.lock index 67c9ad1..aa8c69f 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1743808813, + "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725163709, - "narHash": "sha256-VqUwWZBBdDE0Jk1tRW6Bsg978R6rTILrvsqjfjHz2HY=", + "lastModified": 1742583654, + "narHash": "sha256-aTsLqhW9XD0O37BTJo0u5f0gkk/x4KnZ9sho9hSE6hE=", "owner": "Janik-Haag", "repo": "nixos-dns", - "rev": "ac41b8690c8db01af1eb77ea2fd330a1c43d814f", + "rev": "04b00ea7423c8dbe6e0ea78e4eb96f874a04c543", "type": "github" }, "original": { @@ -328,16 +328,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741724370, - "narHash": "sha256-WsD+8uodhl58jzKKcPH4jH9dLTLFWZpVmGq4W1XDVF4=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95600680c021743fd87b3e2fe13be7c290e1cac4", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -360,11 +360,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741708242, - "narHash": "sha256-cNRqdQD4sZpN7JLqxVOze4+WsWTmv2DGH0wNCOVwrWc=", + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b62d2a95c72fb068aecd374a7262b37ed92df82b", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", "type": "github" }, "original": { @@ -397,11 +397,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1741887947, - "narHash": "sha256-QQojmc7+HVYEZq4Ksim7y8KYobkIhqZ/oivd5Gnr8sA=", + "lastModified": 1743983100, + "narHash": "sha256-kqpU9g57elV2aDq5BRzuhthb+ob9RyEBQBVfOxNqB2g=", "owner": "nix-community", "repo": "NUR", - "rev": "2ac2be6a5936459018f10608b723487468a13f56", + "rev": "e3cc0198f8b8e521b99554d7a44c9fef77f2e729", "type": "github" }, "original": { @@ -524,11 +524,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741861888, - "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=", + "lastModified": 1743910657, + "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f", + "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", "type": "github" }, "original": { @@ -604,11 +604,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 4bbe1bb..a5167a5 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -193,7 +193,6 @@ enableAllFirmware = true; cpu.intel.updateMicrocode = true; graphics.enable = ! config.monorepo.profiles.ttyonly.enable; - pulseaudio.enable = ! config.monorepo.profiles.pipewire.enable; bluetooth = { enable = true; @@ -202,6 +201,7 @@ }; services = { + pulseaudio.enable = ! config.monorepo.profiles.pipewire.enable; chrony = { enable = true; enableNTS = true; diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index 72fcc31..d068383 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -20,7 +20,6 @@ ./mpd.nix ./mako.nix ./user.nix - ./pantalaimon.nix ]; options = { @@ -83,7 +82,6 @@ ]) else []) ++ (if config.monorepo.profiles.workstation.enable then (with pkgs; [ - open-webui mumble ]) else []) ++ @@ -167,7 +165,7 @@ qpwgraph imagemagick inkscape - kdenlive + kdePackages.kdenlive kicad reaper murmur diff --git a/nix/modules/home/emacs.nix b/nix/modules/home/emacs.nix index 71e234c..9ee2424 100644 --- a/nix/modules/home/emacs.nix +++ b/nix/modules/home/emacs.nix @@ -3,7 +3,7 @@ programs.emacs = { enable = lib.mkDefault config.monorepo.profiles.graphics.enable; - package = pkgs.emacs30-pgtk; + package = pkgs.emacs-pgtk; extraConfig = '' (setq debug-on-error t) (org-babel-load-file diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix index 1463f90..fa2a78b 100644 --- a/nix/modules/home/hyprland.nix +++ b/nix/modules/home/hyprland.nix @@ -37,24 +37,24 @@ "Unknown-1,disable" ]; windowrule = [ - "workspace 1, ^(.*emacs.*)$" - "workspace 2, ^(.*firefox.*)$" - "workspace 2, ^(.*Tor Browser.*)$" - "workspace 2, ^(.*Chromium-browser.*)$" - "workspace 2, ^(.*chromium.*)$" - "workspace 3, ^(.*discord.*)$" - "workspace 3, ^(.*vesktop.*)$" - "workspace 3, ^(.*fluffychat.*)$" - "workspace 3, ^(.*element-desktop.*)$" - "workspace 4, ^(.*qpwgraph.*)$" - "workspace 4, ^(.*mpv.*)$" - "workspace 5, ^(.*Monero.*)$" - "workspace 5, ^(.*org\.bitcoin\..*)$" - "workspace 5, ^(.*Bitcoin Core - preston.*)$" - "workspace 5, ^(.*org\.getmonero\..*)$" - "workspace 5, ^(.*Monero - preston.*)$" - "workspace 5, ^(.*electrum.*)$" - "pseudo,fcitx" + "workspace 1, title:(^(.*emacs.*)$)" + "workspace 2, title:(^(.*firefox.*)$)" + "workspace 2, title:(^(.*Tor Browser.*)$)" + "workspace 2, title:(^(.*Chromium-browser.*)$)" + "workspace 2, title:(^(.*chromium.*)$)" + "workspace 3, title:(^(.*discord.*)$)" + "workspace 3, title:^(.*vesktop.*)$)" + "workspace 3, title:(^(.*fluffychat.*)$)" + "workspace 3, title:(^(.*element-desktop.*)$)" + "workspace 4, title:(^(.*qpwgraph.*)$)" + "workspace 4, title:(^(.*mpv.*)$)" + "workspace 5, title:(^(.*Monero.*)$)" + "workspace 5, title:(^(.*org\.bitcoin\..*)$)" + "workspace 5, title:(^(.*Bitcoin Core - preston.*)$)" + "workspace 5, title:(^(.*org\.getmonero\..*)$)" + "workspace 5, title:(^(.*Monero - preston.*)$)" + "workspace 5, title:(^(.*electrum.*)$)" + "pseudo,title:fcitx" ]; bind = [ "$mod, F, exec, firefox" diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix index d0ce5cd..1087ebc 100644 --- a/nix/modules/home/user.nix +++ b/nix/modules/home/user.nix @@ -49,10 +49,9 @@ torsocks tor-browser # fonts - noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 + nerd-fonts.iosevka noto-fonts noto-fonts-cjk-sans noto-fonts-emoji fira-code font-awesome_6 (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ])) - (nerdfonts.override { fonts = [ "Iosevka" ]; }) # Misc. pinentry diff --git a/nix/modules/ollama.nix b/nix/modules/ollama.nix index 3ac1a52..736d5a4 100644 --- a/nix/modules/ollama.nix +++ b/nix/modules/ollama.nix @@ -6,9 +6,4 @@ host = "0.0.0.0"; openFirewall = true; }; - - services.nextjs-ollama-llm-ui = { - enable = lib.mkDefault config.services.ollama.enable; - port = 3000; - }; } -- 2.50.1