diff --git a/README.md b/README.md index e04126e..8f6e0b9 100644 --- a/README.md +++ b/README.md @@ -1,73 +1,79 @@ To Do: ---- - -> uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work -> with GNOME, so instead wei are jumping into a new WM/DE because that will definitely be "easier",, right? -> - [Hyprland](https://hyprland.org/) - ---- - > in order of priority - - [ ] build ultraminimal general config **branch** - - [ ] build ultraminimal hyprland **branch**, following above structure - - [ ] build ultraminimal fallback gnome **branch**, following main structure - - [ ] create new branch, merge, make default branch if: - - [ ] get flake to actually build + - [ ] learn home manager (seriously wtf ???) + - [ ] become more learn-ed in the ways of nix-fu - - [X] steal, uh wei mean, uh, look at, other creature's nixos/hyprland setups (FrostPhoenix) - - [ ] *fully* convert/swap/cannibalise configs to match needs/wants - - [X] build ~~minimal~~ *near complete* system-framework/scaffolding for configuration around hyprland - - [ ] build user configuration - - [ ] select media for wallpapers, avatars, etc. - - [ ] multi-user support + - [X] build hyprland **branch** + - [ ] get it working, stable, etc + - [ ] build minimal fallback gnome branch + - [ ] get flake to actually build - [ ] per host hardware configurations - [ ] Hades - [X] Proserpina + - [ ] (+ per host theming) + --- Cursory flake structure [Heavily WIP] ---- ``` + +[CURRENT] + . -├── flake.nix [BROKEN] +├── flake +├── core +│ ├── configuration +│ ├── packages +│ └── users +├── home +│ ├── home +│ └── hyprland ├── hosts -│ ├── hades [MISSING] -│ └── proserpina (incomplete?) -└── modules - ├── core [INCOMPLETE/BROKEN] - │ ├── audio - │ ├── default - │ ├── display - │ ├── home - │ ├── packages - │ └── services - └── home - ├── hyprland (stolen configs for now) - │ ├── stylix - │ ├── waybar - │ └── wofi - ├── programs (stolen configs for now) - │ ├── btop - │ ├── discord - │ ├── fish - │ ├── gaming - │ ├── git - │ ├── gtk - │ ├── kitty - │ ├── micro - │ ├── starship - │ └── vscodium - ├── resources - │ ├── icons [MISSING] - │ └── wallpapers [MISSING] - └── scripts (stolen) +│ └── proserpina +│ └── configuration +└── resources + +``` +--- ``` ---- +[PLANNED] + +. +├── flake +├── core +│ ├── core-config +│ ├── packages +│ ├── services +│ └── users +├── home +│ ├── home-config +│ ├── packages +│ ├── firefox +│ ├── gaming +│ ├── git +│ ├── fish +│ ├── micro +│ ├── kitty +│ ├── starship +│ └── hyprland +│ ├── hypr-misc +│ ├── waybar +│ ├── dunst +│ └── wofi +└── hosts + ├── hades + │ ├── configuration + │ └── resources + └── proserpina + ├── configuration + └── resources + +``` diff --git a/core/configuration.nix b/core/configuration.nix new file mode 100644 index 0000000..6be7fb7 --- /dev/null +++ b/core/configuration.nix @@ -0,0 +1,133 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: + +{ + imports = [ + + # home-manager + inputs.home-manager.nixosModules.home-manager + + # also split up configuration.nix and import pieces: + ./users.nix + ./packages.nix + + ]; + + security = { + rtkit.enable = true; + sudo.execWheelOnly = true; + }; + + time.timeZone = "Australia/Brisbane"; + i18n.defaultLocale = "en_GB.UTF-8"; + + nixpkgs = { + # add overlays here + overlays = [ + # to use overlays exported from other flakes: + # neovim-nightly-overlay.overlays.default + + # or define it inline, for example: + # (final: prev: { + # hi = final.hello.overrideAttrs (oldAttrs: { + # patches = [ ./change-hello-to-hi.patch ]; + # }); + # }) + ]; + # configure nixpkgs instance + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "schildichat-web-1.11.30-sc.2" + "electron-25.9.0" + ]; + }; + }; + + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs); + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nix.nixPath = ["/etc/nix/path"]; + environment.etc = + lib.mapAttrs' + (name: value: { + name = "nix/path/${name}"; + value.source = value.flake; + }) + config.nix.registry; + + nix.settings = { + cores = 0; + auto-optimise-store = true; + allowed-users = [ "@wheel" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; + + # services.flatpak.enable = true; + + boot.binfmt.registrations.appimage = { + wrapInterpreterInShell = false; + interpreter = "${pkgs.appimage-run}/bin/appimage-run"; + recognitionType = "magic"; + offset = 0; + mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; + magicOrExtension = ''\x7fELF....AI\x02''; + }; + + qt.style = "adwaita-dark"; + + sound.enable = true; + hardware.pulseaudio.enable = false; + services.pipewire = { + + enable = true; + jack.enable = true; + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + # lowLatency.enable = true; + }; + + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + + services.xserver = { + enable = true; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + }; + + # apparently prevents getting stuck at shutdown + systemd.extraConfig = "DefaultTimeoutStopSec=10s"; + + # disable these cuz they cause problems + # see: https://github.com/NixOS/nixpkgs/issues/180175 + systemd.services = { + networkManager-wait-online.enable = lib.mkForce false; + systemd-networkd-wait-online.enable = lib.mkForce false; + }; + + + # system.autoUpgrade = { + # enable = true; + # channel = ""; + # }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = "23.11"; +} diff --git a/core/packages.nix b/core/packages.nix new file mode 100644 index 0000000..6f6e186 --- /dev/null +++ b/core/packages.nix @@ -0,0 +1,107 @@ +{ pkgs, ... }: + +{ + + programs = { + # hyprland.enable = true; + traceroute.enable = true; + starship.enable = true; + fish.enable = true; + git.enable = true; + + firefox.enable = true; + + }; + + environment.systemPackages = with pkgs; [ + + ## nixos + appimage-run + # nix-tree + # nix-init + # nix-index + # nixpkgs-review + # nix-output-monitor + + ## filsesystem + udiskie + ntfs3g + xfsprogs + + ## compositor + waybar + swww + + ## terminal + kitty + micro + pipes + cbonsai + hyfetch + cmatrix + peaclock + + ## tools + file + fd + bc + gcc + zip + tldr + wget + curl + unzip + gnupg + blueman + busybox + ripgrep + killall + usbutils + pciutils + xdg_utils + moreutils + libsecret + git-crypt + + ## web browsers + # tor-browser-bundle-bin + # lagrange + # firefox + + ## misc, libraries, maybe more, + # qt5-wayland + # qt6-wayland + glib + + ]; + + fonts = { + + packages = with pkgs; [ + spleen + terminus_font + terminus_font_ttf + (nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) + ]; + + fontDir.enable = true; + + fontconfig = { + defaultFonts = { + + monospace = [ + "TerminusTTF" + ]; + serif = [ + "spleen-32x64" + ]; + sansSerif = [ + "spleen-32x64" + ]; + + }; + }; + + }; + +} diff --git a/core/users.nix b/core/users.nix new file mode 100644 index 0000000..6c5a028 --- /dev/null +++ b/core/users.nix @@ -0,0 +1,75 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: + +{ + + imports = [ + inputs.home-manager.nixosModules.default + ]; + + + users.users = { + + # To add new users, copy a block for + # an existing user, and adjust to needs. + + # coffee = { + # description = "Coffee Beans"; + # isNormalUser = true; + # initialPassword = "password"; + # shell = pkgs.fish; + # extraGroups = [ + # "wheel" + # "networkmanager" + # ]; + # }; + + serenity = { + description = "Serenity Amalgam"; + isNormalUser = true; + initialPassword = "password"; + shell = pkgs.fish; + extraGroups = [ + "wheel" + "networkmanager" + ]; + }; + + }; + + + + home-manager = { + extraSpecialArgs = { inherit inputs outputs; }; + useGlobalPkgs = true; + useUserPackages = true; + users = { + + # coffee = { + # imports = [ ../home/home.nix ]; + # home = { + # username = "coffee"; + # homeDirectory = "/home/coffee"; + # stateVersion = "23.11"; + # }; + # }; + + serenity = { + imports = [ ../home/home.nix ]; + home = { + username = "serenity"; + homeDirectory = "/home/serenity"; + stateVersion = "23.11"; + }; + }; + + }; + }; + +} diff --git a/flake.lock b/flake.lock index 91e4cbf..bd9fa75 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -7,11 +23,11 @@ ] }, "locked": { - "lastModified": 1711934712, - "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", + "lastModified": 1712356478, + "narHash": "sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA=", "owner": "nix-community", "repo": "disko", - "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", + "rev": "0a17298c0d96190ef3be729d594ba202b9c53beb", "type": "github" }, "original": { @@ -20,6 +36,37 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "hardware": { + "locked": { + "lastModified": 1712324865, + "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixos-hardware", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -27,16 +74,15 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -72,19 +118,17 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1712253037, - "narHash": "sha256-9Ej7MCILxOTzXcznI3mt7avKzbv9nKQXru2DLrSlK2E=", + "lastModified": 1712369360, + "narHash": "sha256-4GOmo5J10j8bAhG3T4IvLUCmx7tx83VRNDPHFx1uRBI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0569b9c30099be32f5e0d3b56a050059b9e5a8c1", + "rev": "24734fbf1d341a725d3ed1192b9bf5f55828208f", "type": "github" }, "original": { @@ -93,6 +137,31 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1712420644, + "narHash": "sha256-h2X8qhN5RKYQXzT1kxKgUz1u1QthqOrP9xk800mTM6E=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "5ec0140d4aeca42b8a33e7f335f979e376d1b549", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -166,44 +235,98 @@ "type": "github" } }, - "nixos-hardware": { + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", + "owner": "misterio77", + "repo": "nix-colors", "type": "github" } }, "nixpkgs": { + "locked": { + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1712163089, "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "nixos", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { "disko": "disko", + "hardware": "hardware", "home-manager": "home-manager", "hyprland": "hyprland", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "hyprland-plugins": "hyprland-plugins", + "nix-colors": "nix-colors", + "nixpkgs": "nixpkgs_2", + "waybar": "waybar" } }, "systems": { @@ -236,6 +359,25 @@ "type": "github" } }, + "waybar": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1712127529, + "narHash": "sha256-R3yPS5ktvzhUI+TeHTDkbKgiA8SDvozu33azFUeMVoo=", + "owner": "Alexays", + "repo": "Waybar", + "rev": "42dc9cb85f27e3db02da83cd13624cfc5a7191d3", + "type": "github" + }, + "original": { + "owner": "Alexays", + "repo": "Waybar", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 08e43de..cd01b94 100644 --- a/flake.nix +++ b/flake.nix @@ -1,77 +1,72 @@ { - description = "SerenityOS v0.2.5"; + description = "SerenityOS v0.3.6"; inputs = { - # Nixpkgs and hardware specific configs - # nixpkgs.url = "nixpkgs/nixos-23.11"; - nixpkgs.url = "nixpkgs/nixos-unstable"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - - # alejandra ?? think its a nix code formatter - # alejandra.url = "github:kamadorueda/alejandra/3.0.0"; + # Nixpkgs + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + hardware.url = "github:nixos/nixos-hardware"; - # declaratice disks + # declarative disks disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - + # declarative dots home-manager = { - url = "github:nix-community/home-manager/release-23.11"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # window manager (ricer friendly) - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; }; - + + # ricer friendly wayland compositor + hyprland.url = "github:hyprwm/Hyprland"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + # status/task bar + # Fix broken waybar on current nixpkgs-unstable + waybar.url = "github:Alexays/Waybar"; + nix-colors.url = "github:misterio77/nix-colors"; + }; - outputs = { - # self, - nixpkgs, - nixos-hardware, + outputs = { + self, + hardware, disko, + nixpkgs, home-manager, hyprland, + waybar, + nix-colors, ... - }: - - let - # common-modules = [ - # ({ config, pkgs, ... }:) - # ]; - home-manager-config = toplevel: [ - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.serenity = { - imports = [ - (import ./modules/core/home.nix) - ]; - }; - }; - } - ]; - in - - { - nixosConfigurations = { - proserpina = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - # specialArgs = { inherit hyprland; }; - modules = [ - # nixos-hardware.nixosModules.$MODEL - ./hosts/proserpina/configuration.nix - disko.nixosModules.disko - ] ++ home-manager-config; - }; + } @ inputs: let + inherit (self) outputs; + in { + # Available through 'nixos-rebuild --flake .#your-hostname' + nixosConfigurations = { + + proserpina = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + # > Our main nixos configuration files < + modules = [ + disko.nixosModules.disko + ./hosts/proserpina/configuration.nix + ]; }; - }; + hades = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + # > Our main nixos configuration files < + modules = [ + disko.nixosModules.disko + ./hosts/proserpina/configuration.nix + ]; + }; + + }; + + }; } diff --git a/home/fish.nix b/home/fish.nix new file mode 100644 index 0000000..d900b27 --- /dev/null +++ b/home/fish.nix @@ -0,0 +1,382 @@ +pkgs: { + enable = true; + loginShellInit = '' + set -x EDITOR lvim + set -x LIBVIRT_DEFAULT_URI "qemu:///system" + fish_add_path "~/.local/bin" + fish_add_path ~/.local/bin/scripts + fish_add_path /var/lib/flatpak/exports/bin + fish_add_path ~/.cargo/bin + fish_add_path ~/.local/share/npm-global/bin + ''; + + shellAbbrs = { + b = "bat"; + "1" = "prevd"; + "2" = "prevd 2"; + "3" = "prevd 3"; + "4" = "prevd 4"; + c = "cd"; + cg = "cargo"; + reload = "exec fish"; + nv = "lvim"; + sshfix = "kitty +kitten ssh"; + tree = "eza -TR --git-ignore"; + up = "topgrade"; + gay = "curl fetch.sashanoraa.gay"; + sc = "sudo systemctl"; + scs = "systemctl status"; + scst = "sudo systemctl start"; + scsp = "sudo systemctl stop"; + scr = "sudo systemctl restart"; + jr = "journalctl"; + jre = "journalctl -e -u"; + jrf = "journalctl -f -u"; + + nxp = "nix-shell --command fish -p"; + nxs = "nix search nixpkgs"; + # nxr = { + # expansion = "nix run nixpkgs#%"; + # setCursor = true; + # }; + # nxsh = { + # expansion = "nix shell nixpkgs#%"; + # setCursor = true; + # }; + + g = "git"; + ga = "git add"; + gaa = "git add --all"; + gau = "git add -u"; + gb = "git branch"; + gco = "git checkout"; + gc = "git commit"; + gca = "git commit --amend"; + gcl = "git clone"; + gd = "git diff"; + gf = "git fetch"; + gl = "git log"; + gm = "git merge"; + gp = "git push"; + gpl = "git pull"; + gpn = "git push -u origin (current_branch)"; + gr = "git remote"; + gra = "git remote add"; + grao = "git remote add origin"; + grb = "git rebase"; + grbi = "git rebase -i"; + gs = "git status -sb"; + gsu = "git submodule"; + gro = "git restore"; + gsw = "git switch"; + }; + + shellAliases = { + cl = "printf '\\033[2J\\033[3J\\033[1;1H'"; + git-master-to-main = "git branch -m master main && git push origin :master main:main"; + l = "eza"; + la = "eza -a"; + ll = "eza -l"; + lla = "eza -al"; + shn = "git remote add origin git@git.sr.ht:~zethra/$(basename $(pwd))"; + scratch = "lvim /tmp/scratch"; + tmp = "lvim /dev/null"; + ssh = "kitty +kitten ssh"; + }; + + interactiveShellInit = '' + fish_vi_key_bindings + set fish_cursor_default block + set fish_cursor_insert line + set fish_cursor_replace_one underscore + set fish_cursor_replace underscore + set fish_cursor_external line + set fish_cursor_visual block + + + set -x EXA_COLORS 'di=35;01:da=35' + + # Syntax Highlighting Colors + set -Ux fish_color_normal c0caf5 + set -Ux fish_color_command 7dcfff + set -Ux fish_color_keyword bb9af7 + set -Ux fish_color_quote e0af68 + set -Ux fish_color_redirection c0caf5 + set -Ux fish_color_end ff9e64 + set -Ux fish_color_error f7768e + set -Ux fish_color_param 9d7cd8 + set -Ux fish_color_comment 565f89 + set -Ux fish_color_selection --background=33467c + set -Ux fish_color_search_match --background=33467c + set -Ux fish_color_operator 9ece6a + set -Ux fish_color_escape bb9af7 + set -Ux fish_color_autosuggestion 565f89 + + # Completion Pager Colors + set -Ux fish_pager_color_progress 565f89 + set -Ux fish_pager_color_prefix 7dcfff + set -Ux fish_pager_color_completion c0caf5 + set -Ux fish_pager_color_description 565f89 + set -Ux fish_pager_color_selected_background --background=33467c + + source ~/.config/fish/functions/__fre_cd.fish + + abbr -a nxr --set-cursor "nix run nixpkgs#%" + abbr -a nxsh --set-cursor "nix shell nixpkgs#%" + + complete -x -c mkproj -d "Template name" -a "(ls ~/Projects/nixcfg/programs/cookiecutter)" + ''; + + functions = { + fre-clean = '' + for p in (fre --sorted) + if ! [ -d $p ] + echo $p + fre -D $p + end + end + ''; + fish_greeting = '' + if type -q kitty-img + printf '💖 hiya sashanoraa ' + kitty-img ~/.config/fish/pfp.png 2>/dev/null + echo ' 'welcome to (gethost) "~" 🏳️‍⚧️ + else + echo 💖 hiya sashanoraa welcome to (gethost) "~" 🏳️‍⚧️ + end + ''; + gbd = { + wraps = "git branch -d"; + body = "git branch -d $argv[1] && git push --delete origin $argv[1]"; + }; + gbD = { + wraps = "git branch -D"; + body = "git branch -D $argv[1] && git push --delete origin $argv[1]"; + }; + mkproj = { + body = '' + cookiecutter "$HOME/Projects/nixcfg/programs/cookiecutter/$argv[1]" + ''; + }; + + gethost = '' + if test -f /run/.containerenv + function gethost + grep -F name= /run/.containerenv | cut -d '"' -f2; + end + else if command -v hostnamectl &> /dev/null + function gethost --wraps=hostnamectl --description 'alias gethost hostnamectl' + hostnamectl --pretty; + end + else if command -v hostname &> /dev/null + function gethost --wraps=hostname --description 'alias gethost hostname -s' + hostname -s; + end + else + function gethost --wraps=hostname --description 'alias gethost hostname' + echo host_error; + end + end + ''; + + mkshell = '' + echo "{ pkgs ? import {} }: + + pkgs.mkShell { + packages = with pkgs; [ $argv ]; + }" > shell.nix + echo "use nix" > .envrc && direnv allow . + printf ".envrc\n.direnv" >> .gitignore + ''; + + copy = '' + if command -v wl-copy &> /dev/null + if test -f "$argv[1]" + wl-copy < "$argv[1]" + else + wl-copy $argv + end + else + xclip -sel clip "$argv" + end + ''; + + paste = '' + if command -v wl-paste &> /dev/null + wl-paste + else + xclip -sel clip -o "$argv" + end + ''; + + current_branch = '' + set ref (git symbolic-ref HEAD 2> /dev/null); or \ + set ref (git rev-parse --short HEAD 2> /dev/null); or return + echo $ref | sed s-refs/heads/-- + ''; + + __fre_cd = { + onVariable = "PWD"; + body = '' + status --is-command-substitution; and return + fre --add (pwd) + ''; + }; + + mommy = '' + set -g prev_status $status + + # SHELL_MOMMYS_LITTLE - what to call you~ (default: "girl") + # SHELL_MOMMYS_PRONOUNS - what pronouns mommy will use for themself~ (default: "her") + # SHELL_MOMMYS_ROLES - what role mommy will have~ (default "mommy") + + set -g COLORS_LIGHT_PINK '\e[38;5;217m' + set -g COLORS_LIGHT_BLUE '\e[38;5;117m' + set -g COLORS_FAINT '\e[2m' + set -g COLORS_RESET '\e[0m' + + set -g DEF_WORDS_LITTLE "girl" + set -g DEF_WORDS_PRONOUNS "her" + set -g DEF_WORDS_ROLES "mommy" + set -g DEF_MOMMY_COLOR "$COLORS_LIGHT_PINK" + set -g DEF_ONLY_NEGATIVE "false" + + set -g NEGATIVE_RESPONSES \ + "do you need MOMMYS_ROLE's help~? ❤️" \ + "Don't give up, my love~ ❤️" \ + "Don't worry, MOMMYS_ROLE is here to help you~ ❤️" \ + "I believe in you, my sweet AFFECTIONATE_TERM~ ❤️" \ + "It's okay to make mistakes, my dear~ ❤️" \ + "just a little further, sweetie~ ❤️" \ + "Let's try again together, okay~? ❤️" \ + "MOMMYS_ROLE believes in you, and knows you can overcome this~ ❤️" \ + "MOMMYS_ROLE believes in you~ ❤️" \ + "MOMMYS_ROLE is always here for you, no matter what~ ❤️" \ + "MOMMYS_ROLE is here to help you through it~ ❤️" \ + "MOMMYS_ROLE is proud of you for trying, no matter what the outcome~ ❤️" \ + "MOMMYS_ROLE knows it's tough, but you can do it~ ❤️" \ + "MOMMYS_ROLE knows MOMMYS_PRONOUN little AFFECTIONATE_TERM can do better~ ❤️" \ + "MOMMYS_ROLE knows you can do it, even if it's tough~ ❤️" \ + "MOMMYS_ROLE knows you're feeling down, but you'll get through it~ ❤️" \ + "MOMMYS_ROLE knows you're trying your best~ ❤️" \ + "MOMMYS_ROLE loves you, and is here to support you~ ❤️" \ + "MOMMYS_ROLE still loves you no matter what~ ❤️" \ + "You're doing your best, and that's all that matters to MOMMYS_ROLE~ ❤️" \ + "MOMMYS_ROLE is always here to encourage you~ ❤️" + + set -g POSITIVE_RESPONSES \ + "*pets your head*" \ + "awe, what a good AFFECTIONATE_TERM~\nMOMMYS_ROLE knew you could do it~ ❤️" \ + "good AFFECTIONATE_TERM~\nMOMMYS_ROLE's so proud of you~ ❤️" \ + "Keep up the good work, my love~ ❤️" \ + "MOMMYS_ROLE is proud of the progress you've made~ ❤️" \ + "MOMMYS_ROLE is so grateful to have you as MOMMYS_PRONOUN little AFFECTIONATE_TERM~ ❤️" \ + "I'm so proud of you, my love~ ❤️" \ + "MOMMYS_ROLE is so proud of you~ ❤️" \ + "MOMMYS_ROLE loves seeing MOMMYS_PRONOUN little AFFECTIONATE_TERM succeed~ ❤️" \ + "MOMMYS_ROLE thinks MOMMYS_PRONOUN little AFFECTIONATE_TERM earned a big hug~ ❤️" \ + "that's a good AFFECTIONATE_TERM~ ❤️" \ + "you did an amazing job, my dear~ ❤️" \ + "you're such a smart cookie~ ❤️" + + # allow for overriding of default words (IF ANY SET) + + if test -n "$SHELL_MOMMYS_LITTLE" + set DEF_WORDS_LITTLE "$SHELL_MOMMYS_LITTLE" + end + if test -n "$SHELL_MOMMYS_PRONOUNS" + set DEF_WORDS_PRONOUNS "$SHELL_MOMMYS_PRONOUNS" + end + if test -n "$SHELL_MOMMYS_ROLES" + set DEF_WORDS_ROLES "$SHELL_MOMMYS_ROLES" + end + if test -n "$SHELL_MOMMYS_COLOR" + set DEF_MOMMY_COLOR "$SHELL_MOMMYS_COLOR" + end + # allow overriding to true + if test "$SHELL_MOMMYS_ONLY_NEGATIVE" = "true" + set DEF_ONLY_NEGATIVE "true" + end + # if the array is set for positive/negative responses, overwrite it + if test -n "$SHELL_MOMMYS_POSITIVE_RESPONSES" + set POSITIVE_RESPONSES "$SHELL_MOMMYS_POSITIVE_RESPONSES" + end + if test -n "$SHELL_MOMMYS_NEGATIVE_RESPONSES" + set NEGATIVE_RESPONSES "$SHELL_MOMMYS_NEGATIVE_RESPONSES" + end + + # split a string on forward slashes and return a random element + function pick_word + random choice (string split -n / $argv) + end + + function pick_response # given a response type, pick an entry from the array + + if test $argv[1] = "positive" + set element (random choice $POSITIVE_RESPONSES) + else if test $argv[1] = "negative" + set element (random choice $NEGATIVE_RESPONSES) + else + echo "Invalid response type: $argv[1]" + exit 1 + end + + # Return the selected response + echo "$element" + + end + + function sub_terms # given a response, sub in the appropriate terms + set -l response $argv + # pick_word for each term + set -l affectionate_term (pick_word $DEF_WORDS_LITTLE) + set -l pronoun (pick_word $DEF_WORDS_PRONOUNS) + set -l role (pick_word $DEF_WORDS_ROLES) + # sub in the terms, store in variable + set -l response (echo "$response" | string replace "AFFECTIONATE_TERM" "$affectionate_term") + set -l response (echo "$response" | string replace "MOMMYS_PRONOUN" "$pronoun") + set -l response (echo "$response" | string replace "MOMMYS_ROLE" "$role") + # we have string literal newlines in the response, so we need to printf it out + # print faint and colorcode + echo -e "$DEF_MOMMY_COLOR$response$COLORS_RESET" + end + + function success + if test "$DEF_ONLY_NEGATIVE" = "true" + return 0 + end + # pick_response for the response type + set -l response (pick_response "positive") + sub_terms "$response" >&2 + return 0 + end + + function failure + set -l response (pick_response "negative") + sub_terms "$response" >&2 + return $prev_status + end + + if test $prev_status -eq 0 + success + else + failure + end + ''; + }; + + plugins = [ + # { + # name = "done"; + # src = pkgs.fishPlugins.done.src; + # } + # { + # name = "puffer"; + # src = pkgs.fishPlugins.puffer.src; + # } + # { + # name = "autopair"; + # src = pkgs.fishPlugins.autopair.src; + # } + ]; +} diff --git a/home/git.nix b/home/git.nix new file mode 100644 index 0000000..b367e79 --- /dev/null +++ b/home/git.nix @@ -0,0 +1,12 @@ +{ + programs.git = { + enable = true; + userName = "serenity-F"; + userEmail = "serenity-amalgam@protonmail.com"; # CHANGEME + extraConfig = { + init.defaultBranch = "main"; + # Automatically track remote branch + push.autoSetupRemote = true; + }; + }; +} diff --git a/home/home.nix b/home/home.nix new file mode 100644 index 0000000..93ff1f6 --- /dev/null +++ b/home/home.nix @@ -0,0 +1,38 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + imports = [ + ./hyprland + ./theme + ./kitty.nix + ./git.nix + # ./qutebrowser + ]; + + home = { + username = "serenity"; + homeDirectory = "/home/serenity"; + + packages = with pkgs; [ + vlc + vscode + discord + firefox + obsidian + xfce.thunar + ]; + + stateVersion = "23.11"; + }; + + programs.home-manager.enable = true; + + systemd.user.startServices = "sd-switch"; + +} diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix new file mode 100644 index 0000000..a01e81f --- /dev/null +++ b/home/hyprland/default.nix @@ -0,0 +1,43 @@ +{ + self, + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + imports = [ + ./hyprland.nix + ./hyprpaper.nix + ./hyprcursor.nix + ./wlogout.nix + ./hypridle.nix + ./hyprlock.nix + ./waybar.nix + ./dunst.nix + ./wofi.nix + ]; + + home.packages = with pkgs; [ + hyprshot + hyprpicker + # xdg-desktop-portal-hyprland + wlr-randr + wl-clipboard + brightnessctl + gnome.gnome-themes-extra + wlsunset + xwayland + xdg-desktop-portal-gtk + wlroots + qt5ct + libva + dconf + wayland-utils + wayland-protocols + meson + ]; + +} diff --git a/home/hyprland/dunst.nix b/home/hyprland/dunst.nix new file mode 100644 index 0000000..0f9d315 --- /dev/null +++ b/home/hyprland/dunst.nix @@ -0,0 +1,83 @@ +{ config, lib, pkgs, ... }: { + + home.packages = with pkgs; [ libnotify ]; + + services.dunst = { + enable = true; + iconTheme = { + name = "Adwaita-Dark"; + package = pkgs.gnome.adwaita-icon-theme; + }; + settings = { + global = { + rounded = "yes"; + origin = "top-center"; + monitor = "0"; + alignment = "center"; + vertical_alignment = "center"; + width = "400"; + height = "400"; + scale = 0; + gap_size = 0; + progress_bar = true; + transparency = 0; + text_icon_padding = 0; + separator_color = "frame"; + sort = "yes"; + idle_threshold = 120; + line_height = 0; + markup = "full"; + show_age_threshold = 60; + ellipsize = "middle"; + ignore_newline = "no"; + stack_duplicates = true; + sticky_history = "yes"; + history_length = 20; + always_run_script = true; + corner_radius = config.theme.rounding; + follow = "mouse"; + font = config.theme.font; + format = "%s\\n%b"; + progress_bar_corner_radius = config.theme.rounding - 10; + #format = '' + # %s %p + # %b''; + frame_color = "#" + config.theme.colors.bg; + highlight = "#" + config.theme.colors.primary-bg; + foreground = "#" + config.theme.colors.fg; + frame_width = 1; + offset = "0x10"; + horizontal_padding = 10; + icon_position = "left"; + indicate_hidden = "yes"; + min_icon_size = 0; + max_icon_size = 64; + mouse_left_click = "do_action, close_current"; + mouse_middle_click = "close_current"; + mouse_right_click = "close_all"; + padding = 10; + plain_text = "no"; + separator_height = 2; + show_indicators = "yes"; + shrink = "no"; + word_wrap = "yes"; + browser = "${pkgs.qutebrowser}/bin/qutebrowser"; + }; + + fullscreen_delay_everything = { fullscreen = "delay"; }; + + urgency_critical = { + background = "#" + config.theme.colors.color1; + foreground = "#" + config.theme.colors.color0; + }; + urgency_low = { + background = "#" + config.theme.colors.alt-bg; + foreground = "#" + config.theme.colors.alt-fg; + }; + urgency_normal = { + background = "#" + config.theme.colors.alt-bg; + foreground = "#" + config.theme.colors.alt-fg; + }; + }; + }; +} diff --git a/home/hyprland/hyprcursor.nix b/home/hyprland/hyprcursor.nix new file mode 100644 index 0000000..518c519 --- /dev/null +++ b/home/hyprland/hyprcursor.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: { + home.packages = with pkgs; [ hyprcursor ]; + + # home.file.".local/share/icons/rose-pine-hyprcursor" = { + # recursive = true; + # source = ./rose-pine; + # }; + +} diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix new file mode 100644 index 0000000..c970830 --- /dev/null +++ b/home/hyprland/hypridle.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: { + home.packages = with pkgs; [ hypridle ]; + + xdg.configFile."hypr/hypridle.conf".text = '' + general { + ignore_dbus_inhibit = false + } + + # Screenlock + listener { + timeout = 600 + on-timeout = ${pkgs.hyprlock}/bin/hyprlock + on-resume = ${pkgs.libnotify}/bin/notify-send "Welcome back ${config.home.username}!" + } + + # Suspend + listener { + timeout = 660 + on-timeout = systemctl suspend + # on-resume = ${pkgs.libnotify}/bin/notify-send "Welcome back to your desktop!" + } + ''; +} diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix new file mode 100644 index 0000000..e2b8a09 --- /dev/null +++ b/home/hyprland/hyprland.nix @@ -0,0 +1,223 @@ +{ + self, + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + + wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + + plugins = [ + # inputs.hyprland-plugins.packages."${pkgs.system}".borders-plus-plus + # inputs.hyprland-plugins.packages."${pkgs.system}".hyprbars + ]; + + + settings = { + "$mod" = "SUPER"; + "$shiftMod" = "SUPER_SHIFT"; + + exec-once = [ + "startup" + "${pkgs.hypridle}/bin/hypridle" + "${pkgs.hyprpaper}/bin/hyprpaper" + "${pkgs.kitty}/bin/kitty" + "${pkgs.wofi}/bin/wofi" + + ]; + + + + bind = [ + "$mod, RETURN, exec, ${pkgs.wofi}/bin/wofi" + "$shiftMod, RETURN, exec, ${pkgs.kitty}/bin/kitty" + "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" + "$mod, B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" + "$mod, C, exec, ${pkgs.kitty}/bin/kitty --class peaclock peaclock" + "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" + "$mod, X, exec, powermenu" + "$mod, SPACE, exec, menu" + # Windows control + "$mod, Q, killactive," + "$mod, T, togglefloating," + "$mod, F, fullscreen" + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + # Screenshots + "$mod, PRINT, exec, screenshot window" + ", PRINT, exec, screenshot monitor" + "$shiftMod, PRINT, exec, screenshot region" + "ALT, PRINT, exec, screenshot region swappy" + # Night Shift + "$mod, F2, exec, night-shift-off" + "$mod, F3, exec, night-shift-on" + # Sound output + "$mod, F5, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" + "$mod, F6, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" + "$mod, F7, exec, ${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output" + ] ++ (builtins.concatLists (builtins.genList (i: + let ws = i + 1; + in [ + "$mod, code:1${toString i}, workspace, ${toString ws}" + "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" + ]) 9)); + + bindm = [ "$mod, mouse:272, movewindow" "$mod, R, resizewindow" ]; + + bindl = [ + ",XF86AudioMute, exec, sound-toggle" + ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" + ]; + + bindle = [ + ", XF86AudioRaiseVolume, exec, sound-up" + ", XF86AudioLowerVolume, exec, sound-down" + ", XF86MonBrightnessUp, exec, brightness-up" + ", XF86MonBrightnessDown, exec, brightness-down" + ]; + + env = [ + "XDG_SESSION_TYPE,wayland" + "XDG_CURRENT_DESKTOP,Hyprland" + "XDG_SESSION_TYPE,wayland" + "XDG_SESSION_DESKTOP,Hyprland" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "QT_QPA_PLATFORM=wayland,xcb" + "QT_QPA_PLATFORMTHEME=qt6ct" + "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + "GTK_THEME,Flat-Remix-GTK-White-Darkest-Solid:dark" + # "HYPRCURSOR_THEME,rose-pine" + # "HYPRCURSOR_SIZE,16" + ]; + + general = { + resize_on_border = true; + gaps_in = config.theme.gaps-in; + gaps_out = config.theme.gaps-out; + border_size = config.theme.border-size; + "col.active_border" = "rgba(${config.theme.colors.primary-bg}ff)"; + "col.inactive_border" = "rgba(00000055)"; + border_part_of_window = true; + layout = "master"; + }; + + decoration = { + rounding = config.theme.rounding; + drop_shadow = true; + shadow_range = 25; + shadow_render_power = 3; + "col.shadow" = "rgba(00000055)"; + blur = { enabled = true; }; + }; + + master = { + new_is_master = true; + new_on_top = true; + }; + + gestures = { workspace_swipe = true; }; + + misc = { + disable_hyprland_logo = false; + disable_splash_rendering = true; + focus_on_activate = true; + new_window_takes_over_fullscreen = 2; + }; + + input = { + kb_layout = "us"; + + kb_options = "caps:escape"; + follow_mouse = 1; + sensitivity = 0.1; + repeat_delay = 350; + repeat_rate = 40; + numlock_by_default = true; + + touchpad = { + # sensitivity = 0; + natural_scroll = true; + clickfinger_behavior = true; + }; + }; + + windowrulev2 = [ + "float, class:peaclock" + "move 2% 78%, class:peaclock" + "size 30% 20%, class:peaclock" + + "float, class:floating" + "size 40% 40%, class:floating" + "move 30% 30%, class:floating" + + "float, title:Bluetooth Devices" + "move 20% 20%, title:Bluetooth Devices" + "size 60% 60%, title:Bluetooth Devices" + ]; + + animations = { + enabled = true; + bezier = [ + "linear, 0, 0, 1, 1" + "md3_standard, 0.2, 0, 0, 1" + "md3_decel, 0.05, 0.7, 0.1, 1" + "md3_accel, 0.3, 0, 0.8, 0.15" + "overshot, 0.05, 0.9, 0.1, 1.1" + "crazyshot, 0.1, 1.5, 0.76, 0.92 " + "hyprnostretch, 0.05, 0.9, 0.1, 1.0" + "fluent_decel, 0.1, 1, 0, 1" + "easeInOutCirc, 0.85, 0, 0.15, 1" + "easeOutCirc, 0, 0.55, 0.45, 1" + "easeOutExpo, 0.16, 1, 0.3, 1" + ]; + + animation = [ + "windows, 1, 3, md3_decel, popin 60%" + "border, 1, 10, default" + "fade, 1, 2.5, md3_decel" + "workspaces, 1, 3.5, easeOutExpo, slide" + "specialWorkspace, 1, 3, md3_decel, slidevert" + ]; + }; + + }; + }; + + qt = { + enable = true; + platformTheme = "gtk"; + style.name = "gtk2"; + }; + + gtk = { + enable = true; + theme = { + package = pkgs.flat-remix-gtk; + name = "Flat-Remix-GTK-White-Darkest-Solid"; + }; + + iconTheme = { + package = pkgs.flat-remix-icon-theme; + name = "Flat-Remix-Grey-Darkest"; + }; + + font = { + name = config.theme.font; + size = 10; + }; + }; + + home.pointerCursor = { + gtk.enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 12; + }; +} diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix new file mode 100644 index 0000000..908a884 --- /dev/null +++ b/home/hyprland/hyprlock.nix @@ -0,0 +1,75 @@ +{ pkgs, config, ... }: { + + home.packages = with pkgs; [ hyprlock ]; + + xdg.configFile."hypr/hyprlock.conf".text = '' + background { + monitor = + path = $HOME/.config/wallpapers/${config.theme.wallpaper} + color = rgb(${config.theme.colors.bg}) + + blur_size = 4 + blur_passes = 3 + noise = 0.0117 + contrast = 1.3000 + brightness = 0.8000 + vibrancy = 0.2100 + vibrancy_darkness = 0.0 + } + + input-field { + monitor = + size = 250, 50 + outline_thickness = 3 + dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.64 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = rgb(${config.theme.colors.primary-bg}) + inner_color = rgb(${config.theme.colors.bg}) + font_color = rgb(${config.theme.colors.fg}) + fade_on_empty = true + placeholder_text = Password... # Text rendered in the input box when it's empty. + hide_input = false + position = 0, 50 + halign = center + valign = bottom + } + + # Current time + label { + monitor = + text = cmd[update:1000] echo " $(date +"%H:%M:%S") " + color = rgb(${config.theme.colors.fg}) + font_size = 64 + font_family = ${config.theme.font} + position = 0, 16 + halign = center + valign = center + } + + # User label + label { + monitor = + text = Hey $USER + color = rgb(${config.theme.colors.fg}) + font_size = 20 + font_family = ${config.theme.font} + position = 0, 0 + halign = center + valign = center + } + + + # Type to unlock + label { + monitor = + text = Enter passowrd: + color = rgb(${config.theme.colors.fg}) + font_size = 16 + font_family = ${config.theme.font} + position = 0, 30 + halign = center + valign = bottom + } + ''; +} diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix new file mode 100644 index 0000000..d25c538 --- /dev/null +++ b/home/hyprland/hyprpaper.nix @@ -0,0 +1,10 @@ +{ pkgs, config, ... }: { + home.packages = with pkgs; [ hyprpaper ]; + + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = ~/.config/wallpapers/${config.theme.wallpaper} + wallpaper = ,~/.config/wallpapers/${config.theme.wallpaper} + ipc=true + splash=false + ''; +} diff --git a/home/hyprland/waybar.nix b/home/hyprland/waybar.nix new file mode 100644 index 0000000..51c3f07 --- /dev/null +++ b/home/hyprland/waybar.nix @@ -0,0 +1,259 @@ +{ pkgs, config, lib, waybar, ... }: { + services = { + blueman-applet.enable = true; + network-manager-applet.enable = true; + }; + + programs.waybar = { + enable = true; + # package = waybar.packages."${pkgs.system}".waybar; + systemd.enable = true; + settings = { + mainBar = { + layer = "top"; + position = "top"; + spacing = 0; + "margin-top" = config.theme.gaps-out; + "margin-left" = config.theme.gaps-out; + "margin-right" = config.theme.gaps-out; + height = 44; + modules-left = [ "custom/logo" "hyprland/window" ]; + modules-center = [ "hyprland/workspaces" ]; + modules-right = + [ "tray" "backlight" "pulseaudio" "battery" "clock" "custom/power" ]; + + "wlr/taskbar" = { + format = "{icon}"; + "on-click" = "activate"; + "on-click-right" = "fullscreen"; + + "icon-size" = 25; + "tooltip-format" = "{title}"; + }; + "hyprland/window" = { + "format" = "{title:30}"; + "max-length" = 32; + }; + + "hyprland/workspaces" = { + "on-click" = "activate"; + format = "{icon}"; + "format-icons" = { + "default" = ""; + "1" = "1"; + "2" = "2"; + "3" = "3"; + "4" = "4"; + "5" = "5"; + "6" = "6"; + "7" = "7"; + "8" = "8"; + "9" = "9"; + "active" = "󱓻"; + "urgent" = "󱓻"; + }; + "persistent-workspaces" = { + "1" = [ ]; + "2" = [ ]; + "3" = [ ]; + "4" = [ ]; + "5" = [ ]; + }; + }; + + tray = { spacing = 16; }; + + clock = { + "tooltip-format" = "{calendar}"; + "format-alt" = " {:%a, %d %b %Y}"; + format = "󰥔 {:%I:%M %p}"; + }; + + pulseaudio = { + format = "{icon}"; + "format-bluetooth" = "󰂰"; + nospacing = 1; + "tooltip-format" = "Volume : {volume}%"; + "format-muted" = "󰝟"; + "format-icons" = { + "headphone" = ""; + "default" = [ "󰖀" "󰕾" "" ]; + }; + "on-click" = "pamixer -t"; + "scroll-step" = 1; + }; + + "custom/logo" = { + format = "  "; + tooltip = false; + on-click = "menu"; + }; + + battery = { + format = "{capacity}% {icon}"; + "format-icons" = { + "charging" = [ "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅" ]; + "default" = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; + }; + "format-full" = "󰁹 "; + interval = 10; + states = { + warning = 20; + critical = 10; + }; + tooltip = false; + }; + + "custom/power" = { + format = "󰤆"; + tooltip = false; + on-click = "powermenu"; + }; + + backlight = { + device = "nvidia_0"; + format = "{icon}"; + "format-icons" = [ " " " " "" "" "" "" "" "" "" ]; + }; + }; + }; + style = '' + * { + border: none; + border-radius: 0; + min-height: 0; + font-family: "${config.theme.font}"; + color: #${config.theme.colors.fg}; + font-weight: 700; + } + + window#waybar { + background-color: ${ + if config.theme.waybar-transparent then + "rgba(0, 0, 0, 0)" + else + "#${config.theme.colors.bg}" + }; + transition-property: background-color; + transition-duration: 0.5s; + border-radius: ${toString config.theme.rounding}px; + font-size: 13px; + } + + .modules-left, .modules-center, .modules-right { + border-radius: ${toString config.theme.rounding}px; + background-color: #${config.theme.colors.bg}; + padding: 2px 6px; + } + + window#waybar.hidden { + opacity: 0.5; + } + + #workspaces { + background-color: transparent; + } + + #workspaces button { + all: initial; /* Remove GTK theme values (waybar #1351) */ + min-width: 0; /* Fix weird spacing in materia (waybar #450) */ + box-shadow: inset 0 -3px transparent; /* Use box-shadow instead of border so the text isn't offset */ + padding: 6px 18px; + margin: 6px 3px; + border-radius: 4px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + #workspaces button.active { + color: #${config.theme.colors.primary-fg}; + background-color: #${config.theme.colors.primary-bg}; + } + + #workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; + opacity: 0.8; + } + + #workspaces button.urgent { + background-color: #${config.theme.colors.color1}; + } + + #window > * { + font-family: "${config.theme.font-mono}"; + } + + #memory, + #custom-power, + #battery, + #backlight, + #pulseaudio, + #network, + #clock, + #tray, + #backlight{ + border-radius: 9px; + margin: 6px 3px; + padding: 6px 12px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + #tray menu { + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + #custom-logo { + padding-right: 7px; + font-size: 15px; + color: #${config.theme.colors.primary-bg}; + } + + @keyframes blink { + to { + background-color: #f38ba8; + color: #181825; + } + } + + #battery.warning, + #battery.critical, + #battery.urgent { + background-color: #ff0048; + color: #181825; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; + } + + #battery.charging { + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + animation: none; + } + + #custom-power { + background-color: #${config.theme.colors.primary-bg}; + color: #${config.theme.colors.primary-fg}; + } + + + tooltip { + border-radius: 8px; + padding: 15px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + + tooltip label { + padding: 5px; + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + } + ''; + }; +} diff --git a/home/hyprland/wlogout.nix b/home/hyprland/wlogout.nix new file mode 100644 index 0000000..e0eac1a --- /dev/null +++ b/home/hyprland/wlogout.nix @@ -0,0 +1,117 @@ +{ config, pkgs, ... }: { + + programs.wlogout = { + enable = true; + layout = [ + { + label = "lock"; + action = "${pkgs.hyprlock}/bin/hyprlock"; + text = "Lock"; + keybind = "l"; + } + { + label = "hibernate"; + action = "systemctl hibernate"; + text = "Hibernate"; + keybind = "h"; + } + { + label = "logout"; + action = "killall -9 Hyprland sleep 2"; + text = "Exit"; + keybind = "e"; + } + { + label = "shutdown"; + action = "systemctl poweroff"; + text = "Shutdown"; + keybind = "s"; + } + { + label = "suspend"; + action = "systemctl suspend"; + text = "Suspend"; + keybind = "u"; + } + { + label = "reboot"; + action = "systemctl reboot"; + text = "Reboot"; + keybind = "r"; + } + ]; + + style = '' + * { + font-family: "${config.theme.font}"; + background-image: none; + transition: 20ms; + } + + window { + background-color: rgba(12,12,12,0.5); + } + + button { + color: #${config.theme.colors.fg}; + font-size:20px; + + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + + border-style: solid; + background-color: #${config.theme.colors.bg}; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + } + + button:focus, + button:active { + color: #${config.theme.colors.primary-fg}; + background-color: #${config.theme.colors.primary-bg}; + border: 3px solid #${config.theme.colors.primary-bg}; + } + + /* + ----------------------------------------------------- + Buttons + ----------------------------------------------------- + */ + + #lock,#logout,#suspend,#hibernate,#shutdown,#reboot { + margin: 10px; + border-radius: ${toString config.theme.rounding}px; + } + + #lock { + background-image: image(url("../theme/resources/icons/lock.png")); + } + + #logout { + background-image: image(url("../theme/resources/icons/logout.png")); + } + + #suspend { + background-image: image(url("../theme/resources/icons/suspend.png")); + } + + #hibernate { + background-image: image(url("../theme/resources/icons/hibernate.png")); + } + + #shutdown { + background-image: image(url("../theme/resources/icons/shutdown.png")); + } + + #reboot { + background-image: image(url("../theme/resources/icons/reboot.png")); + } + ''; + }; + + xdg.configFile."resources/icons" = { + recursive = true; + source = ../theme/resources/icons; + }; + +} diff --git a/home/hyprland/wofi.nix b/home/hyprland/wofi.nix new file mode 100644 index 0000000..b07dc03 --- /dev/null +++ b/home/hyprland/wofi.nix @@ -0,0 +1,96 @@ +{ config, ... }: { + + programs.wofi = { + enable = true; + + settings = { + allow_markup = true; + width = 500; + show = "drun"; + prompt = "Apps"; + normal_window = true; + layer = "top"; + term = "foot"; + height = "305px"; + orientation = "horizontal"; + halign = "fill"; + line_wrap = "off"; + dynamic_lines = false; + allow_images = true; + image_size = 24; + exec_search = false; + hide_search = false; + parse_search = false; + insensitive = true; + hide_scroll = true; + no_actions = true; + sort_order = "default"; + gtk_dark = true; + filter_rate = 100; + key_expand = "Tab"; + key_exit = "Escape"; + }; + + style = '' + /** ********** Fonts ********** **/ + + * { + font-family: "${config.theme.font}"; + font-weight: 500; + font-size: 12px; + } + + #window { + background-color: #${config.theme.colors.alt-bg}; + color: #${config.theme.colors.alt-fg}; + border-radius: ${toString config.theme.rounding}px; + } + + #outer-box { + padding: 20px; + } + + #input { + background-color: #${config.theme.colors.bg}; + border: 0px solid #${config.theme.colors.primary-bg}; + padding: 8px 12px; + } + + #scroll { + margin-top: 20px; + } + + #inner-box {} + + #img { + padding-right: 8px; + } + + #text { + color: #${config.theme.colors.color7}; + } + + #text:selected { + color: #${config.theme.colors.fg}; + } + + #entry { + padding: 6px; + } + + #entry:selected { + background-color: #${config.theme.colors.primary-bg}; + color: #${config.theme.colors.primary-fg}; + } + + #unselected {} + + #selected {} + + #input, + #entry:selected { + border-radius: ${toString (config.theme.rounding - 10)}px; + } + ''; + }; +} diff --git a/home/kitty.nix b/home/kitty.nix new file mode 100644 index 0000000..0e9715b --- /dev/null +++ b/home/kitty.nix @@ -0,0 +1,56 @@ +{ config, pkgs, ... }: { + + programs.kitty = { + enable = true; + + font = { + name = "spleen 32x64"; + size = 12; + }; + + settings = { + + scrollback_lines = 10000; + enable_audio_bell = false; + update_check_interval = 0; + # font_family = "spleen"; + # font_size = 12; + cursor_shape = "Underline"; + cursor_underline_thickness = 1; + window_padding_width = 5; + url_style = "curly"; + confirm_os_window_close = "0"; + remember_window_size = "no"; + disable_ligatures = "never"; + shell = "${pkgs.fish}/bin/fish"; + initial_window_width = 1200; + initial_window_height = 600; + + background = "#" + config.theme.colors.bg; + url_color = "#" + config.theme.colors.primary-fg; + + color0 = "#" + config.theme.colors.color0; + color8 = "#" + config.theme.colors.color8; + color1 = "#" + config.theme.colors.color1; + color9 = "#" + config.theme.colors.color9; + color2 = "#" + config.theme.colors.color2; + color10 = "#" + config.theme.colors.color10; + color3 = "#" + config.theme.colors.color3; + color11 = "#" + config.theme.colors.color11; + color4 = "#" + config.theme.colors.color4; + color12 = "#" + config.theme.colors.color12; + color5 = "#" + config.theme.colors.color5; + color13 = "#" + config.theme.colors.color13; + color6 = "#" + config.theme.colors.color6; + color14 = "#" + config.theme.colors.color14; + color7 = "#" + config.theme.colors.color7; + color15 = "#" + config.theme.colors.color15; + + cursor = "#" + config.theme.colors.fg; + cursor_text_color = "#" + config.theme.colors.bg; + + selection_foreground = "#" + config.theme.colors.primary-fg; + selection_background = "#" + config.theme.colors.primary-bg; + }; + }; +} diff --git a/home/theme/SerenityOS.nix b/home/theme/SerenityOS.nix new file mode 100644 index 0000000..4c9ab0b --- /dev/null +++ b/home/theme/SerenityOS.nix @@ -0,0 +1,43 @@ +{ + imports = [ ./config/template.nix ]; + + theme = { + wallpaper = "./resources/wallpapers/wallpaper.png"; + waybar-transparent = true; + font-mono = "spleen 32x64"; + font = "spleen 32x64"; + rounding = 10; + gaps-in = 10; + gaps-out = 10; + border-size = 1; + + colors = { + bg = "000000"; + fg = "FCFCFC"; + alt-bg = "101012"; + alt-fg = "ECECEC"; + primary-ansi-16 = "cyan"; + primary-bg = "00cdff"; + primary-fg = "000000"; + secondary-bg = "2849B8"; + secondary-fg = "000000"; + color0 = "000000"; + color1 = "f7768e"; + color2 = "73daca"; + color3 = "e0af68"; + color4 = "7aa2f7"; + color5 = "9978F8"; + color6 = "7dcfff"; + color7 = "E4E5E7"; + color8 = "515878"; + color9 = "f7869e"; + color10 = "83eada"; + color11 = "f0bf78"; + color12 = "8ab2f7"; + color13 = "A988F8"; + color14 = "8ddfff"; + color15 = "f4f5f7"; + }; + }; + +} diff --git a/home/theme/config/template.nix b/home/theme/config/template.nix new file mode 100644 index 0000000..64a40c3 --- /dev/null +++ b/home/theme/config/template.nix @@ -0,0 +1,95 @@ +{ lib, ... }: + +with lib; + +{ + options.theme = { + + waybar-transparent = mkOption { + type = types.bool; + description = "Does waybar have a transparent background?"; + }; + + wallpaper = mkOption { + type = types.str; + description = "Name of the wallpaper (from the wallpapers directory)"; + }; + + font = mkOption { + type = types.str; + description = "Default font"; + }; + + font-mono = mkOption { + type = types.str; + description = "Default mono font"; + }; + + rounding = mkOption { + type = types.int; + description = "Borders rounding"; + }; + + gaps-in = mkOption { + type = types.int; + description = "Gaps in"; + }; + + gaps-out = mkOption { + type = types.int; + description = "Gaps out"; + }; + + border-size = mkOption { + type = types.int; + description = "Border size"; + }; + + colors = let + mkColorOption = name: { + inherit name; + value = mkOption { + type = types.strMatching "[a-fA-F0-9]{6}"; + description = "Color ${name}."; + }; + }; + in listToAttrs (map mkColorOption [ + "bg" + "fg" + "alt-bg" + "alt-fg" + "primary-bg" + "primary-fg" + "secondary-bg" + "secondary-fg" + "color0" + "color1" + "color2" + "color3" + "color4" + "color5" + "color6" + "color7" + "color8" + "color9" + "color10" + "color11" + "color12" + "color13" + "color14" + "color15" + ]) // { + primary-ansi-16 = mkOption { + type = types.str; + description = + "Name of the primary color - ansi 16 colors (black, red, green, yellow, blue, magenta, cyan, white, bright-black, bright-red, bright-green, bright-yellow, bright-blue, bright-magenta, bright-cyan, bright-white)"; + }; + + primary-ansi-16-number = mkOption { + type = types.int; + description = "Set the primary color - ansi 16 colors (0-15)"; + }; + + }; + }; +} diff --git a/home/theme/default.nix b/home/theme/default.nix new file mode 100644 index 0000000..e7d0821 --- /dev/null +++ b/home/theme/default.nix @@ -0,0 +1,42 @@ +{ config, ... }: { + imports = [ + ./SerenityOS.nix + # ./resources + ]; + config.theme.colors.primary-ansi-16-number = + if config.theme.colors.primary-ansi-16 == "black" then + 0 + else if config.theme.colors.primary-ansi-16 == "red" then + 1 + else if config.theme.colors.primary-ansi-16 == "green" then + 2 + else if config.theme.colors.primary-ansi-16 == "yellow" then + 3 + else if config.theme.colors.primary-ansi-16 == "blue" then + 4 + else if config.theme.colors.primary-ansi-16 == "magenta" then + 5 + else if config.theme.colors.primary-ansi-16 == "cyan" then + 6 + else if config.theme.colors.primary-ansi-16 == "white" then + 7 + else if config.theme.colors.primary-ansi-16 == "bright-white" then + 8 + else if config.theme.colors.primary-ansi-16 == "bright-black" then + 9 + else if config.theme.colors.primary-ansi-16 == "bright-red" then + 10 + else if config.theme.colors.primary-ansi-16 == "bright-green" then + 11 + else if config.theme.colors.primary-ansi-16 == "bright-yellow" then + 12 + else if config.theme.colors.primary-ansi-16 == "bright-blue" then + 13 + else if config.theme.colors.primary-ansi-16 == "bright-magenta" then + 14 + else if config.theme.colors.primary-ansi-16 == "bright-cyan" then + 15 + else + 0; + +} diff --git a/home/theme/resources/icons/hibernate.png b/home/theme/resources/icons/hibernate.png new file mode 100644 index 0000000..bf2b001 Binary files /dev/null and b/home/theme/resources/icons/hibernate.png differ diff --git a/home/theme/resources/icons/lock.png b/home/theme/resources/icons/lock.png new file mode 100644 index 0000000..da59b10 Binary files /dev/null and b/home/theme/resources/icons/lock.png differ diff --git a/home/theme/resources/icons/logout.png b/home/theme/resources/icons/logout.png new file mode 100644 index 0000000..8a25922 Binary files /dev/null and b/home/theme/resources/icons/logout.png differ diff --git a/home/theme/resources/icons/reboot.png b/home/theme/resources/icons/reboot.png new file mode 100644 index 0000000..e5fd221 Binary files /dev/null and b/home/theme/resources/icons/reboot.png differ diff --git a/home/theme/resources/icons/shutdown.png b/home/theme/resources/icons/shutdown.png new file mode 100644 index 0000000..663ca03 Binary files /dev/null and b/home/theme/resources/icons/shutdown.png differ diff --git a/home/theme/resources/icons/suspend.png b/home/theme/resources/icons/suspend.png new file mode 100644 index 0000000..af099b9 Binary files /dev/null and b/home/theme/resources/icons/suspend.png differ diff --git a/home/theme/resources/wallpapers/wallpaper.png b/home/theme/resources/wallpapers/wallpaper.png new file mode 100644 index 0000000..879b65a Binary files /dev/null and b/home/theme/resources/wallpapers/wallpaper.png differ diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index c652a14..61809a4 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, config, lib, pkgs, ... }: +{ inputs, outputs, lib, config, pkgs, ... }: { imports = [ @@ -6,9 +6,9 @@ ./hardware-configuration.nix # "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" ./disko-config.nix - ./network-configuration.nix + # ./network-configuration.nix - ./../../modules/core + ../../core/configuration.nix ]; @@ -38,6 +38,14 @@ }; }; + networking = { + hostName = "proserpina"; + wireless.enable = false; + networkmanager = { + enable = true; + }; + }; + services.fstrim.enable = true; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; @@ -72,4 +80,6 @@ }; }; + + system.stateVersion = "23.11"; } diff --git a/hosts/proserpina/hardware-configuration.nix b/hosts/proserpina/hardware-configuration.nix index 1e02223..29fd4bc 100644 --- a/hosts/proserpina/hardware-configuration.nix +++ b/hosts/proserpina/hardware-configuration.nix @@ -7,8 +7,6 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") - # ./disko-config.sh - ./disko-config.nix ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; diff --git a/modules/core/audio.nix b/modules/core/audio.nix deleted file mode 100644 index ba6ed67..0000000 --- a/modules/core/audio.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -{ - - sound.enable = true; - hardware.pulseaudio.enable = false; - services.pipewire = { - - enable = true; - jack.enable = true; - pulse.enable = true; - alsa.enable = true; - alsa.support32Bit = true; - lowLatency.enable = true; - }; - -} diff --git a/modules/core/default.nix b/modules/core/default.nix deleted file mode 100755 index b79a2dc..0000000 --- a/modules/core/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - - imports = [ - ./services.nix - ./display.nix - # ./home.nix - ./packages - ]; - - - # Timezone & locale - time.timeZone = "Australia/Brisbane"; - i18n.defaultLocale = "en_GB.UTF-8"; - - # security, apparently - security = { - rtkit.enable = true; - sudo.execWheelOnly = true; - pam.services.swaylock = { }; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? - -} diff --git a/modules/core/display.nix b/modules/core/display.nix deleted file mode 100644 index 6683344..0000000 --- a/modules/core/display.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ inputs, pkgs, username, ... }: - -{ - - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - xdg.portal = { - enable = true; - wlr.enable = true; - xdgOpenUsePortal = true; - extraPortals = [ - pkgs.xdg-desktop-portal-hyprland - pkgs.xdg-desktop-portal-gtk - ]; - }; - - services.xserver = { - enable = true; - layout = "us"; # what is the difference # - xkbVariant = ""; # between - xkb.layout = "us"; # these 2 lolwut # - displayManager.autoLogin = { - enable = true; - user = "serenity"; - }; - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - }; - }; - }; - - # apparently prevents getting stuck at shutdown - systemd.extraConfig = "DefaultTimeoutStopSec=10s"; - - # set up hardware video acceleration - # https://nixos.wiki/wiki/Accelerated_Video_Playback - - system.stateVersion = "23.11"; - -} diff --git a/modules/core/home.nix b/modules/core/home.nix deleted file mode 100755 index 24b3143..0000000 --- a/modules/core/home.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ pkgs, inputs, outputs, config, osConfig, ... }: - -{ - - imports = [ - ]; - - - users = { - - defaultUserShell = pkgs.fish; - - users.serenity = { - description = "Serenity"; - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "networkmanager" - "wheel" - ]; - }; - - }; - - home-manager = { - users.serenity = { - home = { - username = "serenity"; - homeDirectory = "/home/serenity/"; - stateVersion = "23.11"; - }; - - programs = { - home-manager.enable = true; - direnv = { - enable = false; - nix-direnv.enable = false; - config.load_dotenv = false; - }; - }; - - }; - - }; - - - system.stateVersion = "23.11"; - -} - - # Copy some files to where they go - # home.file.scripts = { - # source = ./scripts; - # target = ".local/bin/scripts"; - # }; - # Installing muir packages uvu - # home.packages = with pkgs; [ - # - Multimedia - # spotify - # nicotine-plus - # jellyfin-media-player - # gimp - # krita - # inkscape - # obs - # ardour - # - Web & Chat - # fractal - # schildichat-desktop - # - Coding - # vscodium - # gitui - # ]; diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix deleted file mode 100644 index e8e4b78..0000000 --- a/modules/core/packages/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{pkgs, config, inputs, ... }: - -{ - - imports = [ - ./packages.nix - ]; - - - services.flatpak.enable = true; - - qt.style = "adwaita-dark"; - - nix = { - settings = { - cores = 0; - auto-optimise-store = true; - allowed-users = [ - "@wheel" - ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - # gc = { - # automatic = true; - # }; - }; - - nixpkgs = { - overlays = [ - # self.overlays.default - # inputs.nur.overlay - ]; - config = { - allowUnfree = true; - permittedInsecurePackages = [ - "schildichat-web-1.11.30-sc.2" - "electron-25.9.0" - # "nix-2.15.3" - ]; - }; - }; - - environment.variables = { - NIXOS_OZONE_WL = "1"; - NIXPKGS_ALLOW_UNFREE = "1"; - PATH = [ - "\${HOME}/.local/bin" - "\${HOME}/.config/rofi/scripts" - ]; - }; - - boot.binfmt.registrations.appimage = { - wrapInterpreterInShell = false; - interpreter = "${pkgs.appimage-run}/bin/appimage-run"; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; - }; - - system = { - stateVersion = "23.11"; - # autoUpgrade = { - # enable = true; - # channel = "INSERT_CHANNEL"; - # }; - }; - -} diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix deleted file mode 100644 index 5e95670..0000000 --- a/modules/core/packages/packages.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ pkgs, ... }: - -{ - - environment.systemPackages = with pkgs; [ - - ## web browsers - tor-browser-bundle-bin - # lagrange - firefox - - ## filsesystem support - udiskie - ntfs3g - xfsprogs - - ## nixos specific - # home-manager - appimage-run - # nix-tree - # nix-init - # nix-index - # nixpkgs-review - # nix-output-monitor - - - ## terminal - kitty - micro - - ## cli tools - hyfetch - file - zip - unzip - gnupg - busybox - killall - usbutils - pciutils - moreutils - libsecret - git-crypt - - ## misc/fonts - (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) - - ## maybe more - - ## libraries - glib - qt5-wayland - qt6-wayland - - ]; - - - programs = { - # home-manager.enable = true; - traceroute.enable = true; - starship.enable = true; - corectrl.enable = true; - firefox.enable = true; - fish.enable = true; - # htop.enable = true; - git.enable = true; - gnupg.agent = { - enable = false; - enableSSHSupport = false; - }; - - }; - - -} diff --git a/modules/core/services.nix b/modules/core/services.nix deleted file mode 100644 index dc9fad5..0000000 --- a/modules/core/services.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs, lib, config, ... }: - -{ - - imports = [ - ]; - - - services = { - - gvfs.enable = true; - dbus.enable = true; - # gnome-keyring.enable = true; - - openssh.enable = false; - - avahi = { - enable = false; - nssmdns = false; - openFirewall = false; - }; - - locate = { - enable = false; - package = pkgs.plocate; - localuser = null; - }; - - }; - - - # disable these cuz they cause problems - # see: https://github.com/NixOS/nixpkgs/issues/180175 - systemd.services = { - networkManager-wait-online.enable = lib.mkForce false; - systemd-networkd-wait-online.enable = lib.mkForce false; - }; - - - system.stateVersion = "23.11"; - -} diff --git a/modules/home/default.nix b/modules/home/default.nix deleted file mode 100644 index e4080ab..0000000 --- a/modules/home/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - - imports = [ - ./programs - ./hyprland - ]; - -} diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix deleted file mode 100644 index f01066a..0000000 --- a/modules/home/hyprland/config.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ ... }: -{ - wayland.windowManager.hyprland = { - extraConfig = " - $mainMod = SUPER - - monitor=,preferred,auto,auto - monitor=,1920x1200,auto,auto - - # autostart - exec-once = systemctl --user import-environment & - exec-once = hash dbus-update-activation-environment 2>/dev/null & - exec-once = dbus-update-activation-environment --systemd & - exec-once = nm-applet & - exec-once = wl-paste --primary --watch wl-copy --primary --clear - exec-once = swaybg -m fill -i $(find ~/Pictures/wallpapers/ -maxdepth 1 -type f) & - exec-once = sleep 1 && swaylock - exec-once = hyprctl setcursor Nordzy-cursors 22 & - exec-once = waybar & - exec-once = mako & - - input { - kb_layout = us - numlock_by_default = true - follow_mouse = 1 - sensitivity = 0 - } - - misc { - disable_autoreload = true - disable_hyprland_logo = true - always_follow_on_dnd = true - layers_hog_keyboard_focus = true - animate_manual_resizes = false - enable_swallow = true - # swallow_regex = - focus_on_activate = true - } - - general { - layout = dwindle - - gaps_in = 0 - gaps_out = 0 - border_size = 2 - col.active_border = rgb(cba6f7) rgb(94e2d5) 45deg - col.inactive_border = 0x00000000 - border_part_of_window = false - no_border_on_floating = false - - # gaps_in = 5 - # gaps_out = 10 - # border_size = 2 - # col.active_border = rgb(cba6f7) rgb(94e2d5) 45deg - # col.inactive_border = 0x00000000 - # border_part_of_window = false - } - - xwayland { - force_zero_scaling = true - } - - dwindle { - no_gaps_when_only = true - force_split = 0 - special_scale_factor = 1.0 - split_width_multiplier = 1.0 - use_active_for_splits = true - pseudotile = yes - preserve_split = yes - } - - master { - new_is_master = true - special_scale_factor = 1 - no_gaps_when_only = false - } - - decoration { - rounding = 5 - # rounding = 12 - - active_opacity = 0.90; - inactive_opacity = 0.90; - fullscreen_opacity = 1.0; - - blur { - enabled = true - - size = 4 - passes = 2 - - brightness = 1 - contrast = 1.300000 - ignore_opacity = true - noise = 0.011700 - - new_optimizations = true - - xray = true - } - - drop_shadow = true; - - shadow_ignore_window = true; - shadow_offset = 0 2 - shadow_range = 20 - shadow_render_power = 3 - col.shadow = rgba(00000055) - } - - - animations { - enabled = true - - bezier = fluent_decel, 0, 0.2, 0.4, 1 - bezier = easeOutCirc, 0, 0.55, 0.45, 1 - bezier = easeOutCubic, 0.33, 1, 0.68, 1 - bezier = easeinoutsine, 0.37, 0, 0.63, 1 - - # Windows - animation = windowsIn, 1, 3, easeOutCubic, popin 30% # window open - animation = windowsOut, 1, 3, fluent_decel, popin 70% # window close. - animation = windowsMove, 1, 2, easeinoutsine, slide # everything in between, moving, dragging, resizing. - - # Fade - animation = fadeIn, 1, 3, easeOutCubic # fade in (open) -> layers and windows - animation = fadeOut, 1, 2, easeOutCubic # fade out (close) -> layers and windows - animation = fadeSwitch, 0, 1, easeOutCirc # fade on changing activewindow and its opacity - animation = fadeShadow, 1, 10, easeOutCirc # fade on changing activewindow for shadows - animation = fadeDim, 1, 4, fluent_decel # the easing of the dimming of inactive windows - animation = border, 1, 2.7, easeOutCirc # for animating the border's color switch speed - animation = borderangle, 1, 30, fluent_decel, once # for animating the border's gradient angle - styles: once (default), loop - animation = workspaces, 1, 4, easeOutCubic, fade # styles: slide, slidevert, fade, slidefade, slidefadevert - } - - - # ---------------------------------------------------------------- - - # show keybinds list - bind = $mainMod, F1, exec, show-keybinds - - # keybindings - bind = $mainMod, Return, exec, kitty - bind = ALT, Return, exec, kitty --title float_kitty - bind = $mainMod SHIFT, Return, exec, kitty --start-as=fullscreen -o 'font_size=16' - bind = $mainMod, B, exec, hyprctl dispatch exec '[workspace 1 silent] floorp' - bind = $mainMod, Q, killactive, - bind = $mainMod, F, fullscreen, 0 - bind = $mainMod SHIFT, F, fullscreen, 1 - bind = $mainMod, Space, togglefloating, - bind = $mainMod, D, exec, pkill wofi || wofi --show drun - bind = $mainMod SHIFT, D, exec, hyprctl dispatch exec '[workspace 4 silent] discord' - bind = $mainMod SHIFT, S, exec, hyprctl dispatch exec '[workspace 5 silent] SoundWireServer' - bind = $mainMod, Escape, exec, swaylock - bind = $mainMod SHIFT, Escape, exec, shutdown-script - bind = $mainMod, P, pseudo, - bind = $mainMod, J, togglesplit, - bind = $mainMod, E, exec, nemo - bind = $mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped - bind = $mainMod, C ,exec, hyprpicker -a - bind = $mainMod, G,exec, $HOME/.local/bin/toggle_layout - bind = $mainMod, W,exec, pkill wofi || wallpaper-picker - bind = $mainMod SHIFT, W, exec, vm-start - - # screenshot - bind = $mainMod, Print, exec, grimblast --notify --cursor save area ~/Pictures/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png - bind = ,Print, exec, grimblast --notify --cursor copy area - - # switch focus - bind = $mainMod, left, movefocus, l - bind = $mainMod, right, movefocus, r - bind = $mainMod, up, movefocus, u - bind = $mainMod, down, movefocus, d - - # switch workspace - bind = $mainMod, 1, workspace, 1 - bind = $mainMod, 2, workspace, 2 - bind = $mainMod, 3, workspace, 3 - bind = $mainMod, 4, workspace, 4 - bind = $mainMod, 5, workspace, 5 - bind = $mainMod, 6, workspace, 6 - bind = $mainMod, 7, workspace, 7 - bind = $mainMod, 8, workspace, 8 - bind = $mainMod, 9, workspace, 9 - bind = $mainMod, 0, workspace, 10 - - # same as above, but switch to the workspace - bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 # movetoworkspacesilent - bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 - bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 - bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 - bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 - bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 - bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 - bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 - bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 - bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 - bind = $mainMod CTRL, c, movetoworkspace, empty - - # window control - bind = $mainMod SHIFT, left, movewindow, l - bind = $mainMod SHIFT, right, movewindow, r - bind = $mainMod SHIFT, up, movewindow, u - bind = $mainMod SHIFT, down, movewindow, d - bind = $mainMod CTRL, left, resizeactive, -80 0 - bind = $mainMod CTRL, right, resizeactive, 80 0 - bind = $mainMod CTRL, up, resizeactive, 0 -80 - bind = $mainMod CTRL, down, resizeactive, 0 80 - bind = $mainMod ALT, left, moveactive, -80 0 - bind = $mainMod ALT, right, moveactive, 80 0 - bind = $mainMod ALT, up, moveactive, 0 -80 - bind = $mainMod ALT, down, moveactive, 0 80 - - # media and volume controls - bind = ,XF86AudioRaiseVolume,exec, pamixer -i 2 - bind = ,XF86AudioLowerVolume,exec, pamixer -d 2 - bind = ,XF86AudioMute,exec, pamixer -t - bind = ,XF86AudioPlay,exec, playerctl play-pause - bind = ,XF86AudioNext,exec, playerctl next - bind = ,XF86AudioPrev,exec, playerctl previous - bind = , XF86AudioStop, exec, playerctl stop - bind = $mainMod, mouse_down, workspace, e-1 - bind = $mainMod, mouse_up, workspace, e+1 - - # mouse binding - bindm = $mainMod, mouse:272, movewindow - bindm = $mainMod, mouse:273, resizewindow - - # windowrule - windowrule = float,audacious - windowrule = workspace 8 silent, audacious - windowrule = pin,wofi - windowrule = float,wofi - windowrule = noborder,wofi - windowrule = tile, neovide - windowrule = idleinhibit focus,mpv - windowrule = float,udiskie - windowrule = float,title:^(Transmission)$ - windowrule = float,title:^(Volume Control)$ - windowrule = float,title:^(Firefox — Sharing Indicator)$ - windowrule = move 0 0,title:^(Firefox — Sharing Indicator)$ - windowrule = size 700 450,title:^(Volume Control)$ - windowrule = move 40 55%,title:^(Volume Control)$ - windowrulev2 = float, title:^(Picture-in-Picture)$ - windowrulev2 = opacity 1.0 override 1.0 override, title:^(Picture-in-Picture)$ - # windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*YouTube.*)$ - windowrulev2 = pin, title:^(Picture-in-Picture)$ - windowrule = float,imv - windowrule = center,imv - windowrule = size 1200 725,imv - windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*imv.*)$ - windowrule = float,mpv - windowrule = center,mpv - windowrulev2 = opacity 1.0 override 1.0 override, title:^(.*mpv.*)$ - windowrule = tile,Aseprite - windowrulev2 = opacity 1.0 override 1.0 override, class:(Aseprite) - windowrulev2 = opacity 1.0 override 1.0 override, class:(Unity) - windowrule = size 1200 725,mpv - windowrulev2 = idleinhibit focus, class:^(mpv)$ - windowrulev2 = idleinhibit fullscreen, class:^(firefox)$ - - windowrule = float,title:^(float_kitty)$ - windowrule = center,title:^(float_kitty)$ - windowrule = size 950 600,title:^(float_kitty)$ - - windowrulev2 = float,class:^(pavucontrol)$ - windowrulev2 = float,class:^(SoundWireServer)$ - windowrulev2 = float,class:^(file_progress)$ - windowrulev2 = float,class:^(confirm)$ - windowrulev2 = float,class:^(dialog)$ - windowrulev2 = float,class:^(download)$ - windowrulev2 = float,class:^(notification)$ - windowrulev2 = float,class:^(error)$ - windowrulev2 = float,class:^(confirmreset)$ - windowrulev2 = float,title:^(Open File)$ - windowrulev2 = float,title:^(branchdialog)$ - windowrulev2 = float,title:^(Confirm to replace files)$ - windowrulev2 = float,title:^(File Operation Progress)$ - "; - }; -} diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix deleted file mode 100644 index 54ec568..0000000 --- a/modules/home/hyprland/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ inputs, pkgs, ... }: -{ - imports = [ (import ./hyprland.nix) ] - ++ [ (import ./config.nix) ] - ++ [ (import ./variables.nix) ] - ++ [ (import ./waybar) ] - ++ [ (import ./wofi) ] - # ++ [ (import ./stylix) ] - ++ [ inputs.hyprland.homeManagerModules.default ]; -} diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix deleted file mode 100644 index 7a16bde..0000000 --- a/modules/home/hyprland/hyprland.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ inputs, pkgs, ...}: - -{ - - home.packages = with pkgs; [ - wayland - - inputs.hypr-contrib.packages.${pkgs.system}.grimblast - - hyprlock - hyprpaper - hyprpicker - hyprcursor - - wofi - grim - dunst - slurp - nm-applet - overskride - cliphist - wl-clip-persist - wf-recorder - - ]; - - systemd.user.targets.hyprland-session.Unit.Wants = [ - "xdg-desktop-autostart.target" - ]; - - wayland.windowManager.hyprland = { - enable = true; - systemd.enable = true; - xwayland = { - enable = true; - # hidpi = true; - }; - }; - -} diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix deleted file mode 100644 index 4588bb8..0000000 --- a/modules/home/hyprland/variables.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ ... }: - -{ - - home.sessionVariables = { - - TERMINAL = "kitty"; - EDITOR = "micro"; - BROWSER = "firefox"; - NIXOS_OZONE_WL = "1"; - __GL_GSYNC_ALLOWED = "0"; - __GL_VRR_ALLOWED = "0"; - _JAVA_AWT_WM_NONEREPARENTING = "1"; - SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; - DISABLE_QT5_COMPAT = "0"; - GDK_BACKEND = "wayland"; - ANKI_WAYLAND = "1"; - DIRENV_LOG_FORMAT = ""; - WLR_DRM_NO_ATOMIC = "1"; - QT_AUTO_SCREEN_SCALE_FACTOR = "1"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - QT_QPA_PLATFORM = "xcb"; - QT_QPA_PLATFORMTHEME = "qt5ct"; - QT_STYLE_OVERRIDE = "kvantum"; - MOZ_ENABLE_WAYLAND = "1"; - WLR_BACKEND = "vulkan"; - WLR_RENDERER = "vulkan"; - WLR_NO_HARDWARE_CURSORS = "1"; - XDG_CURRENT_DESKTOP = "hyprland"; - XDG_SESSION_DESKTOP = "hyprland"; - XDG_SESSION_TYPE = "wayland"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - GTK_THEME = "Catppuccin-Mocha-Compact-Lavender-Dark"; - }; - -} diff --git a/modules/home/hyprland/waybar/default.nix b/modules/home/hyprland/waybar/default.nix deleted file mode 100644 index 9b8b240..0000000 --- a/modules/home/hyprland/waybar/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ (import ./waybar.nix) ] - ++ [ (import ./settings.nix) ] - ++ [ (import ./style.nix) ]; -} diff --git a/modules/home/hyprland/waybar/settings.nix b/modules/home/hyprland/waybar/settings.nix deleted file mode 100644 index 1aaeeeb..0000000 --- a/modules/home/hyprland/waybar/settings.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ ... }: -{ - programs.waybar.settings.mainBar = { - position= "bottom"; - layer= "top"; - height= 5; - margin-top= 0; - margin-bottom= 0; - margin-left= 0; - margin-right= 0; - modules-left= [ - "custom/launcher" - "hyprland/workspaces" - ]; - modules-center= [ - "clock" - ]; - modules-right= [ - "tray" - "cpu" - "memory" - "disk" - "pulseaudio" - "network" - ]; - clock= { - calendar = { - format = { today = "{}"; }; - }; - format = " {:%H:%M}"; - tooltip= "true"; - tooltip-format= "{:%Y %B}\n{calendar}"; - format-alt= " {:%d/%m}"; - }; - "hyprland/workspaces"= { - active-only= false; - disable-scroll= true; - format = "{icon}"; - on-click= "activate"; - format-icons= { - "1"= "󰈹"; - "2"= ""; - "3"= "󰘙"; - "4"= "󰙯"; - "5"= ""; - "6"= ""; - urgent= ""; - default = ""; - sort-by-number= true; - }; - persistent-workspaces = { - "1"= []; - "2"= []; - "3"= []; - "4"= []; - "5"= []; - }; - }; - memory= { - format= "󰟜 {}%"; - format-alt= "󰟜 {used} GiB"; #  - interval= 2; - }; - cpu= { - format= " {usage}%"; - format-alt= " {avg_frequency} GHz"; - interval= 2; - }; - disk = { - # path = "/"; - format = "󰋊 {percentage_used}%"; - interval= 60; - }; - network = { - format-wifi = " {signalStrength}%"; - format-ethernet = "󰀂 "; - tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; - format-linked = "{ifname} (No IP)"; - format-disconnected = "󰖪 "; - }; - tray= { - icon-size= 20; - spacing= 8; - }; - pulseaudio= { - format= "{icon} {volume}%"; - format-muted= "󰖁 "; - format-icons= { - default= [" "]; - }; - scroll-step= 5; - on-click= "pamixer -t"; - }; - "custom/launcher"= { - format= ""; - on-click= "pkill wofi || wofi --show drun"; - on-click-right= "pkill wofi || wallpaper-picker"; - tooltip= "false"; - }; - }; -} diff --git a/modules/home/hyprland/waybar/style.nix b/modules/home/hyprland/waybar/style.nix deleted file mode 100644 index db32a12..0000000 --- a/modules/home/hyprland/waybar/style.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ ... }: -let custom = { - font = "JetBrainsMono Nerd Font"; - font_size = "15px"; - font_weight = "bold"; - text_color = "#cdd6f4"; - secondary_accent= "89b4fa"; - tertiary_accent = "f5f5f5"; - background = "11111B"; - opacity = "0.98"; -}; -in -{ - programs.waybar.style = '' - - * { - border: none; - border-radius: 0px; - padding: 0; - margin: 0; - min-height: 0px; - font-family: ${custom.font}; - font-weight: ${custom.font_weight}; - opacity: ${custom.opacity}; - } - - window#waybar { - background: none; - } - - #workspaces { - font-size: 18px; - padding-left: 15px; - - } - #workspaces button { - color: ${custom.text_color}; - padding-left: 6px; - padding-right: 6px; - } - #workspaces button.empty { - color: #6c7086; - } - #workspaces button.active { - color: #b4befe; - } - - #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock { - font-size: ${custom.font_size}; - color: ${custom.text_color}; - } - - #cpu { - padding-left: 15px; - padding-right: 9px; - margin-left: 7px; - } - #memory { - padding-left: 9px; - padding-right: 9px; - } - #disk { - padding-left: 9px; - padding-right: 15px; - } - - #tray { - padding: 0 20px; - margin-left: 7px; - } - - #pulseaudio { - padding-left: 15px; - padding-right: 9px; - margin-left: 7px; - } - #network { - padding-left: 9px; - padding-right: 15px; - } - - #clock { - padding-left: 9px; - padding-right: 15px; - } - - #custom-launcher { - font-size: 20px; - color: #b4befe; - font-weight: ${custom.font_weight}; - padding-left: 10px; - padding-right: 15px; - } - ''; -} diff --git a/modules/home/hyprland/waybar/waybar.nix b/modules/home/hyprland/waybar/waybar.nix deleted file mode 100644 index c50e873..0000000 --- a/modules/home/hyprland/waybar/waybar.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - programs.waybar = { - enable = true; - }; - programs.waybar.package = pkgs.waybar.overrideAttrs (oa: { - mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; - }); -} diff --git a/modules/home/hyprland/wofi/config/config b/modules/home/hyprland/wofi/config/config deleted file mode 100644 index 4506e27..0000000 --- a/modules/home/hyprland/wofi/config/config +++ /dev/null @@ -1,15 +0,0 @@ -width=400 -height=350 -location=center -show=drun -prompt=Search... -filter_rate=100 -allow_markup=true -no_actions=true -halign=fill -orientation=vertical -content_halign=fill -insensitive=true -allow_images=true -image_size=40 -gtk_dark=true diff --git a/modules/home/hyprland/wofi/config/style.css b/modules/home/hyprland/wofi/config/style.css deleted file mode 100644 index a17b2fb..0000000 --- a/modules/home/hyprland/wofi/config/style.css +++ /dev/null @@ -1,94 +0,0 @@ -/* Mocha Mauve */ -@define-color accent #cba6f7; -@define-color txt #cad3f5; -@define-color bg #24273a; -@define-color bg2 #494d64; - - * { - font-family: 'JetBrains Mono Nerd Font', monospace; - font-size: 14px; - } - - /* Window */ - window { - margin: 0px; - padding: 10px; - border: 3px solid @accent; - border-radius: 7px; - background-color: @bg; - animation: slideIn 0.5s ease-in-out both; - } - - /* Slide In */ - @keyframes slideIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } - } - - /* Inner Box */ - #inner-box { - margin: 5px; - padding: 10px; - border: none; - background-color: @bg; - animation: fadeIn 0.5s ease-in-out both; - } - - /* Fade In */ - @keyframes fadeIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } - } - - /* Outer Box */ - #outer-box { - margin: 5px; - padding: 10px; - border: none; - background-color: @bg; - } - - /* Scroll */ - #scroll { - margin: 0px; - padding: 10px; - border: none; - } - - /* Input */ - #input { - margin: 5px; - padding: 10px; - border: none; - color: @accent; - background-color: @bg2; - animation: fadeIn 0.5s ease-in-out both; - } - - /* Text */ - #text { - margin: 5px; - padding: 10px; - border: none; - color: @txt; - animation: fadeIn 0.5s ease-in-out both; - } - - /* Selected Entry */ - #entry:selected { - background-color: @accent; - } - - #entry:selected #text { - color: @bg2; - } \ No newline at end of file diff --git a/modules/home/hyprland/wofi/default.nix b/modules/home/hyprland/wofi/default.nix deleted file mode 100644 index 8a341da..0000000 --- a/modules/home/hyprland/wofi/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: -{ - # https://github.com/prtce/wofi - xdg.configFile."wofi".source = ./config; -} \ No newline at end of file diff --git a/modules/home/programs/btop.nix b/modules/home/programs/btop.nix deleted file mode 100644 index 6d19044..0000000 --- a/modules/home/programs/btop.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: -{ - programs.btop = { - enable = true; - - settings = { - color_theme = "dracula"; - theme_background = false; - update_ms = 500; - }; - }; - - home.packages = (with pkgs; [ nvtopPackages.intel ]); -} \ No newline at end of file diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix deleted file mode 100644 index 212c7ec..0000000 --- a/modules/home/programs/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: - -{ - - imports = [ - ./git.nix - # ./gtk.nix - # ./btop.nix - ./fish.nix - ./kitty.nix - ./micro.nix - # ./starship.nix - # ./vscodium.nix - ] - -} diff --git a/modules/home/programs/discord/default.nix b/modules/home/programs/discord/default.nix deleted file mode 100644 index f48a6db..0000000 --- a/modules/home/programs/discord/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ (import ./theme-template.nix) ]; - home.packages = with pkgs; [ - (discord.override { - withVencord = true; - }) - ]; -} \ No newline at end of file diff --git a/modules/home/programs/discord/theme-template.nix b/modules/home/programs/discord/theme-template.nix deleted file mode 100644 index 616993c..0000000 --- a/modules/home/programs/discord/theme-template.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - xdg.configFile."Vencord/themes/custom.css".text = '' - /** - * @name Catppuccin Mocha - * @author winston#0001 - * @authorId 505490445468696576 - * @version 0.2.0 - * @description 🎮 Soothing pastel theme for Discord - * @website https://github.com/catppuccin/discord - * @invite r6Mdz5dpFc - * **/ - - @import url("https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"); - ''; -} \ No newline at end of file diff --git a/modules/home/programs/fish.nix b/modules/home/programs/fish.nix deleted file mode 100644 index db30b33..0000000 --- a/modules/home/programs/fish.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - - - -} diff --git a/modules/home/programs/gaming/gaming.nix b/modules/home/programs/gaming/gaming.nix deleted file mode 100644 index f2353cb..0000000 --- a/modules/home/programs/gaming/gaming.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, config, inputs, ... }: -{ - home.packages = with pkgs;[ - ## Utils - gamemode - gamescope - winetricks - inputs.nix-gaming.packages.${pkgs.system}.wine-ge - - ## Cli games - _2048-in-terminal - vitetris - nethack - - ## Celeste - celeste-classic - celeste-classic-pm - - ## Doom - # gzdoom - crispy-doom - - ## Emulation - # cemu - # dolphin-emu - ]; -} diff --git a/modules/home/programs/gaming/steam.nix b/modules/home/programs/gaming/steam.nix deleted file mode 100644 index beaa0a8..0000000 --- a/modules/home/programs/gaming/steam.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, lib, ... }: -{ - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = false; - }; - programs.gamemode.enable = true; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-runtime" - ]; - # proton-ge-bin - -# warning: The package proton-ge in nix-gaming has been deprecated as of 2024-03-17. - -# You should use proton-ge-bin from Nixpkgs, which conforms to -# the new `extraCompatTools` module option under `programs.steam` -# For details, see the relevant pull request: -} diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix deleted file mode 100644 index e595627..0000000 --- a/modules/home/programs/git.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: - -{ - - programs.git = { - enable = true; - - userName = "serenity-F"; - userEmail = "serenity-amalgam@protonmail.com"; - - extraConfig = { - init.defaultBranch = "main"; - }; - }; - -} diff --git a/modules/home/programs/gtk.nix b/modules/home/programs/gtk.nix deleted file mode 100644 index 4fee87c..0000000 --- a/modules/home/programs/gtk.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ pkgs, ... }: -{ - fonts.fontconfig.enable = true; - home.packages = [ - pkgs.nerdfonts - (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) - pkgs.twemoji-color-font - pkgs.noto-fonts-emoji - ]; - - gtk = { - enable = true; - font = { - name = "JetBrainsMono Nerd Font"; - size = 11; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - flavor = "mocha"; - accent = "lavender"; - }; - }; - theme = { - name = "Catppuccin-Mocha-Compact-Lavender-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = [ "lavender" ]; - size = "compact"; - # tweaks = [ "rimless" ]; - variant = "mocha"; - }; - }; - cursorTheme = { - name = "Nordzy-cursors"; - package = pkgs.nordzy-cursor-theme; - size = 22; - }; - }; - - home.pointerCursor = { - name = "Nordzy-cursors"; - package = pkgs.nordzy-cursor-theme; - size = 22; - }; -} diff --git a/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix deleted file mode 100644 index e17c3fb..0000000 --- a/modules/home/programs/kitty.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ pkgs, ... }: -{ - programs.kitty = { - enable = true; - - theme = "Catppuccin-Mocha"; - - font = { - name = "JetBrainsMono Nerd Font"; - size = 13; - }; - - settings = { - confirm_os_window_close = 0; - background_opacity = "0.55"; - window_padding_width = 10; - scrollback_lines = 10000; - enable_audio_bell = false; - mouse_hide_wait = 60; - - ## Tabs - tab_title_template = "{index}"; - active_tab_font_style = "normal"; - inactive_tab_font_style = "normal"; - tab_bar_style = "powerline"; - tab_powerline_style = "round"; - active_tab_foreground = "#1e1e2e"; - active_tab_background = "#cba6f7"; - inactive_tab_foreground = "#bac2de"; - inactive_tab_background = "#313244"; - }; - - keybindings = { - ## Tabs - "alt+1" = "goto_tab 1"; - "alt+2" = "goto_tab 2"; - "alt+3" = "goto_tab 3"; - "alt+4" = "goto_tab 4"; - - ## Unbind - "ctrl+shift+left" = "no_op"; - "ctrl+shift+right" = "no_op"; - }; - }; -} \ No newline at end of file diff --git a/modules/home/programs/micro.nix b/modules/home/programs/micro.nix deleted file mode 100644 index db30b33..0000000 --- a/modules/home/programs/micro.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - - - -} diff --git a/modules/home/programs/starship.nix b/modules/home/programs/starship.nix deleted file mode 100644 index 0858c08..0000000 --- a/modules/home/programs/starship.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, inputs, ... }: -{ - programs.starship = { - enable = true; - - enableBashIntegration = true; - enableZshIntegration = true; - enableNushellIntegration = true; - - settings = { - right_format = "$cmd_duration"; - - directory = { - format = "[ ](bold #89b4fa)[ $path ]($style)"; - style = "bold #b4befe"; - }; - - character = { - success_symbol = "[ ](bold #89b4fa)[ ➜](bold green)"; - error_symbol = "[ ](bold #89b4fa)[ ➜](bold red)"; - # error_symbol = "[ ](bold #89dceb)[ ✗](bold red)"; - }; - - cmd_duration = { - format = "[]($style)[[󰔚 ](bg:#161821 fg:#d4c097 bold)$duration](bg:#161821 fg:#BBC3DF)[ ]($style)"; - disabled = false; - style = "bg:none fg:#161821"; - }; - - # directory.substitutions = { - # "~" = "󰋞"; - # "Documents" = " "; - # "Downloads" = " "; - # "Music" = " "; - # "Pictures" = " "; - # }; - - palette = "catppuccin_mocha"; - } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml"); - }; -} \ No newline at end of file diff --git a/modules/home/programs/vscodium.nix b/modules/home/programs/vscodium.nix deleted file mode 100644 index 8c7103d..0000000 --- a/modules/home/programs/vscodium.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ pkgs, ... }: -{ - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - # nix language - bbenoist.nix - # nix-shell suport - arrterian.nix-env-selector - # python - ms-python.python - # C/C++ - ms-vscode.cpptools - # OCaml - ocamllabs.ocaml-platform - - # Color theme - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons - ]; - userSettings = { - "update.mode" = "none"; - "extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update - "window.titleBarStyle" = "custom"; # needed otherwise vscode crashes, see https://github.com/NixOS/nixpkgs/issues/246509 - - "window.menuBarVisibility" = "toggle"; - "editor.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont', 'monospace', monospace"; - "terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont'"; - "editor.fontSize" = 16; - "workbench.colorTheme" = "Catppuccin Mocha"; - "workbench.iconTheme" = "catppuccin-mocha"; - "vsicons.dontShowNewVersionMessage" = true; - "explorer.confirmDragAndDrop" = false; - "editor.fontLigatures" = true; - "editor.minimap.enabled" = false; - "workbench.startupEditor" = "none"; - - "editor.formatOnSave" = true; - "editor.formatOnType" = true; - "editor.formatOnPaste" = true; - - "workbench.layoutControl.type" = "menu"; - "workbench.editor.limit.enabled" = true; - "workbench.editor.limit.value" = 10; - "workbench.editor.limit.perEditorGroup" = true; - "workbench.editor.showTabs" = "single"; - "files.autoSave" = "onWindowChange"; - "explorer.openEditors.visible" = 0; - "breadcrumbs.enabled" = false; - "editor.renderControlCharacters" = false; - "workbench.activityBar.location" = "hidden"; - "workbench.statusBar.visible" = false; - "editor.scrollbar.verticalScrollbarSize" = 2; - "editor.scrollbar.horizontalScrollbarSize" = 2; - "editor.scrollbar.vertical" = "hidden"; - "editor.scrollbar.horizontal" = "hidden"; - "workbench.layoutControl.enabled" = false; - - "editor.mouseWheelZoom" = true; - - "C_Cpp.autocompleteAddParentheses" = true; - "C_Cpp.formatting" = "vcFormat"; - "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction" = true; - "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyType" = true; - "C_Cpp.vcFormat.space.beforeEmptySquareBrackets" = true; - "C_Cpp.vcFormat.newLine.beforeOpenBrace.block" = "sameLine"; - "C_Cpp.vcFormat.newLine.beforeOpenBrace.function" = "sameLine"; - "C_Cpp.vcFormat.newLine.beforeElse" = false; - "C_Cpp.vcFormat.newLine.beforeCatch" = false; - "C_Cpp.vcFormat.newLine.beforeOpenBrace.type" = "sameLine"; - "C_Cpp.vcFormat.space.betweenEmptyBraces" = true; - "C_Cpp.vcFormat.space.betweenEmptyLambdaBrackets" = true; - "C_Cpp.vcFormat.indent.caseLabels" = true; - "C_Cpp.intelliSenseCacheSize" = 2048; - "C_Cpp.intelliSenseMemoryLimit" = 2048; - "C_Cpp.default.browse.path" = [ - ''''${workspaceFolder}/**'' - ]; - "C_Cpp.default.cStandard" = "gnu11"; - "C_Cpp.inlayHints.parameterNames.hideLeadingUnderscores" = false; - "C_Cpp.intelliSenseUpdateDelay" = 500; - "C_Cpp.workspaceParsingPriority" = "medium"; - "C_Cpp.clang_format_sortIncludes" = true; - "C_Cpp.doxygen.generatedStyle" = "/**"; - }; - # Keybindings - keybindings = [ - { - key = "ctrl+q"; - command = "editor.action.commentLine"; - when = "editorTextFocus && !editorReadonly"; - } - { - key = "ctrl+s"; - command = "workbench.action.files.saveFiles"; - } - ]; - }; -} diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix deleted file mode 100644 index 90e0adf..0000000 --- a/modules/home/scripts/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{pkgs, ...}: let - wall-change = pkgs.writeShellScriptBin "wall-change" ''swaybg -m fill -i $1''; - wallpaper-picker = pkgs.writeShellScriptBin "wallpaper-picker" (builtins.readFile ./scripts/wallpaper-picker.sh); - - runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh); - music = pkgs.writeShellScriptBin "music" (builtins.readFile ./scripts/music.sh); - lofi = pkgs.writeScriptBin "lofi" (builtins.readFile ./scripts/lofi.sh); - - toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh); - toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (builtins.readFile ./scripts/toggle_oppacity.sh); - - maxfetch = pkgs.writeScriptBin "maxfetch" (builtins.readFile ./scripts/maxfetch.sh); - - compress = pkgs.writeScriptBin "compress" (builtins.readFile ./scripts/compress.sh); - extract = pkgs.writeScriptBin "extract" (builtins.readFile ./scripts/extract.sh); - - shutdown-script = pkgs.writeScriptBin "shutdown-script" (builtins.readFile ./scripts/shutdown-script.sh); - - show-keybinds = pkgs.writeScriptBin "show-keybinds" (builtins.readFile ./scripts/keybinds.sh); - - vm-start = pkgs.writeScriptBin "vm-start" (builtins.readFile ./scripts/vm-start.sh); - - ascii = pkgs.writeScriptBin "ascii" (builtins.readFile ./scripts/ascii.sh); -in { - home.packages = with pkgs; [ - wall-change - wallpaper-picker - - runbg - music - lofi - - toggle_blur - toggle_oppacity - - maxfetch - - compress - extract - - shutdown-script - - show-keybinds - - vm-start - - ascii - ]; -} diff --git a/modules/home/scripts/scripts/ascii.sh b/modules/home/scripts/scripts/ascii.sh deleted file mode 100644 index 0ff7489..0000000 --- a/modules/home/scripts/scripts/ascii.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env zsh - -RED=$(tput setaf 1) -GREEN=$(tput setaf 2) -BLUE=$(tput setaf 4) -MAGENTA=$(tput setaf 5) -CYAN=$(tput setaf 6) -NORMAL=$(tput sgr0) - -echo -e "┌─────────────┬─────────────┬─────────────┬─────────────┐" -echo -e "│ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │ ${BLUE}Dec${NORMAL} ${GREEN}Hex${NORMAL} Chr │" -echo -e "├─────────────┼─────────────┼─────────────┼─────────────┤" -echo -e "│ 0 0 \033[2mNUL\033[0m\033[0m │ 32 20 │ 64 40 ${CYAN}@${NORMAL} │ 96 60 ${CYAN}\`${NORMAL} │" -echo -e "│ 1 1 \033[2mSOH\033[0m │ 33 21 ${CYAN}!${NORMAL} │ 65 41 ${GREEN}A${NORMAL} │ 97 61 ${GREEN}a${NORMAL} │" -echo -e "│ 2 2 \033[2mSTX\033[0m │ 34 22 ${CYAN}\"${NORMAL} │ 66 42 ${GREEN}B${NORMAL} │ 98 62 ${GREEN}b${NORMAL} │" -echo -e "│ 3 3 \033[2mETX\033[0m │ 35 23 ${CYAN}#${NORMAL} │ 67 43 ${GREEN}C${NORMAL} │ 99 63 ${GREEN}c${NORMAL} │" -echo -e "│ 4 4 \033[2mEOT\033[0m │ 36 24 ${CYAN}\$${NORMAL} │ 68 44 ${GREEN}D${NORMAL} │ 100 64 ${GREEN}d${NORMAL} │" -echo -e "│ 5 5 \033[2mENQ\033[0m │ 37 25 ${CYAN}%${NORMAL} │ 69 45 ${GREEN}E${NORMAL} │ 101 65 ${GREEN}e${NORMAL} │" -echo -e "│ 6 6 \033[2mACK\033[0m │ 38 26 ${CYAN}&${NORMAL} │ 70 46 ${GREEN}F${NORMAL} │ 102 66 ${GREEN}f${NORMAL} │" -echo -e "│ 7 7 \033[2mBEL\033[0m │ 39 27 ${CYAN}'${NORMAL} │ 71 47 ${GREEN}G${NORMAL} │ 103 67 ${GREEN}g${NORMAL} │" -echo -e "│ 8 8 \033[2mBS\033[0m │ 40 28 ${CYAN}(${NORMAL} │ 72 48 ${GREEN}H${NORMAL} │ 104 68 ${GREEN}h${NORMAL} │" -echo -e "│ 9 9 \033[2mHT\033[0m │ 41 29 ${CYAN})${NORMAL} │ 73 49 ${GREEN}I${NORMAL} │ 105 69 ${GREEN}i${NORMAL} │" -echo -e "│ 10 A \033[2mLF\033[0m │ 42 2A ${CYAN}*${NORMAL} │ 74 4A ${GREEN}J${NORMAL} │ 106 6A ${GREEN}j${NORMAL} │" -echo -e "│ 11 B \033[2mVT\033[0m │ 43 2B ${CYAN}+${NORMAL} │ 75 4B ${GREEN}K${NORMAL} │ 107 6B ${GREEN}k${NORMAL} │" -echo -e "│ 12 C \033[2mFF\033[0m │ 44 2C ${CYAN},${NORMAL} │ 76 4C ${GREEN}L${NORMAL} │ 108 6C ${GREEN}l${NORMAL} │" -echo -e "│ 13 D \033[2mCR\033[0m │ 45 2D ${CYAN}-${NORMAL} │ 77 4D ${GREEN}M${NORMAL} │ 109 6D ${GREEN}m${NORMAL} │" -echo -e "│ 14 E \033[2mSO\033[0m │ 46 2E ${CYAN}.${NORMAL} │ 78 4E ${GREEN}N${NORMAL} │ 110 6E ${GREEN}n${NORMAL} │" -echo -e "│ 15 F \033[2mSI\033[0m │ 47 2F ${CYAN}/${NORMAL} │ 79 4F ${GREEN}O${NORMAL} │ 111 6F ${GREEN}o${NORMAL} │" -echo -e "│ 16 10 \033[2mDLE\033[0m │ 48 30 ${RED}0${NORMAL} │ 80 50 ${GREEN}P${NORMAL} │ 112 70 ${GREEN}p${NORMAL} │" -echo -e "│ 17 11 \033[2mDC1\033[0m │ 49 31 ${RED}1${NORMAL} │ 81 51 ${GREEN}Q${NORMAL} │ 113 71 ${GREEN}q${NORMAL} │" -echo -e "│ 18 12 \033[2mDC2\033[0m │ 50 32 ${RED}2${NORMAL} │ 82 52 ${GREEN}R${NORMAL} │ 114 72 ${GREEN}r${NORMAL} │" -echo -e "│ 19 13 \033[2mDC3\033[0m │ 51 33 ${RED}3${NORMAL} │ 83 53 ${GREEN}S${NORMAL} │ 115 73 ${GREEN}s${NORMAL} │" -echo -e "│ 20 14 \033[2mDC4\033[0m │ 52 34 ${RED}4${NORMAL} │ 84 54 ${GREEN}T${NORMAL} │ 116 74 ${GREEN}t${NORMAL} │" -echo -e "│ 21 15 \033[2mNAK\033[0m │ 53 35 ${RED}5${NORMAL} │ 85 55 ${GREEN}U${NORMAL} │ 117 75 ${GREEN}u${NORMAL} │" -echo -e "│ 22 16 \033[2mSYN\033[0m │ 54 36 ${RED}6${NORMAL} │ 86 56 ${GREEN}V${NORMAL} │ 118 76 ${GREEN}v${NORMAL} │" -echo -e "│ 23 17 \033[2mETB\033[0m │ 55 37 ${RED}7${NORMAL} │ 87 57 ${GREEN}W${NORMAL} │ 119 77 ${GREEN}w${NORMAL} │" -echo -e "│ 24 18 \033[2mCAN\033[0m │ 56 38 ${RED}8${NORMAL} │ 88 58 ${GREEN}X${NORMAL} │ 120 78 ${GREEN}x${NORMAL} │" -echo -e "│ 25 19 \033[2mEM\033[0m │ 57 39 ${RED}9${NORMAL} │ 89 59 ${GREEN}Y${NORMAL} │ 121 79 ${GREEN}y${NORMAL} │" -echo -e "│ 26 1A \033[2mSUB\033[0m │ 58 3A ${CYAN}:${NORMAL} │ 90 5A ${GREEN}Z${NORMAL} │ 122 7A ${GREEN}z${NORMAL} │" -echo -e "│ 27 1B \033[2mESC\033[0m │ 59 3B ${CYAN};${NORMAL} │ 91 5B ${CYAN}[${NORMAL} │ 123 7B ${CYAN}{${NORMAL} │" -echo -e "│ 28 1C \033[2mFS\033[0m │ 60 3C ${CYAN}<${NORMAL} │ 92 5C ${CYAN}\\${NORMAL} │ 124 7C ${CYAN}|${NORMAL} │" -echo -e "│ 29 1D \033[2mGS\033[0m │ 61 3D ${CYAN}=${NORMAL} │ 93 5D ${CYAN}]${NORMAL} │ 125 7D ${CYAN}}${NORMAL} │" -echo -e "│ 30 1E \033[2mRS\033[0m │ 62 3E ${CYAN}>${NORMAL} │ 94 5E ${CYAN}^${NORMAL} │ 126 7E ${CYAN}~${NORMAL} │" -echo -e "│ 31 1F \033[2mUS\033[0m │ 63 3F ${CYAN}?${NORMAL} │ 95 5F ${CYAN}_${NORMAL} │ 127 7F \033[2mDEL\033[0m │" -echo -e "└─────────────┴─────────────┴─────────────┴─────────────┘" diff --git a/modules/home/scripts/scripts/compress.sh b/modules/home/scripts/scripts/compress.sh deleted file mode 100755 index 5c31e62..0000000 --- a/modules/home/scripts/scripts/compress.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -if (( $# == 1 )) then - # echo -ne "Archive name: " - # read name - # tar -cvzf "$name.tar.gz" $1 - tar -cvzf "$1.tar.gz" $1 -else - echo "Wrong number of arguments..." -fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/extract.sh b/modules/home/scripts/scripts/extract.sh deleted file mode 100755 index ecc25dd..0000000 --- a/modules/home/scripts/scripts/extract.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -for i in "$@" ; do - tar -xvzf $i - break -done diff --git a/modules/home/scripts/scripts/keybinds.sh b/modules/home/scripts/scripts/keybinds.sh deleted file mode 100755 index c1837e1..0000000 --- a/modules/home/scripts/scripts/keybinds.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -config_file=~/.config/hypr/hyprland.conf -keybinds=$(grep -oP '(?<=bind = ).*' $config_file) -keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') -wofi -dmenu -p "Keybinds" <<< "$keybinds" diff --git a/modules/home/scripts/scripts/lofi.sh b/modules/home/scripts/scripts/lofi.sh deleted file mode 100755 index 76cdc8f..0000000 --- a/modules/home/scripts/scripts/lofi.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -if (ps aux | grep mpv | grep -v grep > /dev/null) then - pkill mpv -else - runbg mpv --no-video https://www.youtube.com/live/jfKfPfyJRdk?si=OF0HKrYFFj33BzMo -fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/maxfetch.sh b/modules/home/scripts/scripts/maxfetch.sh deleted file mode 100755 index 486f411..0000000 --- a/modules/home/scripts/scripts/maxfetch.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash - -unicode=" " -version="1.2.0" - -_black=$(tput setaf 0) -red=$(tput setaf 1) -green=$(tput setaf 2) -yellow=$(tput setaf 3) -blue=$(tput setaf 4) -magenta=$(tput setaf 5) -cyan=$(tput setaf 6) -_white=$(tput setaf 7) -_bright=$(tput bold) -normal=$(tput sgr0) -_underline=$(tput smul) - -up=$(uptime | awk -F'( |,|:)+' '{ - d=h=m=0; - if ($7=="min") - m=$6; - else { - if ($7~/^day/) { d=$6; h=$8; m=$9} - else {h=$6;m=$7} - } - } - { print h+0,"h",m+0,"m" } -') -up=$(sed -e "s/ h/h/g" <<< ${up}) -up=$(sed -e "s/ m/m/g" <<< ${up}) - -pkgs=$(nix-store --query --requisites /run/current-system | wc -l) - -fetch() { - echo "${cyan}$(tput bold) _ ___ ____ ____ ${normal}$(tput sgr0)" - echo "${cyan}$(tput bold) / |/ (_)_ __/ __ \/ __/ ${normal}$(tput sgr0)" - echo "${cyan}$(tput bold) / / /\ \ / /_/ /\ \ ${normal}$(tput sgr0)" - echo "${cyan}$(tput bold) /_/|_/_//_\_"'\\'"____/___/ ${normal}$(tput sgr0)" - echo "" - echo " ╭─────────────╮ " - echo " │ ${red} ${normal} user │ ${red}$(whoami)${normal}" - echo " │ ${yellow} ${normal} distro │ ${yellow}$(sed -nE "s@PRETTY_NAME=\"([^\"]*)\"@\1@p" /etc/os-release)${normal} " - echo " │ ${green} ${normal} kernel │ ${green}$(uname -r)${normal} " - echo " │ ${cyan}󱂬 ${normal} de/wm │ ${cyan}$XDG_CURRENT_DESKTOP${normal} " - echo " │ ${blue} ${normal} uptime │ ${blue}${up}${normal} " - echo " │ ${magenta} ${normal} shell │ ${magenta}$(echo ${SHELL##*/})${normal} " - echo " │ ${red}󰏖 ${normal} pkgs │ ${red}${pkgs}${normal} " - echo " ├─────────────┤ " - echo " │ ${_white} ${normal}colors │${_white}$unicode${normal}${red}$unicode${normal}${yellow}$unicode${normal}${green}$unicode${normal}${cyan}$unicode${normal}${blue}$unicode${normal}${magenta}$unicode${normal}${_black}$unicode${normal}" - echo " ╰─────────────╯ " -} - -fetch && exit 0 \ No newline at end of file diff --git a/modules/home/scripts/scripts/music.sh b/modules/home/scripts/scripts/music.sh deleted file mode 100755 index 4cebae1..0000000 --- a/modules/home/scripts/scripts/music.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -if (ps aux | grep audacious | grep -v grep > /dev/null) then - pkill audacious -else - hyprctl dispatch exec "[workspace 5 silent] audacious -t" - sleep 0.5 - audtool playlist-repeat-status |grep "on" || audtool playlist-repeat-toggle - audtool playlist-shuffle-status|grep "on" || audtool playlist-shuffle-toggle -fi \ No newline at end of file diff --git a/modules/home/scripts/scripts/runbg.sh b/modules/home/scripts/scripts/runbg.sh deleted file mode 100755 index dc5088d..0000000 --- a/modules/home/scripts/scripts/runbg.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -[ $# -eq 0 ] && { # $# is number of args - echo "$(basename $0): missing command" >&2 - exit 1 -} -prog="$(which "$1")" # see below -[ -z "$prog" ] && { - echo "$(basename $0): unknown command: $1" >&2 - exit 1 -} -shift # remove $1, now $prog, from args -tty -s && exec /dev/null # if stdout is a terminal, redirect to null -tty -s <&2 && exec 2>&1 # stderr to stdout (which might not be null) -"$prog" "$@" & # $@ is all args \ No newline at end of file diff --git a/modules/home/scripts/scripts/shutdown-script.sh b/modules/home/scripts/scripts/shutdown-script.sh deleted file mode 100755 index 96aa7ed..0000000 --- a/modules/home/scripts/scripts/shutdown-script.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env zsh - -respond="$(echo "---------------- Yes ----------------\n-------------- Restart --------------\n---------------- Nah ----------------" | wofi --show dmenu -k /dev/null)" - -if [ $respond = '---------------- Yes ----------------' ] -then - echo "shutdown" - shutdown now -elif [ $respond = '-------------- Restart --------------' ] -then - echo "restart" - reboot -else - notify-send "cancel shutdown" -fi diff --git a/modules/home/scripts/scripts/toggle_blur.sh b/modules/home/scripts/scripts/toggle_blur.sh deleted file mode 100755 index 9e970a4..0000000 --- a/modules/home/scripts/scripts/toggle_blur.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -if hyprctl getoption decoration:blur:enabled | grep "int: 1" >/dev/null ; then - hyprctl keyword decoration:blur:enabled false >/dev/null -else - hyprctl keyword decoration:blur:enabled true >/dev/null -fi diff --git a/modules/home/scripts/scripts/toggle_oppacity.sh b/modules/home/scripts/scripts/toggle_oppacity.sh deleted file mode 100755 index 9f1062e..0000000 --- a/modules/home/scripts/scripts/toggle_oppacity.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -if hyprctl getoption decoration:active_opacity | grep "float: 1" >/dev/null ; then - hyprctl keyword decoration:active_opacity 0.90 >/dev/null - hyprctl keyword decoration:inactive_opacity 0.90 >/dev/null -else - hyprctl keyword decoration:active_opacity 1 >/dev/null - hyprctl keyword decoration:inactive_opacity 1 >/dev/null -fi diff --git a/modules/home/scripts/scripts/vm-start.sh b/modules/home/scripts/scripts/vm-start.sh deleted file mode 100755 index ba2fd15..0000000 --- a/modules/home/scripts/scripts/vm-start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env zsh - -# VM name -vm_name="win10" -export LIBVIRT_DEFAULT_URI="qemu:///system" - -# change workspace -hyprctl dispatch workspace 6 - -virsh start ${vm_name} -virt-viewer -f -w -a ${vm_name} \ No newline at end of file diff --git a/modules/home/scripts/scripts/wallpaper-picker.sh b/modules/home/scripts/scripts/wallpaper-picker.sh deleted file mode 100755 index 1c2bece..0000000 --- a/modules/home/scripts/scripts/wallpaper-picker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -wallpaper_path=$HOME/Pictures/wallpapers -wallpapers_folder=$HOME/Pictures/wallpapers/others -wallpaper_name="$(ls $wallpapers_folder | wofi --show dmenu --sort-order=alphabetical)" -if [[ -f $wallpapers_folder/$wallpaper_name ]]; then - find ~/Pictures/wallpapers -maxdepth 1 -type f -delete - cp $wallpapers_folder/$wallpaper_name $wallpaper_path/$wallpaper_name - wall-change $wallpaper_path/$wallpaper_name -else - exit 1 -fi \ No newline at end of file