diff --git a/nix/README.md b/nix/README.md deleted file mode 100644 index 3c11607..0000000 --- a/nix/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# NixOS setup - -1. Backup your old config -```bash -$ sudo mv /etc/nixos /etc/nixos.old -``` - -2. Copy repo and symlink new config from dotfiles -```bash -$ git clone https://github.com/horhik/dotfiles -$ cd dotfiles -$ sudo ln -s $HOME/dotfiles/nix /etc/nixos -``` - -3. Past your hardware-configuration -```bash -$ sudo cp /etc/nixos.old/hardware-configuration.nix /etc/nixos/ -``` - -4. Install home-manager -```bash -$ nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager -$ nix-channel --update - -$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-21.05.tar.gz home-manager -$ nix-channel --update - -export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH - -$ nix-shell '' -A install -``` - -5. Copy dotfiles - ```bash - stow --adopt -vt ~ $HOME/dotfiles/home/* - ``` -6. Build nixos -```bash - cd /etc/nixos - sudo nixos-rebuild build --flake "#." -``` - - diff --git a/nix/configuration.nix b/nix/configuration.nix deleted file mode 100755 index bb20bd8..0000000 --- a/nix/configuration.nix +++ /dev/null @@ -1,226 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, callPackage, ... }: - -{ - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; - }; - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./modules/wm.nix - ./modules/syncthing.nix - ./modules/discord.nix - ./modules/gtk.nix - ./modules/hosts.nix - #./modules/picom.nix - ./modules/sound.nix - ./modules/zsh.nix - ./fonts.nix - - - ]; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub.device = "/dev/nvme0n1"; - boot.loader.grub.useOSProber = true; - nixpkgs.config.allowUnfree = true; - nixpkgs.config.allowBroken = true; - networking.hostName = "lap"; # Define your hostname. - environment.variables = { - MAIN_DISK="/dev/nvme0n1"; - TERMINAL="alacritty"; - }; - # let inputs = { - # home-manager = { - # url = "github:rycee/home-manager/release-20.09"; - # inputs = { - # nixpkgs.follows = "nixpkgs"; - # }; - # }; - # nur.url = "github:nix-community/NUR"; - # emacs-overlay.url = "github:nix-community/emacs-overlay"; - # neovim-overlay.url = "github:nix-community/neovim-nightly-overlay"; - # - # nixpkgs.url = "github:nixos/nixpkgs/nixos-20.09"; - # unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # master.url = "github:nixos/nixpkgs/master"; - #}; - # - # nur = final: prev: { - # nur = import inputs.nur { nurpkgs = final.unstable; pkgs = final.unstable; }; - # }; - # networking.wireless.enable = true; - # enable = true; - # networks={ - # Goga = { - # hidden = true; - # pskRaw = "aaeb0f9e9709a1f25bc93d34290054849e3f8b37071801bbfa4eef5e2eac5084"; - # }; - # }; - # }; - # Set your time zone. - time.timeZone = "Europe/Moscow"; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = false; - networking.interfaces.wlp2s0.useDHCP = true; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "us"; - }; - - - - # Configure keymap in X11 - # Enable CUPS to print documents. - services.printing.enable = true; - services.blueman.enable = true; - hardware.bluetooth.enable = true; - # Enable sound. - - # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; - services.xserver.libinput.touchpad.tapping = true; - services.xserver.libinput.touchpad.disableWhileTyping = true; - # TODO create touchpad.nix - # Define a user account. Don't forget to set a password with ‘passwd’. - users.defaultUserShell = pkgs.zsh; - users.users.horhik = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "audio" "docker" "light" "adbusers" ]; # Enable ‘sudo’ for the user. - }; - system.autoUpgrade.enable = true; - system.autoUpgrade.channel = https://nixos.org/channels/nixos-unstable; - # List packages installed in system profile. To search, run: - # $ nix search wget - - environment.systemPackages = with pkgs; [ - papirus-icon-theme pop-gtk-theme - wget git vim neovim emacs alacritty xterm zsh tmux stow dunst - # haskellPackages.xmonad haskellPackages.xmonad-contrib haskellPackages.xmonad-utils - haskellPackages.xmobar - tabbed - i3 surf dmenu st qutebrowser - lightdm rofi nitrogen rofi-emoji - mononoki fontmatrix - firefox - connman - wpa_supplicant python3 xkblayout-state acpi yaru-theme xkb-switch - pipewire pulsemixer nerdfonts gnupg - feh compton ninja meson cmake - anki clang_12 zathura redshift rustup neofetch tree - killall audacity thefuck - polkit etcher gsettings-qt appimage-run pamixer unzip qjackctl gnome3.nautilus bluez pkgconfig pavucontrol bpytop - #nur.repos.reedrw.picom-next-ibhagwan - spotify obsidian discord - nfs-utils cifs-utils - nfs-ganesha - transmission - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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 = "20.09"; # Did you read the comment? - ### OH MY ZSH ### - - #programs.zsh.interactiveShellInit = '' - # export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/ - # export CC=/usr/bin/clang - # export CXX=/usr/bin/clang++ - # export _JAVA_AWT_WM_NONREPARENTING=1 - # export ANDROID_SDK_ROOT=/home/horhik/Android/Sdk/ - # export NDK_HOME=/home/horhik/Android/Sdk/ndk/22.0.7026061/ - # ZSH_THEME="cloud" - # plugins=(git colorize colored-man-pages emoji rustup sudo zsh-syntax-highlighting zsh-autosuggestions zsh-completions) - # autoload -U compinit && compinit - # source $ZSH/oh-my-zsh.sh - # export PATH=$HOME/.local/bin:$PATH - # export PATH=/usr/local/bin:$PATH - # export PATH=$HOME/.cargo/bin:$PATH - # export PATH=$HOME/.emacs.d/bin:$PATH - # export PATH=$HOME/Desktop:$PATH - # export PATH=/home/horhik/code/projects/potato-notify:$PATH - # export PATH="/root/.deno/bin:$PATH" - # alias vim=nvim - # alias vi=vim - # alias libvirtdaemon="sudo start-stop-daemon --start libvirtd" - # alias virtm="sudo start-stop-daemon --start virtlogd &; sudo start-stop-daemon --start libvirtd &; virt-manager &" - # alias clip=xclip -selection clipboard - # alias suspend="loginctl suspend" - # if [ -f '/home/horhik/yandex-cloud/path.bash.inc' ]; then source '/home/horhik/yandex-cloud/path.bash.inc'; fi - # if [ -f '/home/horhik/yandex-cloud/completion.zsh.inc' ]; then source '/home/horhik/yandex-cloud/completion.zsh.inc'; fi - # alias rd='rustc -g --emit="obj,link"' - # - # - # alias rdr=compile_and_run - # alias aia=ankiaudio - # alias picom="killall picom; picom --experimental-backends &;" - # alias cc="cargo check" - # alias ct="cargo test" - # alias gc="git clone" - # alias gs="git status" - # alias vim="nvim" - # - # neofetch - # - # eval $(thefuck --alias) - # source $ZSH/oh-my-zsh.sh - #''; - # - # - - - ### FONTS ### - - - - - programs.adb.enable = true; - services.emacs.package = pkgs.emacsUnstable; - - nixpkgs.overlays = [ - (import (builtins.fetchTarball { - url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; - sha256 = "039kk45r6pqsfd865lgfiwbaqlpll4p9pmndbzhi6l5w5r8dbabm"; - })) - ]; -} diff --git a/nix/flake.lock b/nix/flake.lock deleted file mode 100755 index 69a7052..0000000 --- a/nix/flake.lock +++ /dev/null @@ -1,115 +0,0 @@ -{ - "nodes": { - "emacs-overlay": { - "locked": { - "lastModified": 1622448019, - "narHash": "sha256-FngdKykveXHR0ZxHgRIccwBowwm6F/VKtwwilw3EE6w=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "226f1d5d6933d154be74d0c190babd24433ca442", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1622312560, - "narHash": "sha256-xBWgiwnPaL/iZasPxw3BuvPAee/2jiToiZjKvKLs+PA=", - "owner": "rycee", - "repo": "home-manager", - "rev": "ab64dc32493996c24607eab2cae6663466ddfb8a", - "type": "github" - }, - "original": { - "owner": "rycee", - "ref": "release-21.05", - "repo": "home-manager", - "type": "github" - } - }, - "master": { - "locked": { - "lastModified": 1622448234, - "narHash": "sha256-QMfDneuVqjRHRKEFv2jAtFKdD/thptbvbkNbkYO6bcA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "27165e70ad737782ec76c1d1885bee57caa6ae4d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1622282707, - "narHash": "sha256-+GOrUDsdneUqrOm9d+9bHXjEVoVcU8tm14WGVzbt6gg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6933d068c5d2fcff398e802f7c4e271bbdab6705", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nur": { - "locked": { - "lastModified": 1622447676, - "narHash": "sha256-o58Fl8vmy8jG5T7ojGQ1Cg5zJCCKdHgn0DgPo0TgY/Y=", - "owner": "nix-community", - "repo": "NUR", - "rev": "6ae5440a6f830621670f86d3f9f42df7d6a0f2d0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "root": { - "inputs": { - "emacs-overlay": "emacs-overlay", - "home-manager": "home-manager", - "master": "master", - "nixpkgs": "nixpkgs", - "nur": "nur", - "unstable": "unstable" - } - }, - "unstable": { - "locked": { - "lastModified": 1622282707, - "narHash": "sha256-+GOrUDsdneUqrOm9d+9bHXjEVoVcU8tm14WGVzbt6gg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6933d068c5d2fcff398e802f7c4e271bbdab6705", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/flake.nix b/nix/flake.nix deleted file mode 100755 index 0fb5cd4..0000000 --- a/nix/flake.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - description = "Main configuration on top of nix flakes"; - inputs = { - home-manager = { - url = "github:rycee/home-manager/release-21.05"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; - nur.url = "github:nix-community/NUR"; - emacs-overlay.url = "github:nix-community/emacs-overlay"; - - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - master.url = "github:nixos/nixpkgs/master"; - }; - - outputs = inputs@{ self, home-manager, nur, nixpkgs, ... }: - let - inherit (builtins) listToAttrs attrValues attrNames readDir; - inherit (nixpkgs) lib; - inherit (lib) removeSuffix; - pkgs = (import nixpkgs) { - system = "x86_64-linux"; - config = { - allowUnfree = true; - }; - overlays = attrValues self.overlays; - }; - - in - { - overlays = - let - overlayFiles = listToAttrs (map - (name: { - name = removeSuffix ".nix" name; - value = import (./overlays + "/${name}"); - }) - (attrNames (readDir ./overlays))); - in - overlayFiles // { - nur = final: prev: { - nur = import inputs.nur { nurpkgs = final.unstable; pkgs = final.unstable; }; - }; - emacs-overlay = inputs.emacs-overlay.overlay; - unstable = final: prev: { - unstable = import inputs.unstable { - system = final.system; - config = { - allowUnfree = true; - }; - }; - }; - master = final: prev: { - master = import inputs.master { - system = final.system; - config = { - allowUnfree = true; - }; - }; - }; - }; - nixosConfigurations.lap = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - ./hardware-configuration.nix - home-manager.nixosModules.home-manager - ({ - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.horhik = { - imports = [ - ./modules/picom.nix - ./modules/tmux.nix - ./modules/bspwm - ]; - }; - }) - - { nixpkgs.overlays = overlays; } - ]; - inherit pkgs; - }; - }; -} diff --git a/nix/fonts.nix b/nix/fonts.nix deleted file mode 100755 index 5703a90..0000000 --- a/nix/fonts.nix +++ /dev/null @@ -1,39 +0,0 @@ -{config, pkgs, ...}: -{ - fonts = { - fonts = with pkgs; [ - # icon fonts - material-design-icons - - # normal fonts - noto-fonts - mononoki - noto-fonts-cjk - noto-fonts-emoji - twitter-color-emoji - liberation_ttf_v1 - hack-font - ubuntu_font_family - - # bitmap fonts - gohufont - tewi-font - - # nerdfonts - (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Mononoki" ]; }) - ]; - - # use fonts specified by user rather than default ones - enableDefaultFonts = false; - - # user defined fonts - # the reason there's Noto Color Emoji everywhere is to override DejaVu's - # B&W emojis that would sometimes show instead of some Color emojis - fontconfig.defaultFonts = { - serif = [ "Noto Serif" "Twitter Color Emoji" ]; - sansSerif = [ "Noto Sans" "Twitter Color Emoji"]; - monospace = [ "Mononoki Nerd Font" "Twitter Color Emoji"]; - emoji = [ "Twitter Color Emoji" ]; - }; - }; -} diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix deleted file mode 100755 index e5525c2..0000000 --- a/nix/hardware-configuration.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/906b2b92-4e31-4a91-938f-14ac752dffe7"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/8200-D543"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/98b5b158-730a-470c-95f1-d8a32ebff9ad"; } - ]; - -} diff --git a/nix/install b/nix/install deleted file mode 100755 index 48883c4..0000000 --- a/nix/install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -nix-channel --add https://github.com/nix-community/home-manager/archive/release-20.09.tar.gz home-manager -nix-channel --update - diff --git a/nix/modules/#picom.nix# b/nix/modules/#picom.nix# deleted file mode 100755 index e8945b3..0000000 --- a/nix/modules/#picom.nix# +++ /dev/null @@ -1,23 +0,0 @@ -{config, pkgs, ...}: -{ - services.picom = { - # package = pkgs.nur.repos.reedrw.picom-next-ibhagwan; - enable = true; - #detect-rounded-corners = true; - backend = "glx"; - shadow = true; - vSync = true; - activeOpacity = 1.0; - inactiveOpacity = 0.75 ; - experimentalBackends = true; - settings = { - blur = { - method = "kawase"; - size = 50; - deviation = 7.0; - }; - }; - }; - - -} diff --git a/nix/modules/bspwm.nix b/nix/modules/bspwm.nix deleted file mode 100644 index b33c2cc..0000000 --- a/nix/modules/bspwm.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: -{ - services.xserver.windowManager.bspwm.enable = true; - home.packages = [pkgs.sxhdkd]; -} diff --git a/nix/modules/discord.nix b/nix/modules/discord.nix deleted file mode 100755 index 60b76b9..0000000 --- a/nix/modules/discord.nix +++ /dev/null @@ -1,4 +0,0 @@ -{config, pkgs, ...}: -{ - # nixpkgs.overlays = [(self: super: { discord = super.discord.overrideAttrs (_: { src = builtins.fetchTarball "https://discord.com/api/download/stable?platform=linux&format=tar.gz"; });})]; -} diff --git a/nix/modules/gtk.nix b/nix/modules/gtk.nix deleted file mode 100755 index fad9b86..0000000 --- a/nix/modules/gtk.nix +++ /dev/null @@ -1,23 +0,0 @@ -{config, pkgs, ...}: -{ - programs.dconf.enable = true; - services.gnome.evolution-data-server.enable = true; - services.gnome.gnome-keyring.enable = true; - services.xserver.desktopManager.cde.extraPackages = with pkgs; - options.services.xserver.desktopManager.cde.extraPackages.default ++ [ - cde-gtk-theme - yaru-theme - ]; - environment.etc."xdg/gtk-2.0/gtkrc".text = '' - gtk-theme-name="Yaru-dark" - ''; - environment.etc."xdg/gtk-3.0/settings.ini".text = '' - [Settings] - gtk-theme-name=Yaru-dark - ''; - qt5 = { - enable = true; - platformTheme = "gtk2"; - style = "gtk2"; - }; -} diff --git a/nix/modules/hosts.nix b/nix/modules/hosts.nix deleted file mode 100755 index 1524ea0..0000000 --- a/nix/modules/hosts.nix +++ /dev/null @@ -1,10 +0,0 @@ -{config, pkgs, ...}: -{ - networking.extraHosts = - '' - 127.0.0.1 www.youtube.com - 127.0.0.1 m.youtube.com - 127.0.0.1 youtube.com - ''; - -} diff --git a/nix/modules/picom.nix b/nix/modules/picom.nix deleted file mode 100755 index eb0e73a..0000000 --- a/nix/modules/picom.nix +++ /dev/null @@ -1,112 +0,0 @@ -# This file is generated from "README.org" -{ pkgs, ... }: -{ - services.picom.enable = true; - services.picom.package = pkgs.nur.repos.reedrw.picom-next-ibhagwan; - services.picom.shadow = true; - services.picom.vSync = true; -# services.picom.inactiveOpacity = "0.8"; -# services.picom.inactiveDim = "0.7"; - services.picom.backend = "glx"; - services.picom.experimentalBackends = true; - services.picom.opacityRule = [ - "80:class_g = 'Zathura'" - "80:class_g = 'Discord'" - "80:class_g = 'Emacs'" - "60:class_g = 'Anki'" - "100:class_g = 'keynav'" - "85:class_g = 'Alacritty'" - ]; - services.picom.shadowExclude = [ - "class_g = 'Navigator'" - ]; -# services.picom.winTypes = -# { -# normal = { -# fade = false; -# shadow = true; -# }; -# tooltip = { -# fade = true; -# shadow = true; -# opacity = 0.75; -# focus = true; -# full-shadow = false; -# round-borders = 0; corner-radius = 0; -# }; -# dock = { -# shadow = false; -# round-borders = 0; -# corner-radius = 0; -# }; -# dnd = { -# shadow = true; -# round-borders = 0; -# corner-radius = 0; -# }; -# popup_menu = { -# opacity = 0.8; -# }; -# dropdown_menu = { -# opacity = 0.8; -# }; -# }; - services.picom.extraOptions = '' - #inactive-dim = 0.5; - #active-opacity = 1.0; - detect-client-opacity = true; - detect-rounded-corners = true; - blur: - { - method = "kawase"; - strength = 8; - background = false; - background-frame = false; - background-fixed = false; - }; - blur-background-exclude = [ - "class_g = 'keynav'", - "class_g = 'Dunst'", - "class_g = 'Navigator'", - "class_g = 'Firefox'" - ]; - corner-radius = 0; - rounded-corners-exclude = [ - "window_type = 'dock'", - "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'", - "class_g = 'keynav'" - ]; - round-borders = 0; - round-borders-exclude = [ - "class_g = 'keynav'", - "class_g = 'Xmonad'", - "class_g = 'xmobar'", - "class_g = 'simpleTabbed'", - "class_g = 'tabbed'" - ]; - ''; -} - -/* -{config, pkgs, ...}: -{ - services.picom = { - package = pkgs.nur.repos.reedrw.picom-next-ibhagwan; - enable = true; - #detect-rounded-corners = true; - backend = "glx"; - activeOpacity = 1.0; - inactiveOpacity = 0.75 ; - experimentalBackends = true; - settings = { - blur = { - method = "gaussian"; - size = 50; - deviation = 7.0; - }; - }; - }; - - -} -*/ diff --git a/nix/modules/sound.nix b/nix/modules/sound.nix deleted file mode 100755 index 00058ae..0000000 --- a/nix/modules/sound.nix +++ /dev/null @@ -1,65 +0,0 @@ -{config, pkgs, ...}: -{ - ### PIPEWIRE ### - hardware.pulseaudio.enable = true; - hardware.pulseaudio.support32Bit = true; - nixpkgs.config.pulseaudio = true; - # sound - # security.rtkit.enable = true; - # services.pipewire = { - # enable = true; - # alsa.enable = true; - # alsa.support32Bit = true; - # #jack.enable = true; - # pulse.enable = true; - # media-session.enable = true; - # }; - # config = { - # pipewire = { - # "context.properties" = { - # # Properties for the DSP configuration. - # "default.clock.rate" = 48000; - # "default.clock.quantum" = 256; - # "default.clock.min-quantum" = 16; - # }; - # }; - # }; - # - # config.pipewire-pulse = { - # "context.properties" = { - # "log.level" = 2; - # }; - # "context.modules" = [ - # { - # name = "libpipewire-module-rtkit"; - # args = { - # "nice.level" = -15; - # "rt.prio" = 88; - # "rt.time.soft" = 200000; - # "rt.time.hard" = 200000; - # }; - # flags = [ "ifexists" "nofail" ]; - # } - # { name = "libpipewire-module-protocol-native"; } - # { name = "libpipewire-module-client-node"; } - # { name = "libpipewire-module-adapter"; } - # { name = "libpipewire-module-metadata"; } - # { - # name = "libpipewire-module-protocol-pulse"; - # args = { - # "pulse.min.req" = "32/48000"; - # "pulse.default.req" = "32/48000"; - # "pulse.max.req" = "32/48000"; - # "pulse.min.quantum" = "32/48000"; - # "pulse.max.quantum" = "32/48000"; - # "server.address" = [ "unix:native" ]; - # }; - # } - # ]; - # "stream.properties" = { - # "node.latency" = "32/48000"; - # "resample.quality" = 1; - # }; - # }; - # }; -} diff --git a/nix/modules/syncthing.nix b/nix/modules/syncthing.nix deleted file mode 100755 index 9ff3a88..0000000 --- a/nix/modules/syncthing.nix +++ /dev/null @@ -1,10 +0,0 @@ -{config, pkgs, ...}: -{ - services.syncthing = { - enable = true; - user = "horhik"; - dataDir = "/home/horhik/Notes"; - configDir = "/home/horhik/.config/syncthing"; - }; - -} diff --git a/nix/modules/tmux.nix b/nix/modules/tmux.nix deleted file mode 100644 index 8c704bf..0000000 --- a/nix/modules/tmux.nix +++ /dev/null @@ -1,50 +0,0 @@ -{config, pkgs, ...}: - { - enable = true; - clock24 = true; - home.packages = [pkgs.tmuxPlugins.gruvbox ]; - extraTmuxConf = '' - set -g @plugin 'egel/tmux-gruvbox' - set -g @tmux-gruvbox 'dark' # or 'light' - # List of plugins - set -g @plugin 'tmux-plugins/tpm' - set -g @plugin 'tmux-plugins/tmux-sensible' - set -g mouse on - - set -g history-limit 500000 - - setw -g monitor-activity on - set -g visual-activity on - - set -g status-justify centre - #run '~/.config/tmux/plugins/tpm/tpm' - - - # Activity monitoring - set-option -g prefix C-space - setw -g monitor-activity on - set -g visual-activity on - - # Vi copypaste mode - set-window-option -g mode-keys vi - bind-key -T copy-mode-vi v send-keys -X begin-selection - bind-key -T copy-mode-vi y send-keys -X copy-selection - # enable by r + v - bind-key -T copy-mode-vi r send-keys -X rectangle-toggle - - # word seperators for automatic word selection - setw -g word-separators ' ' - - # hjkl pane traversal - bind h select-pane -L - bind j select-pane -D - bind k select-pane -U - bind l select-pane -R - - # HJKL resize pane - bind -r K resize-pane -U - bind -r J resize-pane -D - bind -r H resize-pane -L - bind -r L resize-pane -R - ''; -} diff --git a/nix/modules/wm.nix b/nix/modules/wm.nix deleted file mode 100755 index d0758d3..0000000 --- a/nix/modules/wm.nix +++ /dev/null @@ -1,26 +0,0 @@ -{config, pkgs, ...}: -{ - services.dbus.packages = with pkgs; [ gnome2.GConf ]; - programs.dconf.enable = true; - services.xserver = { - enable = true; - layout = "us"; - xkbOptions = "eurosign:e"; - windowManager.i3.enable = true; - displayManager.gdm.enable = true; - displayManager.setupCommands = "xrandr --output HDMI-A-0 --left-of eDP"; - desktopManager.gnome.enable = true; - windowManager.xmonad = { - enable = true; - enableContribAndExtras = true; - extraPackages = haskellPackages: [ - haskellPackages.xmonad-contrib - haskellPackages.xmonad-extras - haskellPackages.xmonad-utils - haskellPackages.xmonad - haskellPackages.xmobar - ]; - }; - displayManager.defaultSession = "none+xmonad"; - }; -} diff --git a/nix/modules/zsh.nix b/nix/modules/zsh.nix deleted file mode 100755 index 161f06f..0000000 --- a/nix/modules/zsh.nix +++ /dev/null @@ -1,20 +0,0 @@ -{config, pkgs, ...}: -{ - programs.zsh.promptInit = ""; - programs.zsh = { - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - enable = true; - # ohMyZsh = { - # enable = true; - # plugins = ["git" "colorize" "colored-man-pages" "emoji" "rustup" "sudo" "zsh-syntax-highlighting" "zsh-autosuggestions" "zsh-completions"]; - # theme = "cloud"; - # customPkgs = [ - # pkgs.zsh-syntax-highlighting - # pkgs.zsh-autosuggestions - # pkgs.zsh-completions - # ]; - # }; - }; - -} diff --git a/nix/overlays/neofetch.nix b/nix/overlays/neofetch.nix deleted file mode 100755 index 5f6d4ab..0000000 --- a/nix/overlays/neofetch.nix +++ /dev/null @@ -1,13 +0,0 @@ -# This file is generated from "README.org" -final: prev: -{ - neofetch = prev.neofetch.overrideAttrs (old: rec { - version = "unstable-2020-11-02"; - src = prev.fetchFromGitHub { - owner = "dylanaraps"; - repo = "neofetch"; - rev = "5dfce0f9c3068d4d8a49d0b7182bdace61b8f4d0"; - sha256 = "131r07wllkvrcgw0ndyf5avqpzqkym56ii0qck6qyjfa8ylx6s31"; - }; - }); -} diff --git a/nix/overlays/overrides.nix b/nix/overlays/overrides.nix deleted file mode 100755 index d7dc97f..0000000 --- a/nix/overlays/overrides.nix +++ /dev/null @@ -1,9 +0,0 @@ -# This file is generated from "README.org" -final: prev: -{ - inherit (final.unstable) lua; - inherit (final.unstable) fish; - inherit (final.master) youtube-dl; - inherit (final.master) mpv; - inherit (final.unstable) fzf; -} diff --git a/nix/overlays/packages.nix b/nix/overlays/packages.nix deleted file mode 100755 index 8090c43..0000000 --- a/nix/overlays/packages.nix +++ /dev/null @@ -1,7 +0,0 @@ -# This file is generated from "README.org" -final: prev: rec { - apple-color-emoji = prev.callPackage ../packages/apple-color-emoji { }; - tamzen-nerdfont = prev.callPackage ../packages/tamzen-nerdfont { }; - palenight-gtk-theme = prev.callPackage ../packages/palenight-gtk-theme { }; - vifmimg = prev.callPackage ../packages/vifmimg { }; -} diff --git a/nix/packages/apple-color-emoji/default.nix b/nix/packages/apple-color-emoji/default.nix deleted file mode 100755 index 3f93b66..0000000 --- a/nix/packages/apple-color-emoji/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "apple-color-emoji-${version}"; - version = "2020-06-30"; - - src = fetchurl { - url = https://github.com/samuelngs/apple-emoji-linux/releases/download/latest/AppleColorEmoji.ttf; - sha256 = "0xaclj29b7xgqin8izkabrm2znp1m01894fngyxrhwbf9nbncp4g"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "./"; - - unpackCmd = '' - cp $curSrc ./AppleColorEmoji.ttf - ''; - - installPhase = '' - mkdir -p $out/share/fonts/apple-color-emoji - cp *.ttf $out/share/fonts/apple-color-emoji - ''; - - meta = { - description = "Apple Color Emoji is a color typeface used by iOS and macOS to display emoji"; - homepage = https://github.com/samuelngs/apple-emoji-linux; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - }; - -} - -# vim: foldmethod=marker shiftwidth=4 ft=nix: diff --git a/nix/packages/palenight-gtk-theme/default.nix b/nix/packages/palenight-gtk-theme/default.nix deleted file mode 100755 index fa9526f..0000000 --- a/nix/packages/palenight-gtk-theme/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, sassc, inkscape, optipng, ... }: - -stdenv.mkDerivation rec { - version = "0.2.0"; - pname = "palenight-gtk-theme"; - - src = fetchFromGitHub { - owner = "jaxwilko"; - repo = "gtk-theme-framework"; - rev = "b695bf4cf153691e485c09c1c744c46b6f025a74"; - sha256 = "0bfhv7ywgmw2s6kfxb7wgpri7gh6yd89gaazj1dxgz690b7mliv7"; - }; - - nativeBuildInputs = [ sassc inkscape optipng ]; - - postPatch = '' - patchShebangs . - ''; - - buildPhase = '' - ./main.sh -vcf - ''; - - installPhase = '' - mkdir -p $out/share/themes - mv ./dist/palenight/theme ./dist/palenight/palenight - cp -r ./dist/palenight/palenight $out/share/themes - ''; - -} diff --git a/nix/packages/spleen-otf/default.nix b/nix/packages/spleen-otf/default.nix deleted file mode 100755 index f6e2025..0000000 --- a/nix/packages/spleen-otf/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file is generated from "README.org" -{ stdenv, lib, fetchurl, mkfontscale }: - -let - pname = "spleen-otf"; - version = "1.8.2"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - sha256 = "1pvg34xzi2cqgwpcl56j55rlwz44qasv3fa1jln2b1il8272s9hn"; - }; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "./"; - unpackCmd = '' - tar xvf $curSrc --strip=1 - ''; - installPhase = '' - d="$out/share/fonts/misc" - install -D -m 644 *.otf -t "$d" - install -D -m 644 *.psfu -t "$out/share/consolefonts" - install -m644 fonts.alias-spleen $d/fonts.alias - - # create fonts.dir so NixOS xorg module adds to fp - ${mkfontscale}/bin/mkfontdir "$d" - ''; - -} diff --git a/nix/packages/tamzen-nerdfont/default.nix b/nix/packages/tamzen-nerdfont/default.nix deleted file mode 100755 index c277c06..0000000 --- a/nix/packages/tamzen-nerdfont/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchFromGitHub, stdenv, fetchurl, size ? [ ] }: - -# select size from -# 10x20 5x9 6x12 7x13 7x14 8x15 8x16 -let - knownSize = "7x14"; - selectedSize = - if (size == [ ]) then - knownSize - else - size - ; - -in -stdenv.mkDerivation rec { - name = "tamzen-nerdfont-${version}"; - version = "1.11"; - - src = fetchFromGitHub { - "owner" = "btwiusegentoo"; - "repo" = "tamzen-nerdfont"; - "rev" = "5ccaef6ad5187818c883648a19841b1ea34a418d"; - "sha256" = "0ay1gk9ql51xkl2gq302lv9sbz4djqmw1zg7anm04hvszga8dmh5"; - }; - - phases = [ "installPhase" ]; - - sourceRoot = "./"; - - installPhase = '' - mkdir -p $out/share/fonts/tamzen-nerdfont - cp ${src}/patchedtamzen/Tamzen${selectedSize}r.ttf $out/share/fonts/tamzen-nerdfont - cp ${src}/patchedtamzen/Tamzen${selectedSize}b.ttf $out/share/fonts/tamzen-nerdfont - ''; - - meta = { - description = ":love_letter: Bitmapped programming font, based on Tamsyn"; - homepage = https://github.com/btwiusegentoo/tamzen-nerdfont; - maintainers = [ ]; - }; - -} -# vim: foldmethod=marker shiftwidth=4 ft=nix: diff --git a/nix/packages/vifmimg/default.nix b/nix/packages/vifmimg/default.nix deleted file mode 100755 index a9005a6..0000000 --- a/nix/packages/vifmimg/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchFromGitHub, ... }: - -stdenv.mkDerivation rec { - version = "unstable-2020-06-23"; - pname = "vifmimg"; - - src = fetchFromGitHub { - owner = "cirala"; - repo = "vifmimg"; - rev = "afe4f159e1acc9a54dd3a2dc28850f11f97c1ebf"; - sha256 = "11pbfayww7pwyk8a7jgvijx9i96ahyvn5y84gpn0yjd0b9wf75bn"; - }; - - installPhase = '' - mkdir -p $out/bin - cp vifm* $out/bin - ''; -} diff --git a/nix/programs/mpv.nix b/nix/programs/mpv.nix deleted file mode 100755 index e69de29..0000000 diff --git a/nix/programs/qutebrowser.nix b/nix/programs/qutebrowser.nix deleted file mode 100755 index e69de29..0000000 diff --git a/nix/programs/spotify.nix b/nix/programs/spotify.nix deleted file mode 100755 index e69de29..0000000 diff --git a/nix/programs/vifm.nix b/nix/programs/vifm.nix deleted file mode 100755 index e69de29..0000000 diff --git a/nix/programs/vim.nix b/nix/programs/vim.nix deleted file mode 100755 index e69de29..0000000 diff --git a/nix/programs/zsh.nix b/nix/programs/zsh.nix deleted file mode 100755 index e69de29..0000000