affinity working!

This commit is contained in:
Matt Nish-Lapidus 2025-01-03 23:23:35 -05:00
parent 0a72c12efc
commit 56612b2779
5 changed files with 424 additions and 74 deletions

View file

@ -0,0 +1,30 @@
command = /home/emenel/.nix-profile/bin/fish --login --interactive
shell-integration = fish
shell-integration-features = true
theme = Adventure
font-family = "JetBrains Mono"
font-size = 12
background = 111111
selection-foreground = ffffff
selection-background = 444444
bold-is-bright = true
cursor-style = bar
adjust-cursor-thickness = 2
resize-overlay = never
cursor-click-to-move = true
clipboard-paste-protection = true
keybind = ctrl+t=new_tab
keybind = ctrl+w=close_surface
keybind = ctrl+enter=new_split:down
keybind = ctrl+shift+enter=new_split:right
keybind = ctrl+alt+enter=equalize_splits
keybind = ctrl+alt+z=toggle_split_zoom
keybind = ctrl+alt+left=previous_tab
keybind = ctrl+alt+right=next_tab
keybind = ctrl+alt+up=goto_split:left
keybind = ctrl+alt+down=goto_split:right
keybind = ctrl+backspace=text:\x1b\x7f

View file

@ -43,6 +43,8 @@ config.tab_bar_at_bottom = true
config.enable_kitty_keyboard = true
config.unzoom_on_switch_pane = true
config.keys = {
{
key = 'Enter',
@ -67,6 +69,11 @@ config.keys = {
act.SendKey { key = 'L', mods = 'CTRL' },
},
},
{
key = 'z',
mods = 'CTRL|META',
action = wezterm.action.TogglePaneZoomState,
},
{
key = 'w',
mods = 'CTRL',

391
flake.lock generated
View file

@ -1,15 +1,106 @@
{
"nodes": {
"affinity-nix": {
"inputs": {
"elemental-wine-source": "elemental-wine-source",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1735952065,
"narHash": "sha256-Y4/PNm/DgPR7Zfv5Ja76UyO/ug+I8Vu1hb+/t0lOFq8=",
"owner": "mrshmllow",
"repo": "affinity-nix",
"rev": "9e49b3155a9bf19b85ebcdfcd261651a43601504",
"type": "github"
},
"original": {
"owner": "mrshmllow",
"repo": "affinity-nix",
"type": "github"
}
},
"elemental-wine-source": {
"flake": false,
"locked": {
"host": "gitlab.winehq.org",
"lastModified": 1722747031,
"narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=",
"owner": "ElementalWarrior",
"repo": "wine",
"rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2",
"type": "gitlab"
},
"original": {
"host": "gitlab.winehq.org",
"owner": "ElementalWarrior",
"ref": "affinity-photo3-wine9.13-part3",
"repo": "wine",
"type": "gitlab"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -21,33 +112,76 @@
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1687587065,
"narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=",
"owner": "wez",
"repo": "freetype2",
"rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"lastModified": 1723459814,
"narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=",
"owner": "freetype",
"repo": "freetype",
"rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5",
"type": "github"
},
"original": {
"owner": "wez",
"repo": "freetype2",
"rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
"owner": "freetype",
"ref": "VER-2-13-3",
"repo": "freetype",
"type": "github"
}
},
"ghostty": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"zig": "zig"
},
"locked": {
"lastModified": 1735943291,
"narHash": "sha256-igXLrO0AtN7+k7VaR5zaHaPhDcS3go5NZr4liVqW9g4=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "1baf8928a0bd6ccc2f49e1e9478baab71d49a018",
"type": "github"
},
"original": {
"owner": "ghostty-org",
"repo": "ghostty",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"affinity-nix",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1711722720,
"narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
"lastModified": 1719502711,
"narHash": "sha256-2ieCf3ftNk851FZBDPVl+7QHWBqD729KiUxUyxi26Yg=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
"rev": "9c03576c49db6e7207d9bcdfe3abd170a809157f",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"ref": "8.4.0",
"ref": "9.0.0",
"repo": "harfbuzz",
"type": "github"
}
@ -73,6 +207,24 @@
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1735947440,
"narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"kmonad": {
"inputs": {
"nixpkgs": [
@ -81,11 +233,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1735500482,
"narHash": "sha256-Mvd37Odri7hKwbUhaLt24TmoK/HTG1f1FuVbFNqhX9s=",
"lastModified": 1735922658,
"narHash": "sha256-5EHJcwsvTs9kaqZ6N55H7Joi3cWDPd1GuGfSjABri+0=",
"ref": "refs/heads/master",
"rev": "8bc7033977e8bb18abe4c245a2f9169d29373a76",
"revCount": 882,
"rev": "27bd0f9851b2d9fffcd20d030d9eca5c0805d32e",
"revCount": 896,
"submodules": true,
"type": "git",
"url": "https://github.com/kmonad/kmonad?dir=nix"
@ -100,17 +252,17 @@
"libpng": {
"flake": false,
"locked": {
"lastModified": 1549245649,
"narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
"owner": "glennrp",
"lastModified": 1726173884,
"narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=",
"owner": "pnggroup",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"rev": "f5e92d76973a7a53f517579bc95d61483bf108c0",
"type": "github"
},
"original": {
"owner": "glennrp",
"owner": "pnggroup",
"ref": "v1.6.44",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
}
},
@ -121,11 +273,11 @@
]
},
"locked": {
"lastModified": 1734848678,
"narHash": "sha256-HtGPXGyzOsHJLq6nwvBV763y6l7fC9FuWIM0hNh1Y6E=",
"lastModified": 1735772949,
"narHash": "sha256-lvee0rhKTpJEDl1SC4F3Kvz88snOU8OMTJBsPH1pVBo=",
"owner": "musnix",
"repo": "musnix",
"rev": "e76b3cdd23d49a11210a551f8ea4d49d7022e639",
"rev": "86ef22cbdd7551ef325bce88143be9f37da64c26",
"type": "github"
},
"original": {
@ -136,11 +288,11 @@
},
"nix-flatpak": {
"locked": {
"lastModified": 1735500379,
"narHash": "sha256-5qmX6YYjYfVYBbsmd2XxbTi7A59YuuN9IwfXU7qFquQ=",
"lastModified": 1735913600,
"narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "c31b6cbd11707fe2c74ad805ef085d59d75116ae",
"rev": "78ed84ff81e8d8510926e7165d508bcacef49ff1",
"type": "github"
},
"original": {
@ -165,6 +317,86 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1730768919,
"narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1733423277,
"narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e36963a147267afc055f7cf65225958633e536bf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1733229606,
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable_2": {
"locked": {
"lastModified": 1735834308,
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1735471104,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1735669367,
"narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
@ -180,31 +412,38 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1735471104,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"lastModified": 1735882644,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"root": {
"inputs": {
"affinity-nix": "affinity-nix",
"ghostty": "ghostty",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"kmonad": "kmonad",
"musnix": "musnix",
"nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable_2",
"sops-nix": "sops-nix",
"wezterm": "wezterm"
}
@ -217,11 +456,11 @@
]
},
"locked": {
"lastModified": 1729477859,
"narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
"lastModified": 1735871325,
"narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
"rev": "a599f011db521766cbaf7c2f5874182485554f00",
"type": "github"
},
"original": {
@ -237,11 +476,11 @@
]
},
"locked": {
"lastModified": 1735468296,
"narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=",
"lastModified": 1735844895,
"narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27",
"rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32",
"type": "github"
},
"original": {
@ -265,9 +504,24 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
@ -279,11 +533,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1733412933,
"narHash": "sha256-2OPDEgUEh0B6OIcSWtBbkw/zFi8r2VfluLj7FebTaVA=",
"lastModified": 1735931735,
"narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=",
"owner": "wez",
"repo": "wezterm",
"rev": "6f375e29a2c4d70b8b51956edd494693196c6692",
"rev": "8e9cf912e66f704f300fac6107206a75036de1e7",
"type": "github"
},
"original": {
@ -293,19 +547,44 @@
"type": "github"
}
},
"zig": {
"inputs": {
"flake-compat": [
"ghostty"
],
"flake-utils": "flake-utils",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1717848532,
"narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1484501380,
"narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
"lastModified": 1705948357,
"narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=",
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
"type": "github"
},
"original": {
"owner": "madler",
"ref": "v1.2.11",
"ref": "v1.3.1",
"repo": "zlib",
"type": "github"
}

View file

@ -13,6 +13,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-unstable.url = "github:nix-community/home-manager";
nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch
kmonad = {
@ -38,8 +40,15 @@
# nix-ld.url = "github:Mic92/nix-ld";
# nix-ld.inputs.nixpkgs.follows = "nixpkgs";
# affinity-nix.url = "github:mrshmllow/affinity-nix";
# affinity-nix.inputs.nixpkgs.follows = "nixpkgs";
ghostty = {
url = "github:ghostty-org/ghostty";
# inputs.nixpkgs.follows = "nixpkgs";
};
affinity-nix = {
url = "github:mrshmllow/affinity-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {nixpkgs, home-manager, sops-nix, nix-flatpak, kmonad, musnix, self, ... } @ inputs:

View file

@ -17,8 +17,14 @@
};
};
imports = [ (inputs.home-manager-unstable + "/modules/programs/ghostty.nix") ];
home = {
packages = with pkgs; [
inputs.affinity-nix.packages.x86_64-linux.photo
inputs.affinity-nix.packages.x86_64-linux.publisher
inputs.affinity-nix.packages.x86_64-linux.designer
just
yt-dlp
erdtree
@ -58,6 +64,7 @@
silver-searcher
# xclip
maestral
maestral-gui
nix-index
fstl
godot_4
@ -106,7 +113,13 @@
python311Packages.babel
python311Packages.requests
ruff
sbcl
(sbcl.withPackages (ps: with ps; [
# asdf_3_3
cffi
arrow-macros
alexandria
serapeum
]))
ccl
racket
gdu
@ -146,7 +159,7 @@
libGL
nurl
freecad
procs
rpi-imager
caligula
@ -294,6 +307,7 @@
gimp
epson-escpr
kicad
turbocase
openscad-unstable
openscad-lsp
picard
@ -460,6 +474,7 @@
epkgs.parinfer-rust-mode
epkgs.tree-sitter-langs
epkgs.gpastel
epkgs.emacs-everywhere
];
};
ripgrep = {
@ -469,6 +484,11 @@
enable = true;
enableFishIntegration = true;
};
ghostty = {
enable = true;
package = inputs.ghostty.packages.x86_64-linux.ghostty;
enableFishIntegration = true;
};
wezterm = {
enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default;
@ -516,7 +536,7 @@
};
fzf = {
enable = true;
enableFishIntegration = true;
# enableFishIntegration = true;
};
broot = {
enable = true;
@ -585,7 +605,6 @@
flatpak.enable = true;
syncthing = {
enable = true;
# tray.enable = true;
};
borgmatic = {
enable = true;
@ -618,7 +637,6 @@
services.flatpak.packages = [
"com.github.tchx84.Flatseal"
"com.heroicgameslauncher.hgl"
"nl.hjdskes.gcolor3"
"org.linuxshowplayer.LinuxShowPlayer"
];
@ -630,20 +648,26 @@
GSK_RENDERER = "ngl";
MOZ_ENABLE_WAYLAND = 1;
};
services.ulauncher = {
Unit = {
Description = "Start Ulauncher";
After = "graphical-session.target";
services = {
syncthingtray = {
Service.ExecStart = lib.mkForce "${pkgs.syncthingtray}/bin/syncthingtray --wait";
};
Install = {
WantedBy = [ "graphical-session.target" ];
};
ulauncher = {
Unit = {
Description = "Start Ulauncher";
After = "graphical-session.target";
};
Service = {
Restart = "always";
RestartSec = 1;
ExecStart = "${pkgs.ulauncher}/bin/ulauncher --hide-window";
Install = {
WantedBy = [ "graphical-session.target" ];
};
Service = {
Restart = "always";
RestartSec = 1;
ExecStart = "${pkgs.ulauncher}/bin/ulauncher --hide-window";
};
};
};
};
@ -652,6 +676,7 @@
home.file.".npmrc".source = ../dotfiles/dot_npmrc;
xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile;
xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml;
xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty;
xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm;
xdg.configFile."git".source = ../dotfiles/dot_config/git;
xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw;