diff --git a/flake.nix b/flake.nix index 6deab2e..afaafd7 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,6 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs = { nixpkgs.follows = "nixpkgs"; - nixpkgs-stable.follows = "nixpkgs"; }; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-vscode-extensions.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/develop/common.nix b/home/develop/common.nix new file mode 100644 index 0000000..b13f76b --- /dev/null +++ b/home/develop/common.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + cmake + clang + gnumake + ninja + pkg-config + ]; +} diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index c1f3b6a..aaabdb0 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -13,6 +13,7 @@ # ../../terminal # ../../terminal/programs/zellij.nix ../../terminal/programs/zoxide.nix + ../../terminal/programs/tdf.nix # ../../terminal/programs/irssi.nix ../../terminal/programs/lazygit.nix # ../../terminal/programs/beets.nix @@ -34,6 +35,7 @@ ../../programs/desktop/sway # development + ../../develop/common.nix #../../develop #../../develop/small-misc.nix diff --git a/home/terminal/programs/tdf.nix b/home/terminal/programs/tdf.nix new file mode 100644 index 0000000..cbe6af9 --- /dev/null +++ b/home/terminal/programs/tdf.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = with pkgs; [tdf]; +} diff --git a/nix/systemProfiles/secrets/hopper/wireguard b/nix/systemProfiles/secrets/hopper/wireguard index f6789d7..6625bcb 100644 --- a/nix/systemProfiles/secrets/hopper/wireguard +++ b/nix/systemProfiles/secrets/hopper/wireguard @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:kCJQ4tuM0zzYUsUFAAWG/Q7Uxs4262XGg7ioE+n/D4De1RRGApDyOLVnt7xgPhKK3fyxfkqmUrLvlumc0KwC0wl3U0YzW77r0G+XhutE+pp3DboDiYBsGfvj/Yl8T+lV2Q9s9GLMtdshjh21DTVbXLLf4Z9Fw51oshsVZIfy+VBZvjCNlUD+6uXO3Jo/1qcwPnMvIsyqKQCAtFvfvoEyDO36/XCXoDwqs4V3NLQortL9KgTd6lClrWtZIBYj3HZcogwhnK2AqMVnHrFzizndYKK170Z2Llptz4aBQeUF40gqM16Tj4Rxjqy11o2e20rCy854yyxGf6pIYy4475h8sWPnqVGk1NaMUKHTxJ4sOqm6nC+yXSUSoj/kXKkxy74oOs29mih/SfHqj/xPsodOkX3sD7R/NcTZsyJ8wy5hJOfe7h3qFjthd6d0sc3bbbPPQtXz3ixKgN7brtJQHUhPgol8IJn6h63kBRmUu5GyZAimT/hidW/IsIfLRAV54JCcOCrUzygkrRFItDVk98PHekTrSJfm6dWd0z4=,iv:kPWXbr/kvsFxUjYP9XaPB/5EKv9R2evsbq+1beYN4L8=,tag:qee0e90KN9aTeteX2pxRVQ==,type:str]", + "data": "ENC[AES256_GCM,data:3Qqz1+i3r/gerpHk8YhxjRbpVGYao3VfuFD4Tnmz+IeTY/KeNzkwmWsj/rY//q2oFBcBhfqhRXSEsDjcWho2eRiMY9bP0jAdNEawtsaQRBX5SSb7rvgFuuDrPRtpl18jjfTQTMKHv+yURB/Pgq1k14NMhW0zNSmpa2SmoHlxAxXMPmh20dDpBZHlGLiqDrw/l0piU7jLjk6ZYH/Li8sivuZk8MdPyWXhNEOjcyT+ZHopZcMsFfG7Dg/zbMrtgq4pspVdkcpjdcP8ReQUO2ByosC3epoT+sfS+TE/+OY3RNacAlaHiDz1T0JnTyhQij5e3n6gGlIGbBpQNDQUESbdWJshaiEcA1dv+lHUo6ka7d5qvFTtoIValQ1wegj5684bNR45h6PcVU5oPFyb9SwgHTSSN8GL+rjMtXIrkGFwQWNym+hVtp60iudUOecozkWa1oNuURGt2Y4uk2sk4yZbaHQ0mNiP6mEgAZ7qCNVQCmK9N8WXylFpUN4oWkGf5muSjMzmtbOMTFhRXJ83BbFqg83DNxzsqm5hnKQD2jME,iv:VNAXFEqc1eGHGalPeqS+mrJE8wiLkeMtOUcakll50Co=,tag:B5Otrgusj6m0sISkTDX21g==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -15,10 +15,10 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2VDl2dnFCbUtRdnlDTGVv\ndzBwUTh1OXRONDlGK2hXZ29YRytLbU9sNXlFClViaG9xRGw2OHZLTmZEQk9nSXU5\nZHI2aWVNSXp2Z2JxakpKUkkzQ21XZzQKLS0tIEpSM3Z4dW9VeVVEQ2JKYU5EK0hP\nYzBnK2d6TkF4VGJ6dlBrc291ZDFBYW8KtEnivQ5aj9FhnNHRL3jEQPYxSuO8QAuz\n9tIXoiU13+GOmvn8XG25cZjUIgCamd9c/uBVXFYFx3muGlmBwvn9cQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-02-10T16:33:02Z", - "mac": "ENC[AES256_GCM,data:HcavTZc4gd64JqL9QZxpUR9W8F3DEzjeSABTg16Tgo9jAcp703KV/EAfjGmO42397UGp3e2nSuqod7uAtpQAcHsFFvYADrFzjoxa//KA+OR3/fwWnfFWTqyC1cJa4IaZpjZJuj1Qj09NeihTuU3vRXGbn5KN5x91wcVE/UhzSXg=,iv:CacSKLYy6I8U4lwJEo535S9m2iRvgEcLvayYsnOCFko=,tag:j3PhJnidKwPPfd83ylQC+w==,type:str]", + "lastmodified": "2024-11-23T20:49:13Z", + "mac": "ENC[AES256_GCM,data:eKOk1q9JUC5lQAywpILihx3UM4HFtdYUzxviT/EHBQ+FjADoOV9ajwrRiy35TuJQiIs7UM+pI1/2iz7PvrvAjzPxS0OF+ujrMxstScvalqzuQEuJirR+56ZksUl4ZEX770z/NRiY4bZvkbFo59dxrK/a4w/cdeDiEGgM/2eo80w=,iv:SmEyjcC7gSaQkZnxERpTGBDey9TjCuDvyvv3I0c88Ww=,tag:qBnFjMYU0uAQqWXshfuL8Q==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.8.1" + "version": "3.9.1" } } \ No newline at end of file diff --git a/nix/systemProfiles/themes/dark.nix b/nix/systemProfiles/themes/dark.nix index 0dd8dd0..dc33584 100644 --- a/nix/systemProfiles/themes/dark.nix +++ b/nix/systemProfiles/themes/dark.nix @@ -24,4 +24,8 @@ _: { }; }; }; + + fonts.packages = [ + self.packages.${pkgs.system}.cartograph-cf + ]; } diff --git a/pkgs/cartograph-cf/default.nix b/pkgs/cartograph-cf/default.nix index 1a1885e..b4aed1c 100644 --- a/pkgs/cartograph-cf/default.nix +++ b/pkgs/cartograph-cf/default.nix @@ -16,8 +16,11 @@ installPhase = '' runHook preInstall - mkdir -p $out/share/fonts - cp -r $src/Nerd\ Font $out/share/fonts + + install -Dm644 $src/Nerd\ Font/*.ttf -t $out/share/fonts/truetype/NerdFonts + install -Dm644 $src/*.otf -t $out/share/fonts/opentype + # mkdir -p $out/share/fonts + # cp -r $src/Nerd\ Font $out/share/fonts/truetype runHook postInstall ''; diff --git a/pkgs/cartographer/default.nix b/pkgs/cartographer/default.nix deleted file mode 100644 index 5303cca..0000000 --- a/pkgs/cartographer/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - kernel, - kmod, -}: -stdenv.mkDerivation { - pname = "cartographer"; - version = "0.1"; - src = fetchFromGitHub { - owner = "LWSS"; - repo = "Cartographer"; - rev = ""; - }; -}