aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

merge main

Browse source
This commit is contained in:
Anish Lakhwara 2022-04-11 13:58:14 +10:00
parent 01fa77b35a 1b21a4aaa7
commit 48e93b9e72
10 changed files with 84 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1,3 @@
.direnv/ .direnv/
result/
result

201
flake.lock
View file

@ -20,26 +20,6 @@
"type": "github" "type": "github"
} }
}, },
"beautysh": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"poetry2nix": "poetry2nix"
},
"locked": {
"lastModified": 1641830469,
"narHash": "sha256-uhDmgNP/biOWe4FtOa6c2xZnREH+NP9rdrMm0LccRUk=",
"owner": "lovesegfault",
"repo": "beautysh",
"rev": "e85d9736927c0fcf2abb05cb3a2d8d9b4502a2eb",
"type": "github"
},
"original": {
"owner": "lovesegfault",
"repo": "beautysh",
"type": "github"
}
},
"blank": { "blank": {
"locked": { "locked": {
"lastModified": 1625557891, "lastModified": 1625557891,
@ -55,31 +35,6 @@
"type": "github" "type": "github"
} }
}, },
"bud": {
"inputs": {
"beautysh": "beautysh",
"devshell": [
"digga",
"devshell"
],
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1642035816,
"narHash": "sha256-1Lq5c1AeUv/1SK08+O704JVfDdD/zodHzA0cv0TIga8=",
"owner": "divnix",
"repo": "bud",
"rev": "a789d710851441ba7e7cd59be378623b1fe05688",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "bud",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -102,7 +57,6 @@
}, },
"deploy": { "deploy": {
"inputs": { "inputs": {
"fenix": "fenix",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
@ -110,15 +64,15 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1639771334, "lastModified": 1643787431,
"narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=", "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
"owner": "input-output-hk", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f", "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "input-output-hk", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"type": "github" "type": "github"
} }
@ -172,25 +126,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1639117493,
"narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=",
"owner": "nix-community",
"repo": "fenix",
"rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -225,11 +160,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1631561581, "lastModified": 1638122382,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,7 +175,7 @@
}, },
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1639385028, "lastModified": 1639385028,
@ -257,36 +192,6 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
@ -408,7 +313,7 @@
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": "nixlib", "nixlib": "nixlib",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1637655461, "lastModified": 1637655461,
@ -440,53 +345,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1633971123,
"narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1645098413,
"narHash": "sha256-kROvsEv0t0zhl1c57ELsFr0Bkq90VOnQtIdNY8OHZ2U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0e6dd09d2420ff6d6c084e2e1a14c3404d871421",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1638986258,
"narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1644972330, "lastModified": 1644972330,
"narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=",
@ -518,7 +376,7 @@
"nvfetcher": { "nvfetcher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ]
@ -537,29 +395,9 @@
"type": "github" "type": "github"
} }
}, },
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1633382856,
"narHash": "sha256-hYlet806M9xJj4yxf0g5fhDT2IEUVIMAl7sqIeZ8DUM=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "705cbfa10e3d9bfed2e59e0256844ae3704dbd7e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"bud": "bud",
"darwin": "darwin", "darwin": "darwin",
"deploy": "deploy", "deploy": "deploy",
"digga": "digga", "digga": "digga",
@ -572,23 +410,6 @@
"nvfetcher": "nvfetcher" "nvfetcher": "nvfetcher"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1639071661,
"narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31",
"type": "github"
},
"original": {
"owner": "rust-analyzer",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1637014545,

28
flake.nix
View file

@ -16,17 +16,13 @@
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy"; digga.inputs.deploy.follows = "deploy";
bud.url = "github:divnix/bud";
bud.inputs.nixpkgs.follows = "nixos";
bud.inputs.devshell.follows = "digga/devshell";
home.url = "github:nix-community/home-manager/release-21.11"; home.url = "github:nix-community/home-manager/release-21.11";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixos"; darwin.inputs.nixpkgs.follows = "nixos";
deploy.url = "github:input-output-hk/deploy-rs"; deploy.url = "github:serokell/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixos"; deploy.inputs.nixpkgs.follows = "nixos";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
@ -44,7 +40,6 @@
outputs = outputs =
{ self { self
, digga , digga
, bud
, nixos , nixos
, home , home
, nixos-hardware , nixos-hardware
@ -96,7 +91,6 @@
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
home.nixosModules.home-manager home.nixosModules.home-manager
agenix.nixosModules.age agenix.nixosModules.age
bud.nixosModules.bud
]; ];
}; };
@ -149,16 +143,18 @@
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
defaultTemplate = self.templates.bud;
templates.bud.path = ./.;
templates.bud.description = "bud template";
}
//
{ {
budModules = { devos = import ./bud; }; curve = {
profilesOrder = [ "system" "curve" ];
profiles.anish = {
user = "anish";
path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.anish;
};
};
};
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib;
} }
; ;
} }

4
hosts/curve/default.nix
View file

@ -10,8 +10,6 @@
imports = [ ] ++ suites.hmBase; imports = [ ] ++ suites.hmBase;
}; };
#bud.enable = true;
fileSystems."/mnt/ftp" = { fileSystems."/mnt/ftp" = {
device = "192.168.1.240:/home/ftp"; device = "192.168.1.240:/home/ftp";
fsType = "nfs"; fsType = "nfs";
@ -27,6 +25,8 @@
fsType = "nfs"; fsType = "nfs";
}; };
boot.supportedFilesystems = [ "ntfs" ];
# enable adb # enable adb
# TODO move this (it's for KaiOS WebIDE devShell?) # TODO move this (it's for KaiOS WebIDE devShell?)
programs.adb.enable = true; programs.adb.enable = true;

