Compare commits

...

2 Commits

Author SHA1 Message Date
marc
10f4940ae1 Added clojure devenv template and more stuff 2023-08-06 17:35:41 +02:00
marc
e9bfdcc27e Add fzf and sshfs 2023-03-15 22:19:59 +01:00
7 changed files with 62 additions and 2 deletions

View File

@@ -88,7 +88,6 @@
:config :config
(setq pipenv-with-projectile t) (setq pipenv-with-projectile t)
(setenv "PIPENV_MAX_DEPTH" "10")) (setenv "PIPENV_MAX_DEPTH" "10"))
;; ----------------------------------------------------------------------------- ;; -----------------------------------------------------------------------------
;; Org ;; Org

View File

@@ -52,6 +52,9 @@
(package! base16-theme) (package! base16-theme)
(package! parinfer) (package! parinfer)
;; Env
(package! inheritenv)
;; Editor ;; Editor
(package! dot-mode) (package! dot-mode)

View File

@@ -0,0 +1,4 @@
if [ -n "${commands[fzf-share]}" ]; then
source "$(fzf-share)/key-bindings.zsh"
source "$(fzf-share)/completion.zsh"
fi

View File

@@ -0,0 +1,28 @@
{
description = "Development flake for this clojure project";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
projectDependencies = with pkgs; [
];
in {
devShells.default = pkgs.mkShell {
nativeBuildInputs = [ pkgs.bashInteractive ];
buildInputs = with pkgs; [
# Core clojure dependencies
clojure
leiningen
# IDE tools
clojure-lsp
# Development tools
] ++ projectDependencies;
};
});
}

View File

@@ -3,7 +3,7 @@
with lib; with lib;
let let
nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; }; nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; };
wallpaper = ../../data/wallpapers/globus.jpg; wallpaper = ../../data/wallpapers/rosa.jpg;
in in
{ {
imports = [ imports = [
@@ -55,6 +55,7 @@ in
}; };
system.gpg.enable = true; system.gpg.enable = true;
system.pass.enable = true; system.pass.enable = true;
system.sshfs.enable = true;
# - Desktop ---------------------------------- # - Desktop ----------------------------------
desktop = { desktop = {
@@ -79,4 +80,7 @@ in
app.discord.enable = true; app.discord.enable = true;
}; };
# - Extra / Temporary --------------------------
programs.dconf.enable = true; # Inkscape crashes
fonts.fonts = [];
} }

View File

@@ -22,6 +22,13 @@
device = "/dev/disk/by-label/BOOT"; device = "/dev/disk/by-label/BOOT";
fsType = "vfat"; fsType = "vfat";
}; };
"/mnt/vatnajokull" = {
device = "vatnajokull:/mnt/raid1";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" "noatime" "x-systemd.idle-timeout=600"];
};
}; };
swapDevices = [ swapDevices = [

15
modules/system/sshfs.nix Normal file
View File

@@ -0,0 +1,15 @@
{ config, lib, pkgs, self, ... }:
let
cfg = config.samfelag.modules.system.sshfs;
in
{
options.samfelag.modules.system.sshfs = {
enable = lib.mkEnableOption "sshfs";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
sshfs
];
};
}