diff options
| -rw-r--r-- | README.md | 24 | ||||
| -rw-r--r-- | assets/desktop.png | bin | 2354936 -> 365738 bytes | |||
| -rw-r--r-- | assets/topbar.png | bin | 13385 -> 30604 bytes | |||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rwxr-xr-x | hypr/wall.sh | 10 | ||||
| -rw-r--r-- | nixos/desktop-environment.nix | 23 | ||||
| -rw-r--r-- | nixos/nvim.nix | 5 | ||||
| -rw-r--r-- | nixos/services.nix | 14 | ||||
| -rw-r--r-- | nvim/init.lua | 5 |
9 files changed, 33 insertions, 55 deletions
@@ -5,11 +5,10 @@ </h1> <h4 align="center"> A configuration for NixOS + Hyprland<br> - An opinionated setup for F1 fans and programmers + An opinionated setup for programmers who don't believe in auto complete </h4> <p align="center"> - <a href="#wallpapers">Wallpapers</a> • <a href="#installation">Installation</a> • <a href="#customization">Customization</a> • <a href="#docs">Docs</a> @@ -17,14 +16,6 @@  -## Wallpapers - - - -And more in Wallpapers/ - -[Credit for F1 wallpapers](https://photos.google.com/share/AF1QipMSCLnAN3FpvqaMdcMQfXJU9tHow9PLA1bm4RaeQhzq6EpmLGDnmq1ht2dNqLwODg?pli=1&key=N0xtODRJMHl3cjNwRlVoa2dEanRxZm14TFpBTGpB) - ## Installation Adjust username, hostname and download destination in flake.nix according to your needs<br> then @@ -39,10 +30,15 @@ chmod +x nix.sh ./nix.sh ``` +For system update +``` +nix flake update +./nix.sh +``` + ## Customization You can use this project outside of NixOS as well, just by ignoring the nixos directory.<br> But make sure you download all the dependencies that are used in nixos/desktop-environment.nix<br> -Check ./sync.sh to find where each directory is sourced from ## Docs @@ -64,7 +60,6 @@ Low battery warning notifications - 15% (Critical) Change these values in quickshell/shell.qml(look for "redBatteryPoint" & "orangeBatteryPoint") & hypr/battery-notif.sh<br> <br> -Wallpapers changes every 10 mintues and picks from ~/Pictures/Screenshots ### Quickshell  @@ -75,6 +70,7 @@ Configure in quickshell/shell.qml<br> |Label|Description| |-|-| |Radio|Network info, clicking it will open NetworkManager| +|Low Energy|Bluetooth, clicking it will open blue-tui| |Electrons|Battery %, When charging the % will be wrapped in "AC/DC()", e.g. AC/DC(50)| |Waves|Volume, clicking it will mute| |Photons|Brightness %| @@ -142,13 +138,15 @@ Configure in nixos/environment.nix ### Applications Configure in nixos/apps.nix +- Google Chrome - Gimp - Localsend - Obsidian +- OBS Studio - Wine - Libreoffice - Dolphin -- Zen +- Zen Browser - VLC ### Games diff --git a/assets/desktop.png b/assets/desktop.png Binary files differindex 743d952..967724e 100644 --- a/assets/desktop.png +++ b/assets/desktop.png diff --git a/assets/topbar.png b/assets/topbar.png Binary files differindex b9fe46d..b716fe0 100644 --- a/assets/topbar.png +++ b/assets/topbar.png @@ -43,10 +43,10 @@ languages = { c = true; asm = true; - lua = true; + lua = true; # needed for nvim + go = true; # needed for hypr-zoom python = false; - go = true; beam = false; javascript = false; rust = false; @@ -61,9 +61,8 @@ minecraft = true; }; - # TODO sessions = { - plasma_x11 = true; + plasma_x11 = true; # this is entirely backup, there is no rice here hyprland_wayland = true; }; dualbootedwithwindows = false; diff --git a/hypr/wall.sh b/hypr/wall.sh index a472469..b99a60a 100755 --- a/hypr/wall.sh +++ b/hypr/wall.sh @@ -1,11 +1,3 @@ #!/usr/bin/env bash -swaybg -i ~/Pictures/nurberg/wallpaperbetter.jpg -m fill - -# while true; do -# wall=$(find "$HOME/Pictures/Wallpapers" -type f | shuf -n 1) -# swaybg -i "$wall" -m fill & -# pid=$! -# sleep 600 -# kill $pid -# done +swaybg -i ~/Pictures/space.jpg -m fill diff --git a/nixos/desktop-environment.nix b/nixos/desktop-environment.nix index 7f4fa4e..3945035 100644 --- a/nixos/desktop-environment.nix +++ b/nixos/desktop-environment.nix @@ -1,34 +1,33 @@ -{ config, pkgs, quickshell, ... }: +{ config, pkgs, quickshell, sessions, ... }: { services.xserver.enable = true; services.xserver.displayManager.startx.enable = true; services.displayManager.ly.enable = true; services.desktopManager.gnome.enable = false; services.desktopManager.plasma6.enable = true; - programs.hyprland.enable = true; - programs.hyprlock.enable = true; + programs.hyprland.enable = sessions.hyprland_wayland; + programs.hyprlock.enable = session.hyprland_wayland; programs.foot.enable = true; programs.sway.enable = true; programs.dconf.enable = true; environment.systemPackages = with pkgs; [ + playerctl + libnotify libGL - + mako + lm_sensors + slurp + ] ++ (if sessions.hyprland_wayland then [ quickshell.packages.${pkgs.system}.quickshell qt6.qtwayland catppuccin-cursors.mochaMauve swaybg - mako - lm_sensors grim - slurp hyprcursor hyprsunset hyprpicker - playerctl - libnotify - wl-clipboard - + ] else []) ++ (if sessions.plasma_x11 then [ xclip libx11 libxrandr @@ -37,5 +36,5 @@ libxi libxext libxfixes - ]; + ] else []); } diff --git a/nixos/nvim.nix b/nixos/nvim.nix index ae3c94c..e3ee7ff 100644 --- a/nixos/nvim.nix +++ b/nixos/nvim.nix @@ -6,12 +6,11 @@ zip unzip + direnv xsel ripgrep tree-sitter - - luajitPackages.magick - vscode-langservers-extracted + luajitPackages.magick ]; } diff --git a/nixos/services.nix b/nixos/services.nix index 5c17b64..2cbd8b5 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -31,20 +31,6 @@ services.cloudflare-warp.enable = true; services.openssh.enable = true; services.flatpak.enable = true; - # services.postgresql = { - # enable = true; - # ensureUsers = [ - # { - # name = username; - # ensureDBOwnership = true; - # } - # ]; - # ensureDatabases = [ username ]; - # authentication = pkgs.lib.mkOverride 10 '' - # #type database DBuser auth-method - # local all all trust - # ''; - # }; services.kanata = { enable = true; keyboards = { diff --git a/nvim/init.lua b/nvim/init.lua index da03f7f..717326b 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -212,6 +212,11 @@ vim.keymap.set('t', '<Esc>', "<C-\\><C-n>", { desc = 'Escape terminal mode' }) vim.keymap.set('n', '<leader>z', "<C-w>_", { desc = '[Z]en Mode' }) vim.keymap.set('n', '<leader><S-z>', "<C-w>=", { desc = 'Escape [Z]en Mode' }) +vim.keymap.set({'n', 'v'}, '<leader>/', "gcc", { + desc = 'Toggle Comment [/]', + remap = true +}) + vim.pack.add { gh 'nvim-mini/mini.nvim' } if vim.g.have_nerd_font then |
