From a1343811d171bb7850247f47c1db261bbd6a3013 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 20 Oct 2024 13:25:53 -0400 Subject: [PATCH] updates --- .gitattributes | 1 + binary-installers/rns_344_linux_x86_64.tar.gz | 3 ++ .../dot_config/fish/functions/homeup.fish | 2 +- dotfiles/dot_config/fish/functions/nixgc.fish | 5 +++ flake.lock | 44 +++++++++---------- home/home.nix | 15 +++---- system/eddie/configuration.nix | 8 +--- 7 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 .gitattributes create mode 100644 binary-installers/rns_344_linux_x86_64.tar.gz create mode 100644 dotfiles/dot_config/fish/functions/nixgc.fish diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6e12c63 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +binary-installers/rns_344_linux_x86_64.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/binary-installers/rns_344_linux_x86_64.tar.gz b/binary-installers/rns_344_linux_x86_64.tar.gz new file mode 100644 index 0000000..98d33b3 --- /dev/null +++ b/binary-installers/rns_344_linux_x86_64.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc1a7da039d4d896b397e33e378236fedb549faeb640ac1892aff77c2ddc7902 +size 142478593 diff --git a/dotfiles/dot_config/fish/functions/homeup.fish b/dotfiles/dot_config/fish/functions/homeup.fish index fab09be..6f9f398 100644 --- a/dotfiles/dot_config/fish/functions/homeup.fish +++ b/dotfiles/dot_config/fish/functions/homeup.fish @@ -1,5 +1,5 @@ #!/usr/bin/env fish function homeup --description 'update home manager' - home-manager switch --flake ~/source/nixos-config#emenel + home-manager switch --flake ~/source/nixos-config#emenel $argv end diff --git a/dotfiles/dot_config/fish/functions/nixgc.fish b/dotfiles/dot_config/fish/functions/nixgc.fish new file mode 100644 index 0000000..8d39ebd --- /dev/null +++ b/dotfiles/dot_config/fish/functions/nixgc.fish @@ -0,0 +1,5 @@ +#!/usr/bin/env fish + +function nixgc --description 'update home manager' + sudo nix-collect-garbage $argv +end diff --git a/flake.lock b/flake.lock index 470380c..4cd3629 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1728567251, - "narHash": "sha256-ymM01ZxzDDY0RTgSOlzVLTRx3mais7dcfb1bYStVcRU=", + "lastModified": 1729325435, + "narHash": "sha256-wfOuEfp4wqfEYAE4zRuILDhjch3i0jKro/1novP5IN8=", "ref": "refs/heads/master", - "rev": "751bad81ce48557b3e2c56de36e3c6db906b752a", - "revCount": 864, + "rev": "7fdccc43e4a7f470f6459754fad6151a570cb04b", + "revCount": 871, "submodules": true, "type": "git", "url": "https://github.com/kmonad/kmonad?dir=nix" @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1727037144, - "narHash": "sha256-pxV+e/IGccFn4VcLJ4buEj6yOmoqmdqaLMoFzUbijvs=", + "lastModified": 1729112290, + "narHash": "sha256-6yqnhnzgM99mzY4/yrKR1Xlkjt+VQg4gP6cMlIKxQs0=", "owner": "musnix", "repo": "musnix", - "rev": "45250275206d366c8328ed1c57ceebffc945ba43", + "rev": "64356c2b84abb26b8ccf1e01df8448635cbfde64", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1728416205, - "narHash": "sha256-t30gsrwiBc2oBsd89DwdsVZuEbMT5ed81PYY57CIOJE=", + "lastModified": 1729025406, + "narHash": "sha256-uYbDN6JikC19WfD3zg0kpOpJVZFvBhHXYo3YJo28vOs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "d65dbf59900de4beaaaba8b42a15994f8433c1bc", + "rev": "8d1193a959c7810f01610c10a055b0020390bf4e", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1729181673, + "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1728937293, - "narHash": "sha256-a3Q/x62NKMRb5gzyLV+ed1LUHNrI7KwGdt48NzpHvoM=", + "lastModified": 1729330084, + "narHash": "sha256-3lGZyrHLmCSXcFEv1th04j/+2CUMzNDvQdbqXHMBqfM=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "85bd1a4969ddee56ba1ddff7ebbd654754bd7e9d", + "rev": "349ce1dcf7ce051dccb7432f950203117f5995f4", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index a2a1c54..f9a9ce2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -18,8 +18,6 @@ unzip zip htop - #owl - #opendrop dconf gnupg gcc @@ -66,10 +64,9 @@ ruby janet jpm - python3 + python311 ruff - python312Packages.pip - python312Packages.mido + python311Packages.pip sbcl sbclPackages.cffi libffi.dev @@ -183,7 +180,7 @@ inkscape gimp epson-escpr - kicad + inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.kicad #install stable kicad because unstable breaks on python12 dependency openscad-unstable openscad-lsp picard @@ -205,7 +202,7 @@ lsp-plugins geonkick bespokesynth - helm + # helm surge odin2 calf @@ -213,7 +210,7 @@ chow-phaser chow-centaur chow-tape-model - + # Fonts fira-code fira @@ -348,7 +345,7 @@ nixpkgs.config.packageOverrides = pkgs: { renoise = pkgs.renoise.override { - releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz; + releasePath = ../binary-installers/rns_344_linux_x86_64.tar.gz; }; raylib = pkgs.raylib.overrideDerivation (previous: { name = "raylib-head"; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 01f0289..fbe3cd4 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -141,7 +141,7 @@ nix.package = pkgs.nixFlakes; nix.settings = { - experimental-features = [ "nix-command" "flakes" "repl-flake" ]; + experimental-features = [ "nix-command" "flakes" ]; #repl-flake auto-optimise-store = true; }; @@ -157,12 +157,6 @@ services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. services.gnome.gnome-keyring.enable = true; - # enable Sway window manager - # programs.sway = { - # enable = true; - # wrapperFeatures.gtk = true; - # }; - programs.dconf.enable = true; services.xserver.xkb = {