added nix and probably did more I dont remember

This commit is contained in:
Zastian Pretorius
2022-06-18 16:49:38 +01:00
parent 106a426042
commit 42ecf6e4f5
12 changed files with 486 additions and 23 deletions

View File

@@ -47,8 +47,6 @@
'(org-level-4 ((t (:inherit outline-4 :height 1.1))))
'(org-level-5 ((t (:inherit outline-5 :height 1.0))))
)
(require 'elcord)
(elcord-mode)
(org-babel-do-load-languages
'org-babel-load-languages
@@ -57,6 +55,22 @@
(python . t)
(jupyter . t)))
;; accept completion from copilot and fallback to company
(defun my-tab ()
(interactive)
(or (copilot-accept-completion)
(company-indent-or-complete-common nil)))
(use-package! copilot
:hook (prog-mode . copilot-mode)
:bind (("C-TAB" . 'copilot-accept-completion-by-word)
("C-<tab>" . 'copilot-accept-completion-by-word)
:map company-active-map
("<tab>" . 'my-tab)
("TAB" . 'my-tab)
:map company-mode-map
("<tab>" . 'my-tab)
("TAB" . 'my-tab)))
;; Here are some additional functions/macros that could help you configure Doom:
;;
;; - `load!' for loading external *.el files relative to this one

17
doom/.doom.d/custom.el Normal file
View File

@@ -0,0 +1,17 @@
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(warning-suppress-log-types '((initialization)))
'(warning-suppress-types '((initialization) (initialization))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(org-level-1 ((t (:inherit outline-1 :height 1.4))))
'(org-level-2 ((t (:inherit outline-2 :height 1.3))))
'(org-level-3 ((t (:inherit outline-3 :height 1.2))))
'(org-level-4 ((t (:inherit outline-4 :height 1.1))))
'(org-level-5 ((t (:inherit outline-5 :height 1.0)))))

View File

@@ -132,7 +132,7 @@
;;fstar ; (dependent) types and (monadic) effects and Z3
;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect
(haskell +lsp) ; a language that's lazier than I am
;;(haskell +lsp) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on
;;json ; At least it ain't XML

View File

@@ -49,7 +49,8 @@
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;(unpin! t)
(package! rainbow-mode)
(package! elcord)
(package! poly-org)
(package! ein)
(package! copilot
:recipe (:host github :repo "zerolfx/copilot.el" :files ("*.el" "dist")))
;;(package! jupyter)

View File

@@ -93,8 +93,8 @@ key = "q"
[[keybind]]
command = "Execute"
value = "betterlockscreen"
modifier = ["modkey", "Control"]
value = "betterlockscreen -l"
modifier = ["Mod4"]
key = "l"
[[keybind]]

View File

@@ -0,0 +1,261 @@
modkey = "Mod1"
mousekey = "Mod1"
workspaces = []
tags = ["一", "二", "三", "四", "五", "六", "七", "八", "九"]
layouts = ["MainAndVertStack", "MainAndHorizontalStack", "MainAndDeck", "GridHorizontal", "EvenHorizontal", "EvenVertical", "Fibonacci", "CenterMain", "CenterMainBalanced", "Monocle", "RightWiderLeftStack", "LeftWiderRightStack"]
layout_mode = "Workspace"
scratchpad = []
disable_current_tag_swap = false
focus_behaviour = "Sloppy"
focus_new_windows = true
[[keybind]]
command = "Execute"
value = "rofi -no-lazy-greb -show drun -icon-theme 'Papirus' -show-icons"
modifier = ["modkey"]
key = "d"
[[keybind]]
command = "Execute"
value = "qutebrowser"
modifier = ["modkey"]
key = "b"
[[keybind]]
command = "Execute"
value = "pcmanfm"
modifier = ["modkey"]
key = "f"
[[keybind]]
command = "Execute"
value = "pamixer --allow-boost -i 5"
modifier = []
key = "XF86AudioRaiseVolume"
[[keybind]]
command = "Execute"
value = "pamixer --allow-boost -d 5"
modifier = []
key = "XF86AudioLowerVolume"
[[keybind]]
command = "Execute"
value = "pamixer -t"
modifier = []
key = "XF86AudioMute"
[[keybind]]
command = "Execute"
value = "playerctl play-pause"
modifier = []
key = "XF86AudioPlay"
[[keybind]]
command = "Execute"
value = "playerctl previous"
modifier = []
key = "XF86AudioPrev"
[[keybind]]
command = "Execute"
value = "playerctl next"
modifier = []
key = "XF86AudioNext"
[[keybind]]
command = "Execute"
value = "flameshot gui"
modifier = []
key = "Print"
[[keybind]]
command = "Execute"
value = "kitty"
modifier = ["modkey"]
key = "Return"
[[keybind]]
command = "CloseWindow"
modifier = ["modkey"]
key = "q"
[[keybind]]
command = "SoftReload"
modifier = ["modkey", "Shift"]
key = "r"
[[keybind]]
command = "Execute"
value = "loginctl kill-session $XDG_SESSION_ID"
modifier = ["modkey", "Shift"]
key = "q"
[[keybind]]
command = "Execute"
value = "betterlockscreen -l"
modifier = ["Mod4"]
key = "l"
[[keybind]]
command = "ToggleFullScreen"
modifier = ["modkey"]
key = "t"
[[keybind]]
command = "SwapTags"
modifier = ["modkey"]
key = "w"
[[keybind]]
command = "MoveWindowUp"
modifier = ["modkey", "Shift"]
key = "k"
[[keybind]]
command = "MoveWindowDown"
modifier = ["modkey", "Shift"]
key = "j"
[[keybind]]
command = "FocusWindowUp"
modifier = ["modkey"]
key = "k"
[[keybind]]
command = "FocusWindowDown"
modifier = ["modkey"]
key = "j"
[[keybind]]
command = "NextLayout"
modifier = ["modkey", "Control"]
key = "k"
[[keybind]]
command = "PreviousLayout"
modifier = ["modkey", "Control"]
key = "j"
[[keybind]]
command = "FocusWorkspaceNext"
modifier = ["modkey"]
key = "l"
[[keybind]]
command = "FocusWorkspacePrevious"
modifier = ["modkey"]
key = "h"
[[keybind]]
command = "MoveWindowUp"
modifier = ["modkey", "Shift"]
key = "Up"
[[keybind]]
command = "GotoTag"
value = "1"
modifier = ["modkey"]
key = "1"
[[keybind]]
command = "GotoTag"
value = "2"
modifier = ["modkey"]
key = "2"
[[keybind]]
command = "GotoTag"
value = "3"
modifier = ["modkey"]
key = "3"
[[keybind]]
command = "GotoTag"
value = "4"
modifier = ["modkey"]
key = "4"
[[keybind]]
command = "GotoTag"
value = "5"
modifier = ["modkey"]
key = "5"
[[keybind]]
command = "GotoTag"
value = "6"
modifier = ["modkey"]
key = "6"
[[keybind]]
command = "GotoTag"
value = "7"
modifier = ["modkey"]
key = "7"
[[keybind]]
command = "GotoTag"
value = "8"
modifier = ["modkey"]
key = "8"
[[keybind]]
command = "GotoTag"
value = "9"
modifier = ["modkey"]
key = "9"
[[keybind]]
command = "MoveToTag"
value = "1"
modifier = ["modkey", "Shift"]
key = "1"
[[keybind]]
command = "MoveToTag"
value = "2"
modifier = ["modkey", "Shift"]
key = "2"
[[keybind]]
command = "MoveToTag"
value = "3"
modifier = ["modkey", "Shift"]
key = "3"
[[keybind]]
command = "MoveToTag"
value = "4"
modifier = ["modkey", "Shift"]
key = "4"
[[keybind]]
command = "MoveToTag"
value = "5"
modifier = ["modkey", "Shift"]
key = "5"
[[keybind]]
command = "MoveToTag"
value = "6"
modifier = ["modkey", "Shift"]
key = "6"
[[keybind]]
command = "MoveToTag"
value = "7"
modifier = ["modkey", "Shift"]
key = "7"
[[keybind]]
command = "MoveToTag"
value = "8"
modifier = ["modkey", "Shift"]
key = "8"
[[keybind]]
command = "MoveToTag"
value = "9"
modifier = ["modkey", "Shift"]
key = "9"

View File

@@ -1 +1 @@
/home/mrfluffy/.config/leftwm/themes/dracula_polybar
dracula_polybar

View File

@@ -20,7 +20,7 @@
background = #282a36
foreground = #f8f8f2
background-alt = #99444444
foreground-alt = #2a2a2a
foreground-alt = #f8f8f2
primary = #6e5991
secondary = #363949
alert = #bd2c40
@@ -77,10 +77,10 @@ padding-left = 0
padding-right = 2
module-margin-left = 1
module-margin-right = 2
font-0 = misc fixed:pixelsize=10;1
font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
font-2 = wuncon siji:pixelsize=10;1
modules-center =
font-0 = Ubuntu:pixelsize=10;1
font-1 = Source Han Sans JP:pixelsize=10;1
font-2 = siji:pixelsize=10;1
modules-center =
modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth battery date powermenu
tray-position = right
tray-padding = 2
@@ -268,7 +268,7 @@ ramp-signal-foreground = ${colors.foreground-alt}
[module/eth]
type = internal/network
interface = enp0s25
interface = enp3s0
interval = 3.0
format-connected-underline = #55aa55
@@ -411,9 +411,9 @@ expand-right = true
format-spacing = 1
label-open = 
label-open-foreground = ${colors.secondary}
label-open-foreground = ${colors.foreground}
label-close =  cancel
label-close-foreground = ${colors.secondary}
label-close-foreground = ${colors.forground}
label-separator = |
label-separator-foreground = ${colors.foreground-alt}

View File

@@ -20,14 +20,10 @@ fi
#set the theme.toml config
leftwm-command "LoadTheme $SCRIPTPATH/theme.toml"
#set background
if [ -x "$(command -v feh)" ]; then
feh --bg-scale $SCRIPTPATH/background.jpg
fi
index=0
monitors="$(polybar -m | sed s/:.*//)"
monitors="$(polybar -m | sed s/:.*// | tac)"
leftwm-state -q -n -t $SCRIPTPATH/sizes.liquid | sed -r '/^\s*$/d' | while read -r width x y
do
let indextemp=index+1

View File

@@ -1,7 +1,10 @@
#!/usr/bin/env bash
xrandr --output eDP --mode 1920x1080 --pos 0x0 --rotate normal --output HDMI-A-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal
xrandr --output HDMI-A-0 --set TearFree on &
xrandr --output eDP --set TearFree on &
xss-lock /home/$USER/.config/script/betterlockscreen.sh &
fcitx -d &
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
picom --backend glx &
nitrogen --restore &
numlockx on

View File

@@ -0,0 +1,168 @@
# 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, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.grub.enable = true;
boot.loader.grub.efiSupport = true;
boot.loader.grub.device= "nodev";
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "mrfluffy_nix"; # Define your hostname.
networking.networkmanager.enable = true;
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Set your time zone.
time.timeZone = "Europe/Dublin";
# 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.enp3s0.useDHCP = true;
networking.interfaces.enp4s0f3u2u3.useDHCP = true;
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";
# };
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.windowManager.leftwm.enable = true;
services.xserver.displayManager.startx.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
sound.enable = true;
hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
services.gnome.gnome-keyring.enable = true;
nixpkgs.config = {
allowUnfree = true;
};
programs.zsh.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.mrfluffy = {
shell = pkgs.zsh;
isNormalUser = true;
extraGroups = [ "wheel""networkmanager""video" ]; # Enable sudo for the user.
};
fonts.fonts = with pkgs; [
ubuntu_font_family
siji
unifont
noto-fonts
source-han-code-jp
];
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
neovim
emacs
bat
exa
wget
kitty
light
qutebrowser
brave
rofi
nitrogen
neofetch
zsh
spaceship-prompt
picom
numlockx
openssl
mpv
lxappearance
git
font-manager
btop
xss-lock
fcitx
betterlockscreen
teams
bitwarden
nodejs
zip
xclip
fd
fzf
vscode
libreoffice-fresh
pcmanfm
zotero
jdk11
hunspell
hunspellDicts.en_US
flameshot
pavucontrol
zoxide
xcp
rustup
polybar
stow
polkit_gnome
python38
];
# 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. Its 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 = "21.11"; # Did you read the comment?
}

View File

@@ -1,7 +1,5 @@
#!/bin/sh
eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
export SSH_AUTH_SOCK
xset +fp /home/mrfluffy/.local/share/fonts
xset fp rehash
anamnesis --start
@@ -12,6 +10,11 @@ xrandr --output HDMI-A-0 --set TearFree on &
xrandr --output eDP --set TearFree on &
#exec /home/mrfluffy/.local/bin/xmonad
#exec qtile start
eval $(gnome-keyring-daemon --start)
export SSH_AUTH_SOCK
source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
#mkdir -p "$HOME"/.local/share/keyrings
exec dbus-launch leftwm
#-----------------------------------------------------
#gome session