diff --git a/flake.lock b/flake.lock index 86eb2c9..6797c04 100644 --- a/flake.lock +++ b/flake.lock @@ -150,11 +150,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1711027794, - "narHash": "sha256-aT+e3dh4rRL0uKGY95tqwIHV31OM7Mv8kctpNpDaI88=", + "lastModified": 1710515083, + "narHash": "sha256-3ve+IZzSpMigIIIW7x/WVSkm/5IyKb0ggFLcanbzskU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "cf3c7f5740192c9ebaa7270e5e487c6fa0f47859", + "rev": "7c0ba20a0a205e3bf89a34d6fa5776980b3bec27", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "eaf": { "flake": false, "locked": { - "lastModified": 1711033476, - "narHash": "sha256-4CPhEO4d66GzD3vOcNyRl6DmRDYiiIeRhX/9RUPZ+PM=", + "lastModified": 1710401124, + "narHash": "sha256-9aIf/OEryv1gJ8oC1jX5dbPy0ZPhDgSfaan3PEVwwQc=", "owner": "emacs-eaf", "repo": "emacs-application-framework", - "rev": "9bf8caba36e27fafcef5d8e68969a1a8eb5432ed", + "rev": "c71bf1fe0206964153a0b2e49149244c6b96f875", "type": "github" }, "original": { @@ -245,21 +245,6 @@ "type": "github" } }, - "emacs-pin-nixpkgs": { - "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", - "type": "indirect" - } - }, "emacs-so-long": { "flake": false, "locked": { @@ -481,11 +466,11 @@ ] }, "locked": { - "lastModified": 1711122977, - "narHash": "sha256-EnHux7wf7/7r+YMv8d/Ym1OTllp4sqqq0Bws1a4s2Zo=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "19b87b9ae6ecfd81104a2a36ef8364f1de1b54b1", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -519,11 +504,11 @@ "hyprland-plugins": { "flake": false, "locked": { - "lastModified": 1711047490, - "narHash": "sha256-uyUenHmRzOdXajeYWA70C2+uzDeiqkiMcaBr3uKs28s=", + "lastModified": 1710512163, + "narHash": "sha256-bj3waHL6vTBWPw4f+vUdJ1MC5I8UWv2mNX3v/FPHBKQ=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "adec334acfb453014cdff1e5f070bb7c1c4e4a9b", + "rev": "50758aa0244372af3d6f058dce39970a8d96ce2d", "type": "github" }, "original": { @@ -612,11 +597,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -627,11 +612,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710951922, - "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", + "lastModified": 1710420202, + "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f091af045dff8347d66d186a62d42aceff159456", + "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da", "type": "github" }, "original": { @@ -869,7 +854,6 @@ "blocklist-hosts": "blocklist-hosts", "eaf": "eaf", "eaf-browser": "eaf-browser", - "emacs-pin-nixpkgs": "emacs-pin-nixpkgs", "home-manager": "home-manager", "hyprland-plugins": "hyprland-plugins", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", @@ -908,11 +892,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711073443, - "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=", + "lastModified": 1710555016, + "narHash": "sha256-Lbdq3/TH4VrrR7A6FxIYwu5tFOcprYh8Q49Nc9s/i6c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe", + "rev": "42baa9e2e4713572d7481f917243b07dffdf54b8", "type": "github" }, "original": { @@ -954,11 +938,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711106191, - "narHash": "sha256-WX1Tyb94jB3ksSQ5UtlTY/1UBsO7FlFNPjG3BXt9/0Q=", + "lastModified": 1710420453, + "narHash": "sha256-F/JfpPRpIkFqvYEtt55lZyaFd+/vhn9SrcQrXIZCkOU=", "owner": "danth", "repo": "stylix", - "rev": "4da2d793e586f3f45a54fb9755ee9bf39d3cd52e", + "rev": "eb64377e66122de7a36ca7a611aa97ddf4c8e5e8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8064182..6556510 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,9 @@ { description = "Flake of LibrePhoenix"; - outputs = inputs@{ self, nixpkgs, nixpkgs-stable, emacs-pin-nixpkgs, kdenlive-pin-nixpkgs, - home-manager, nix-doom-emacs, nix-straight, stylix, blocklist-hosts, - hyprland-plugins, rust-overlay, org-nursery, org-yaap, org-side-tree, - org-timeblock, phscroll, ... }: + outputs = inputs@{ self, nixpkgs, nixpkgs-stable, kdenlive-pin-nixpkgs, home-manager, nix-doom-emacs, + nix-straight, stylix, blocklist-hosts, hyprland-plugins, rust-overlay, + org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let # ---- SYSTEM SETTINGS ---- # systemSettings = { @@ -75,10 +74,6 @@ }; }; - pkgs-emacs = import emacs-pin-nixpkgs { - system = systemSettings.system; - }; - pkgs-kdenlive = import kdenlive-pin-nixpkgs { system = systemSettings.system; }; @@ -108,7 +103,6 @@ extraSpecialArgs = { # pass config variables from above inherit pkgs-stable; - inherit pkgs-emacs; inherit pkgs-kdenlive; inherit systemSettings; inherit userSettings; @@ -167,7 +161,6 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-23.11"; - emacs-pin-nixpkgs.url = "nixpkgs/f8e2ebd66d097614d51a56a755450d4ae1632df1"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; home-manager.url = "github:nix-community/home-manager/master"; diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix index 561aa66..cf3e98f 100644 --- a/profiles/work/configuration.nix +++ b/profiles/work/configuration.nix @@ -76,7 +76,7 @@ users.users.${userSettings.username} = { isNormalUser = true; description = userSettings.name; - extraGroups = [ "networkmanager" "wheel" "input" "dialout" ]; + extraGroups = [ "networkmanager" "wheel" ]; packages = []; uid = 1000; }; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index f535d01..682701b 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -46,7 +46,6 @@ # Office libreoffice-fresh mate.atril - openboard xournalpp glib newsflash @@ -57,7 +56,6 @@ openvpn protonmail-bridge texliveSmall - numbat wine bottles @@ -130,9 +128,6 @@ libmediainfo mediainfo-gui audio-recorder - gnome.cheese - ardour - tenacity # Various dev packages texinfo diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index b43a161..6c40833 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1246,7 +1246,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." "q" 'helpful-kill-buffers) ;;;------ helpful configuration ------;;; -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8") +(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.12.1") (require 'mu4e) (require 'mu4e-contrib) (require 'mu4e-actions) diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index 6327dca..2bb1cb7 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -1,19 +1,13 @@ -{ config, lib, pkgs-emacs, pkgs-stable, userSettings, systemSettings, +{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings, org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; in { - imports = [ - ../git/git.nix - ../../shell/sh.nix - ../../shell/cli-collection.nix - ]; - programs.doom-emacs = { enable = true; - emacsPackage = pkgs-emacs.emacs29-pgtk; + emacsPackage = pkgs.emacs29-pgtk; doomPrivateDir = ./.; # This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34 # Only init/packages so we only rebuild when those change. @@ -24,7 +18,7 @@ in filter = path: type: builtins.elem (baseNameOf path) [ "init.el" "packages.el" ]; }; - in pkgs-emacs.linkFarm "doom-packages-dir" [ + in pkgs.linkFarm "doom-packages-dir" [ { name = "init.el"; path = "${filteredPath}/init.el"; @@ -35,7 +29,7 @@ in } { name = "config.el"; - path = pkgs-emacs.emptyFile; + path = pkgs.emptyFile; } ]; # End block @@ -46,16 +40,18 @@ in extension = ".el"; }; - home.packages = (with pkgs-emacs; [ + home.packages = (with pkgs; [ nil nixfmt + git file wmctrl jshon aria hledger hunspell hunspellDicts.en_US-large - (pkgs-emacs.mu.override { emacs = emacs29-pgtk; }) + pandoc + (pkgs.mu.override { emacs = emacs29-pgtk; }) emacsPackages.mu4e isync msmtp @@ -74,7 +70,7 @@ in services.mbsync = { enable = true; - package = pkgs-stable.isync; + package = pkgs.isync; frequency = "*:0/5"; }; diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 61bda1d..8fd8669 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1469,7 +1469,7 @@ I don't have this active right now since it's kinda weird with pgtk... ** mu4e Configuration #+BEGIN_SRC emacs-lisp :tangle config.el ;;;------ helpful configuration ------;;; -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8") +(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.12.1") (require 'mu4e) (require 'mu4e-contrib) (require 'mu4e-actions) @@ -1934,22 +1934,16 @@ Any git package can be configured for a particular commit or branch: * Nix Integration In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]]. #+BEGIN_SRC nix :tangle doom.nix -{ config, lib, pkgs-emacs, pkgs-stable, userSettings, systemSettings, +{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings, org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; in { - imports = [ - ../git/git.nix - ../../shell/sh.nix - ../../shell/cli-collection.nix - ]; - programs.doom-emacs = { enable = true; - emacsPackage = pkgs-emacs.emacs29-pgtk; + emacsPackage = pkgs.emacs29-pgtk; doomPrivateDir = ./.; # This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34 # Only init/packages so we only rebuild when those change. @@ -1960,7 +1954,7 @@ in filter = path: type: builtins.elem (baseNameOf path) [ "init.el" "packages.el" ]; }; - in pkgs-emacs.linkFarm "doom-packages-dir" [ + in pkgs.linkFarm "doom-packages-dir" [ { name = "init.el"; path = "${filteredPath}/init.el"; @@ -1971,7 +1965,7 @@ in } { name = "config.el"; - path = pkgs-emacs.emptyFile; + path = pkgs.emptyFile; } ]; # End block @@ -1982,16 +1976,18 @@ in extension = ".el"; }; - home.packages = (with pkgs-emacs; [ + home.packages = (with pkgs; [ nil nixfmt + git file wmctrl jshon aria hledger hunspell hunspellDicts.en_US-large - (pkgs-emacs.mu.override { emacs = emacs29-pgtk; }) + pandoc + (pkgs.mu.override { emacs = emacs29-pgtk; }) emacsPackages.mu4e isync msmtp @@ -2010,7 +2006,7 @@ in services.mbsync = { enable = true; - package = pkgs-stable.isync; + package = pkgs.isync; frequency = "*:0/5"; }; diff --git a/user/shell/cli-collection.nix b/user/shell/cli-collection.nix index ce93f72..aa5ae53 100644 --- a/user/shell/cli-collection.nix +++ b/user/shell/cli-collection.nix @@ -20,10 +20,9 @@ pandoc hwinfo pciutils - numbat (pkgs.callPackage ../pkgs/smartcalc.nix { }) - #(pkgs.writeShellScriptBin "sc" ''smartcalc'') - #(pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { }) + (pkgs.writeShellScriptBin "sc" ''smartcalc'') + (pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { }) #(pkgs.python3Packages.callPackage ../pkgs/impressive.nix { }) (pkgs.writeShellScriptBin "airplane-mode" '' #!/bin/sh diff --git a/user/shell/sh.nix b/user/shell/sh.nix index b96d8b2..ff3467b 100644 --- a/user/shell/sh.nix +++ b/user/shell/sh.nix @@ -18,9 +18,9 @@ in { programs.zsh = { enable = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; + enableAutosuggestions = true; enableCompletion = true; + syntaxHighlighting.enable = true; shellAliases = myAliases; initExtra = '' PROMPT=" ◉ %U%F{magenta}%n%f%u@%U%F{blue}%m%f%u:%F{yellow}%~%f diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index bc2d8e6..1d2ca92 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, userSettings, systemSettings, ... }: +{ config, lib, pkgs, userSettings, ... }: { imports = [ @@ -7,13 +7,10 @@ (import ../../app/dmenu-scripts/networkmanager-dmenu.nix { dmenu_command = "fuzzel -d"; inherit config lib pkgs; }) - ../input/nihongo.nix - ] ++ - (if (systemSettings.profile == "personal") then - [ (import ./hyprprofiles/hyprprofiles.nix { - dmenuCmd = "fuzzel -d"; inherit config lib pkgs; })] - else - []); + (import ./hyprprofiles/hyprprofiles.nix { + dmenuCmd = "fuzzel -d"; inherit config lib pkgs; + }) + ]; gtk.cursorTheme = { package = pkgs.quintom-cursor-theme; @@ -113,7 +110,6 @@ bindm=SUPER,mouse:273,resizewindow bind=SUPER,T,togglefloating bind=SUPER,G,exec,hyprworkspace 9; pegasus-fe; - bind=,code:148,exec,''+ userSettings.term + " "+''-e numbat bind=,code:107,exec,grim -g "$(slurp)" bind=SHIFT,code:107,exec,grim -g "$(slurp -o)" @@ -227,13 +223,9 @@ monitor=HDMI-A-1,1920x1080,1920x0,1 monitor=DP-1,1920x1080,0x0,1 - # hdmi tv + # 2 monitor setup #monitor=eDP-1,1920x1080,1920x0,1 - #monitor=HDMI-A-1,1920x1080,0x0,1 - - # hdmi work projector - #monitor=eDP-1,1920x1080,1920x0,1 - #monitor=HDMI-A-1,1920x1200,0x0,1 + #monitor=DP-1,1920x1200,0x0,1 xwayland { force_zero_scaling = true @@ -252,7 +244,6 @@ } misc { - disable_hyprland_logo = true mouse_move_enables_dpms = false } decoration { @@ -310,7 +301,7 @@ #!/bin/sh imgname="/tmp/screenshot-ocr-$(date +%Y%m%d%H%M%S).png" txtname="/tmp/screenshot-ocr-$(date +%Y%m%d%H%M%S)" - txtfname=$txtname.txt + txtfname="/tmp/screenshot-ocr-$(date +%Y%m%d%H%M%S).txt" grim -g "$(slurp)" $imgname; tesseract $imgname $txtname; wl-copy -n < $txtfname @@ -441,7 +432,7 @@ margin = "7 7 3 7"; spacing = 2; - modules-left = [ "custom/os" "custom/hyprprofile" "battery" "backlight" "keyboard-state" "pulseaudio" "cpu" "memory" ]; + modules-left = [ "custom/os" "custom/hyprprofile" "battery" "backlight" "pulseaudio" "cpu" "memory" ]; modules-center = [ "hyprland/workspaces" ]; modules-right = [ "idle_inhibitor" "tray" "clock" ]; @@ -456,14 +447,6 @@ "interval" = 3; "on-click" = "hyprprofile-dmenu"; }; - "keyboard-state" = { - "numlock" = true; - "format" = " {icon} "; - "format-icons" = { - "locked" = "󰎠"; - "unlocked" = "󱧓"; - }; - }; "hyprland/workspaces" = { "format" = "{icon}"; "format-icons" = { @@ -719,14 +702,6 @@ color: #'' + config.lib.stylix.colors.base0A + ''; } - label.numlock { - color: #'' + config.lib.stylix.colors.base04 + ''; - } - - label.numlock.locked { - color: #'' + config.lib.stylix.colors.base0F + ''; - } - #pulseaudio { color: #'' + config.lib.stylix.colors.base0C + ''; } @@ -758,7 +733,6 @@ background-size: auto 100%; } ''; - services.udiskie.enable = true; services.udiskie.tray = "always"; programs.swaylock = { diff --git a/user/wm/input/nihongo.nix b/user/wm/input/nihongo.nix deleted file mode 100644 index 0d75797..0000000 --- a/user/wm/input/nihongo.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ pkgs, ... }: - -{ - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - ]; - }; - home.file.".config/fcitx5/config".text = '' - [Hotkey] - # Enumerate when press trigger key repeatedly - EnumerateWithTriggerKeys=True - # Temporally switch between first and current Input Method - AltTriggerKeys= - # Enumerate Input Method Forward - EnumerateForwardKeys= - # Enumerate Input Method Backward - EnumerateBackwardKeys= - # Skip first input method while enumerating - EnumerateSkipFirst=False - # Toggle embedded preedit - TogglePreedit= - - [Hotkey/TriggerKeys] - 0=Super+comma - - [Hotkey/EnumerateGroupForwardKeys] - 0=Super+space - - [Hotkey/EnumerateGroupBackwardKeys] - 0=Shift+Super+space - - [Hotkey/ActivateKeys] - 0=Hangul_Hanja - - [Hotkey/DeactivateKeys] - 0=Hangul_Romaja - - [Hotkey/PrevPage] - 0=Up - - [Hotkey/NextPage] - 0=Down - - [Hotkey/PrevCandidate] - 0=Shift+Tab - - [Hotkey/NextCandidate] - 0=Tab - - [Behavior] - # Active By Default - ActiveByDefault=False - # Share Input State - ShareInputState=No - # Show preedit in application - PreeditEnabledByDefault=True - # Show Input Method Information when switch input method - ShowInputMethodInformation=True - # Show Input Method Information when changing focus - showInputMethodInformationWhenFocusIn=False - # Show compact input method information - CompactInputMethodInformation=True - # Show first input method information - ShowFirstInputMethodInformation=True - # Default page size - DefaultPageSize=5 - # Override Xkb Option - OverrideXkbOption=False - # Custom Xkb Option - CustomXkbOption= - # Force Enabled Addons - EnabledAddons= - # Force Disabled Addons - DisabledAddons= - # Preload input method to be used by default - PreloadInputMethod=True - # Allow input method in the password field - AllowInputMethodForPassword=False - # Show preedit text when typing password - ShowPreeditForPassword=False - # Interval of saving user data in minutes - AutoSavePeriod=30 - ''; - home.file.".config/fcitx5/profile".text = '' - [Groups/0] - # Group Name - Name=Default - # Layout - Default Layout=us - # Default Input Method - DefaultIM=mozc - - [Groups/0/Items/0] - # Name - Name=keyboard-us - # Layout - Layout= - - [Groups/0/Items/1] - # Name - Name=mozc - # Layout - Layout= - - [GroupOrder] - 0=Default - ''; -}