11
profiles/core/default.nix
View file

@ -10,7 +10,6 @@ in
systemPackages = with pkgs; [ systemPackages = with pkgs; [
binutils binutils
coreutils coreutils
direnv
dnsutils dnsutils
dosfstools dosfstools
git git
@ -186,6 +185,16 @@ in
eval "$(${pkgs.starship}/bin/starship init bash)" eval "$(${pkgs.starship}/bin/starship init bash)"
''; '';
interactiveShellInit = '' interactiveShellInit = ''
flakify() {
if [ ! -e flake.nix ]; then
nix flake new -t github:nix-community/nix-direnv .
elif [ ! -e .envrc ]; then
echo "use flake" > .envrc
direnv allow
fi
vim flake.nix
}
eval "$(${pkgs.direnv}/bin/direnv hook bash)" eval "$(${pkgs.direnv}/bin/direnv hook bash)"
''; '';
enableCompletion = true; enableCompletion = true;

1
profiles/desktop/default.nix
View file

@ -7,6 +7,7 @@
newsflash newsflash
sublime-music sublime-music
tdesktop tdesktop
obs-studio
]; ];
#environment.systemPackages = with pkgs; [ #environment.systemPackages = with pkgs; [
# lightdm # lightdm

35
profiles/music/default.nix
View file

@ -3,23 +3,42 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
qjackctl qjackctl
libjack2 # needed for overtone with pipewire
jack2 # needed for overtone with pipewire
# GUI
carla
# Plugins
helm helm
surge surge
distrho distrho
orca-c orca-c
carla
supercollider supercollider
dirt dirt
#calf
sunvox sunvox
vcv-rack vcv-rack
lmms lmms
#bespoke-synth bespokesynth
#ardour lsp-plugins
#reaper
#renoise
helio-workstation helio-workstation
projectm # milkdrop visualizer projectm # milkdrop visualizer
# TODO
# i think this needs a nix-shell with
# ghci packages with tidal installed
# and then also create the script file that runs tidalvim
# https://github.com/tidalcycles/vim-tidal/blob/1.4.8/bin/tidalvim
# nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.tidal])" --run ghci
# https://github.com/tidalcycles/Tidal/issues/637
#haskellPackages.tidal
# sc3 plugins
# https://gist.github.com/gosub/a42e265ec38d9df203d6
# DAWs
# ardour
# reaper
# renoise
]; ];
hardware.pulseaudio.enable = lib.mkForce false; hardware.pulseaudio.enable = lib.mkForce false;
@ -36,6 +55,7 @@
pipewire-pulse."stream.properties"."resample.quality" = 15; pipewire-pulse."stream.properties"."resample.quality" = 15;
client."stream.properties"."resample.quality" = 15; client."stream.properties"."resample.quality" = 15;
client-rt."stream.properties"."resample.quality" = 15; client-rt."stream.properties"."resample.quality" = 15;
#jack."context.modules" = [];
}; };
#media-session.config.bluez-monitor.properties = { #media-session.config.bluez-monitor.properties = {
# "bluez5.headset-roles" = [ "hsp_hs" "hsp_ag" ]; # "bluez5.headset-roles" = [ "hsp_hs" "hsp_ag" ];
@ -47,4 +67,7 @@
# "" # ""
# "${config.hardware.bluetooth.package}/libexec/bluetooth/bluetoothd --noplugin=sap" # "${config.hardware.bluetooth.package}/libexec/bluetooth/bluetoothd --noplugin=sap"
#]; #];
boot.kernelModules = [ "snd-seq" "snd-rawmidi" ]; # midi sequence kernel mods
hardware.pulseaudio.package = pkgs.pulseaudio.override { jackaudioSupport = true; };
} }

3
shell/default.nix
View file

@ -1,8 +1,5 @@
{ self, inputs, ... }: { self, inputs, ... }:
{ {
externalModules = with inputs; [
bud.devshellModules.bud
];
modules = [ modules = [
./devos.nix ./devos.nix
]; ];

10
users/profiles/desktop/bin/powermenu
View file

@ -12,20 +12,20 @@ log_out="\tLogout"
options="$power_off\n$reboot\n$lock\n$suspend\n$log_out" options="$power_off\n$reboot\n$lock\n$suspend\n$log_out"
case "$(echo -e "$options" | $rofi_command -dmenu -selected-row 2)" in case "$(echo -e "$options" | $rofi_command -dmenu -selected-row 2)" in
$power_off) " Shutdown")
systemctl poweroff systemctl poweroff
;; ;;
$reboot) " Reboot")
systemctl reboot systemctl reboot
;; ;;
$lock) " Lock")
zzz # TODO doesn't do anything zzz # TODO doesn't do anything
;; ;;
$suspend) "鈴 Sleep")
dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause
systemctl suspend systemctl suspend
;; ;;
$log_out) " Logout")
bspc quit bspc quit
;; ;;
esac esac

2
users/profiles/email/default.nix
View file

@ -28,7 +28,7 @@
set editor = "nvim +':set textwidth=0'" set editor = "nvim +':set textwidth=0'"
#set virtual_spoolfile=yes #set virtual_spoolfile=yes
set folder="~/Mail/" set folder="~/Mail/anish"
set mbox_type = Maildir set mbox_type = Maildir
mailboxes `find ~/Mail/anish/* -maxdepth 0 -type d | grep -v "tmp\|new\|cur" | sed 's|/home/anish/Mail/|=\"|g' | sed 's|$|\"|g' | tr '\n' ' '` mailboxes `find ~/Mail/anish/* -maxdepth 0 -type d | grep -v "tmp\|new\|cur" | sed 's|/home/anish/Mail/|=\"|g' | sed 's|$|\"|g' | tr '\n' ' '`