diff options
Diffstat (limited to '')
| -rw-r--r-- | config/dunst/dunstrc | 94 | ||||
| -rw-r--r-- | config/zsh/aliases/dev.zsh | 25 | ||||
| -rw-r--r-- | config/zsh/zshrc | 3 | ||||
| -rw-r--r-- | configuration.nix | 9 | ||||
| -rw-r--r-- | hardware-configuration.nix | 6 | ||||
| -rw-r--r-- | modules/git.home.nix | 4 | ||||
| -rw-r--r-- | modules/work.nix | 11 | ||||
| -rw-r--r-- | packages.nix | 48 |
8 files changed, 100 insertions, 100 deletions
diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index a5bdeb4..f537440 100644 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -12,7 +12,7 @@ # If markup is not allowed, those tags will be stripped out of the # message. markup = yes - + # The format of the message. Possible variables are: # %a appname # %s summary @@ -22,67 +22,51 @@ # %p progress value if set ([ 0%] to [100%]) or nothing # Markup is allowed format = "<b>%a: </b>\n<i>%s</i>\n%b\n" - + # Sort messages by urgency. sort = yes - + # Show how many messages are currently hidden (because of geometry). indicate_hidden = yes - + # Alignment of message text. # Possible values are "left", "center" and "right". alignment = left - - # The frequency with wich text that is longer than the notification - # window allows bounces back and forth. - # This option conflicts with "word_wrap". - # Set to 0 to disable. - bounce_freq = 0 - + # Show age of message if message is older than show_age_threshold # seconds. # Set to -1 to disable. show_age_threshold = 60 - + # Split notifications into multiple lines if they don't fit into # geometry. word_wrap = yes - + # Ignore newlines '\n' in notifications. ignore_newline = no - - - # The geometry of the window: - # [{width}]x{height}[+/-{x}+/-{y}] - # The geometry of the message window. - # The height is measured in number of notifications everything else - # in pixels. If the width is omitted but the height is given - # ("-geometry x2"), the message window expands over the whole screen - # (dmenu-like). If width is 0, the window expands to the longest - # message displayed. A positive x is measured from the left, a - # negative from the right side of the screen. Y is measured from - # the top and down respectevly. - # The width can be negative. In this case the actual width is the - # screen width minus the width defined in within the geometry option. - geometry = "500x5-30+20" - + + # Dimensions + width = 450 + height = 300 + offset = 20x30 + # Shrink window if it's smaller than the width. Will be ignored if # width is 0. shrink = no - + # The transparency of the window. Range: [0; 100]. # This option will only work if a compositing windowmanager is # present (e.g. xcompmgr, compiz, etc.). transparency = 0 - + # Don't remove messages, if the user is idle (no mouse or keyboard input) # for longer than idle_threshold seconds. # Set to 0 to disable. idle_threshold = 120 - + # Which monitor should the notifications be displayed on. monitor = 0 - + # Display notification on focused monitor. Possible modes are: # mouse: follow mouse pointer # keyboard: follow window with keyboard focus @@ -95,33 +79,33 @@ # If this option is set to mouse or keyboard, the monitor option # will be ignored. follow = mouse - + # Should a notification popped up from history be sticky or timeout # as if it would normally do. sticky_history = yes # Maximum amount of notifications kept in history history_length = 20 - + # Display indicators for URLs (U) and actions (A). show_indicators = yes - + # The height of a single line. If the height is smaller than the # font height, it will get raised to the font height. # This adds empty space above and under the text. line_height = 0 - + # Draw a line of "separatpr_height" pixel height between two # notifications. # Set to 0 to disable. separator_height = 2 - + # Padding between text and separator. padding = 12 - + # Horizontal padding. horizontal_padding = 15 - + # Define a color for the separator. # possible values are: # * auto: dunst tries to find a color fitting to the background; @@ -129,15 +113,10 @@ # * frame: use the same color as the frame; # * anything else will be interpreted as a X color. separator_color = frame - - # Print a notification on startup. - # This is mainly for error detection, since dbus (re-)starts dunst - # automatically after a crash. - startup_notification = false - + # dmenu path. dmenu = dmenu - + # Browser for opening urls in context menu. browser = xdg-open @@ -151,27 +130,6 @@ frame_width = 1 frame_color = "#6f8285" -[shortcuts] - - # Shortcuts are specified as [modifier+][modifier+]...key - # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", - # "mod3" and "mod4" (windows-key). - # Xev might be helpful to find names for keys. - - # Close notification. - close = ctrl+space - - # Close all notifications. - close_all = ctrl+shift+space - - # Redisplay last message(s). - # On the US keyboard layout "grave" is normally above TAB and left - # of "1". - history = ctrl+grave - - # Context menu. - context = ctrl+shift+period - [urgency_low] background = "#7e6aD3" foreground = "#ffffff" diff --git a/config/zsh/aliases/dev.zsh b/config/zsh/aliases/dev.zsh index 6a9d8f3..4b6108b 100644 --- a/config/zsh/aliases/dev.zsh +++ b/config/zsh/aliases/dev.zsh @@ -73,3 +73,28 @@ p__load_nix_shell_file() { zle -N p__load_nix_shell_file; bindkey '^N' p__load_nix_shell_file; + + +# Enter shell +p__enter_nixshell() { + if [[ -f "./default.nix" ]] || [[ -f "./shell.nix" ]]; then + shell="nix-zsh" + if [[ -f "./shell.nix" ]]; then + shell="nix-zsh ./shell.nix" + fi + $shell + zle send-break + return 0; + else + echo ""; + echo "ERR: default.nix already exists in directory"; + zle send-break; + return 1; + fi; +} + +zle -N p__enter_nixshell; +bindkey '^X' p__enter_nixshell; + +alias fix-interpreter="nix-shell -p patchelf --run 'patchelf --set-interpreter \$(patchelf --print-interpreter \$(which mkdir))'" + diff --git a/config/zsh/zshrc b/config/zsh/zshrc index c3fde13..9bf0e26 100644 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -18,6 +18,9 @@ export ZSH_CUSTOM_CONF_FILES="$HOME/.config/zsh"; for f in $ZSH_CUSTOM_CONF_FILES/*.zsh; do source $f; done; source $ZSH_CUSTOM_CONF_FILES/aliases.zsh; +# Direnv setup +eval "$(direnv hook zsh)" + # Plugins # source ~/.config/zshplugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh; diff --git a/configuration.nix b/configuration.nix index 1f33cdb..bc3c467 100644 --- a/configuration.nix +++ b/configuration.nix @@ -61,12 +61,12 @@ in firewall = { enable = true; allowedTCPPorts = [ 8080 ]; - allowedUDPPorts = []; + allowedUDPPorts = [ ]; }; networkmanager.enable = true; extraHosts = '' - 127.0.0.1 dev.parlezvous.io - 127.0.0.1 demo.parlezvous.io + 127.0.0.1 phenax.local + 127.0.0.1 hasura.colabra ''; }; @@ -74,7 +74,8 @@ in virtualisation = { docker.enable = true; - lxd.enable = true; + lxd.enable = false; + #anbox.enable = true; }; # I18n and keyboard layout diff --git a/hardware-configuration.nix b/hardware-configuration.nix index d00ff1d..960306f 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -47,9 +47,10 @@ }; # File system + boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/1b40e7b9-b261-4555-8e84-348668345687"; fileSystems = { "/" = { - device = "/dev/disk/by-label/nixos"; + device = "/dev/mapper/nixos"; fsType = "ext4"; }; "/boot" = { @@ -57,8 +58,7 @@ fsType = "vfat"; }; }; - swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - + swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; powerManagement = { enable = true; diff --git a/modules/git.home.nix b/modules/git.home.nix index f3cc423..a8b9b12 100644 --- a/modules/git.home.nix +++ b/modules/git.home.nix @@ -37,7 +37,7 @@ }; #"pull" = { rebase = true; }; }; - #signing.key = "GPG-KEY-ID"; - #signing.signByDefault = true; + signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849"; + signing.signByDefault = true; }; } diff --git a/modules/work.nix b/modules/work.nix index 383fc37..6266e64 100644 --- a/modules/work.nix +++ b/modules/work.nix @@ -7,10 +7,9 @@ in ./vanta-daemon/module.nix ]; - services.vanta = - { - enable = false; - agentKey = vantaCreds.VANTA_KEY; - email = vantaCreds.VANTA_OWNER_EMAIL; - }; + services.vanta = { + enable = true; + agentKey = vantaCreds.VANTA_KEY; + email = vantaCreds.VANTA_OWNER_EMAIL; + }; } diff --git a/packages.nix b/packages.nix index 24a0cd7..6a68168 100644 --- a/packages.nix +++ b/packages.nix @@ -24,23 +24,19 @@ let ripgrep ctags fzf - git-bug docker-compose + gibo + direnv gcc gnumake nodejs-16_x - python3 - # rustup - godot - blender + # godot + # blender rnix-lsp - # python-language-server - #haskell-language-server # Broken on 8-Sept-2021 - ghc - # cabal-install + efm-langserver ] ++ ( with pkgs.nodePackages; [ typescript @@ -54,22 +50,27 @@ let # Browser qutebrowser brave + # ungoogled-chromium + + # Comm + #slack + # signal-cli + # signal-desktop # Media + spotify mpv sxiv youtube-dl imagemagick ffmpeg-full feh - #monero-gui # Scheduling remind wyrd - # signal-cli - # signal-desktop + #monero-gui lf dunst gotop @@ -77,7 +78,6 @@ let zathura ]; - utils = with pkgs; [ libnotify xcwd @@ -95,7 +95,7 @@ let # Audio alsaUtils qjackctl - qsynth + #qsynth ardour # X stuff @@ -118,11 +118,25 @@ in "ffmpeg-3.4.8" ]; - programs.steam.enable = true; - hardware.steam-hardware.enable = true; + programs = { + adb.enable = true; + }; + + #programs.steam.enable = true; + #hardware.steam-hardware.enable = true; + + # TODO: Remove after https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14505 gets merged and released + # system.replaceRuntimeDependencies = [ + # ({ original = pkgs.mesa; replacement = (import /etc/nixos/tmp-extras/mesa-nixpkgs { }).pkgs.mesa; }) + # ({ original = pkgs.mesa.drivers; replacement = (import /etc/nixos/tmp-extras/mesa-nixpkgs { }).pkgs.mesa.drivers; }) + # ]; # Security wrappers security.wrappers = { - bslock.source = "${localPkgs.bslock}/bin/bslock"; + bslock = { + owner = config.users.users.imsohexy.name; + group = "users"; + source = "${localPkgs.bslock}/bin/bslock"; + }; }; } |