diff --git a/README.org b/README.org index 362d0f6..57ca512 100644 --- a/README.org +++ b/README.org @@ -284,6 +284,7 @@ sysstat procs pandoc samba +blesh #+end_src These are just for general graphical machines. Laptops, and desktops. @@ -542,7 +543,7 @@ Notice how I am including all of my software here. It may be a big file, but hav # Enable fingerprint services.fprintd.enable = true; - programs.qt5ct.enable = true; + # programs.qt5ct.enable = true; <> @@ -551,6 +552,7 @@ Notice how I am including all of my software here. It may be a big file, but hav # Some other things services.thermald.enable = true; + services.power-profiles-daemon.enable = false; services.tlp = { enable = true; settings = { @@ -1576,7 +1578,36 @@ I also use home-manager for managing dotfiles. This means that everything is con recursive = true; }; - programs.starship.enable = true; + home.shellAliases = { + ls = "exa -l"; + la = "exa -la"; + mpf = "mpv --profile=fast"; + mps = "mpv --profile=slow"; + ec = "emacsclient -t"; + ecc = "emacsclient -c"; + mkdir = "mkdir -pv"; + nupd = "update-nix"; + nupg = "upgrade-nix"; + suspend = "systemctl suspend"; + sysuse = "systemctl --user"; + myip = "curl icanhazip.com"; + ytd = "yt-dlp -o ~/Videos/%(title)s.%(ext)s"; + }; + + programs.starship = { + enable = true; + enableBashIntegration = true; + }; + + programs.bash = { + enable = true; + bashrcExtra = '' + source $(blesh-share) + ble-face auto_complete="fg=238" + eval "$(starship init bash)" + ''; + }; + programs.zsh = { enable = true; enableAutosuggestions = true; diff --git a/flake.lock b/flake.lock index c9b41ba..4ffbee1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1656927578, - "narHash": "sha256-ZSFrM/1PlJOqCb3mN88ZUh9dkQvNLU/nkoQ2tu02/FM=", + "lastModified": 1659863516, + "narHash": "sha256-gfLm3XOcSEAokqNs2sA0pXHIebdgvpA2F6lvrB/dkis=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2445620d177e295e711c1b2bc6c01ed6df26c16", + "rev": "d9e03b7f8c67890b920c92d8154dd9b60bb1242f", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1656957531, - "narHash": "sha256-pdbXjyWo9nkK+Uun6AjwCMPFgfS32pF91bsoD1ebq6I=", + "lastModified": 1659821525, + "narHash": "sha256-Yu/5YqKikcUaFMZEmILVsSMhT7F+ZC399R+h2f1PrWI=", "owner": "vaxerski", "repo": "Hyprland", - "rev": "cc8b8f595fa5c20b394394fe777451d4873608b3", + "rev": "9fcfaaadb609344d24349c525cf0945f3110717a", "type": "github" }, "original": { @@ -45,11 +45,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "lastModified": 1659713809, + "narHash": "sha256-M4aHuXXVnfprM8xPH2lLkYkkR0fmaG5QmvIc0DT/d4E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "93c57a988470c1948976b1bb70abbd5855c5b810", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1655824477, - "narHash": "sha256-1kskHOLsnisR3kqIL5IHrQbQG/4xoXxeEf1ExMV6/RU=", + "lastModified": 1659738224, + "narHash": "sha256-bV3TLiCgptpKoUKLiH/5RMtiIsfn0hawdaCEHQFB6WY=", "owner": "wlroots", "repo": "wlroots", - "rev": "5c4384a1330faedf975c8b8644881d50390f3613", + "rev": "3baf2a6bcfc4cb86c364f5724aaec80f28715a01", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 17ffc35..2d58f05 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,12 @@ } ]; }; + dalinar = lib.nixosSystem { + inherit system; + modules = [ + ./system/dalinar/configuration.nix + ]; + }; }; }; } diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 1614528..5986f44 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -161,12 +161,8 @@ vim wget killall + git tmux - discover - # kde-rounded-corners - lightly-qt - pinentry - pinentry-qt dutree unzip unrar @@ -175,13 +171,35 @@ gzip usbutils binutils + podman-compose + exa + yt-dlp + bat + rsync + jq + ripgrep + fd + ffmpeg-full + libheif + trash-cli + htop + btop + bc + sysstat + procs + pandoc + samba + blesh + discover + # kde-rounded-corners + lightly-qt + pinentry + pinentry-qt hunspell caffeine-ng hunspellDicts.en_US - git transmission openssh - samba ark ifuse dash @@ -196,40 +214,27 @@ sddm-kcm ydotool bottles - podman-compose - exa imv feh mpv - yt-dlp rofi-emoji nerdfonts latte-dock - bat - jq alacritty libsForQt5.bismuth libnotify rofi-wayland - ripgrep - fd aha glxinfo vulkan-tools wayland-utils # mkchromecast plocate - bc - sysstat - procs - pandoc papirus-icon-theme phinger-cursors plasma-hud kde-cli-tools gzip - htop - btop qrencode brave scribus @@ -261,7 +266,6 @@ spotdl kdenlive rubberband - ffmpeg-full texlive.combined.scheme-full wlroots picom-next @@ -277,8 +281,6 @@ element-desktop-wayland scrcpy python - trash-cli - libheif airshipper # hyprland diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index dc7ab75..b4dd722 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -85,7 +85,7 @@ # Enable fingerprint services.fprintd.enable = true; - programs.qt5ct.enable = true; + # programs.qt5ct.enable = true; # Enable sound. security.rtkit.enable = true; @@ -105,6 +105,7 @@ # Some other things services.thermald.enable = true; + services.power-profiles-daemon.enable = false; services.tlp = { enable = true; settings = { @@ -171,12 +172,8 @@ vim wget killall + git tmux - discover - # kde-rounded-corners - lightly-qt - pinentry - pinentry-qt dutree unzip unrar @@ -185,13 +182,35 @@ gzip usbutils binutils + podman-compose + exa + yt-dlp + bat + rsync + jq + ripgrep + fd + ffmpeg-full + libheif + trash-cli + htop + btop + bc + sysstat + procs + pandoc + samba + blesh + discover + # kde-rounded-corners + lightly-qt + pinentry + pinentry-qt hunspell caffeine-ng hunspellDicts.en_US - git transmission openssh - samba ark ifuse dash @@ -206,40 +225,27 @@ sddm-kcm ydotool bottles - podman-compose - exa imv feh mpv - yt-dlp rofi-emoji nerdfonts latte-dock - bat - jq alacritty libsForQt5.bismuth libnotify rofi-wayland - ripgrep - fd aha glxinfo vulkan-tools wayland-utils # mkchromecast plocate - bc - sysstat - procs - pandoc papirus-icon-theme phinger-cursors plasma-hud kde-cli-tools gzip - htop - btop qrencode brave scribus @@ -271,7 +277,6 @@ spotdl kdenlive rubberband - ffmpeg-full texlive.combined.scheme-full wlroots picom-next @@ -287,8 +292,6 @@ element-desktop-wayland scrcpy python - trash-cli - libheif airshipper # hyprland diff --git a/user/home.nix b/user/home.nix index ee308cc..6f2f258 100644 --- a/user/home.nix +++ b/user/home.nix @@ -409,7 +409,36 @@ recursive = true; }; - programs.starship.enable = true; + home.shellAliases = { + ls = "exa -l"; + la = "exa -la"; + mpf = "mpv --profile=fast"; + mps = "mpv --profile=slow"; + ec = "emacsclient -t"; + ecc = "emacsclient -c"; + mkdir = "mkdir -pv"; + nupd = "update-nix"; + nupg = "upgrade-nix"; + suspend = "systemctl suspend"; + sysuse = "systemctl --user"; + myip = "curl icanhazip.com"; + ytd = "yt-dlp -o ~/Videos/%(title)s.%(ext)s"; + }; + + programs.starship = { + enable = true; + enableBashIntegration = true; + }; + + programs.bash = { + enable = true; + bashrcExtra = '' + source $(blesh-share) + ble-face auto_complete="fg=238" + eval "$(starship init bash)" + ''; + }; + programs.zsh = { enable = true; enableAutosuggestions = true;