diff --git a/flake.lock b/flake.lock index c4e327f..61e682b 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1741229528, - "narHash": "sha256-21DoV4SMueMFRHMsvfsPfQIOtsvRWNY06rE4gB7xFnc=", + "lastModified": 1736708527, + "narHash": "sha256-/JQo2XnLF8qfSQKvjuFDtvzzz/QHO/dLBHJO4vLOXNk=", "owner": "arkenfox", "repo": "user.js", - "rev": "3d76c74c80485931425464fec0e59d6cb461677a", + "rev": "c25187332e19c633b956a6755a7971a6591d3e8d", "type": "github" }, "original": { @@ -39,29 +39,6 @@ "type": "github" } }, - "csharp-language-server": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743061507, - "narHash": "sha256-M605lQQ035J61tZ48tye8JUCN4MZKXhcTP3SqXqtr4g=", - "owner": "SofusA", - "repo": "csharp-language-server", - "rev": "a119d6002874d9335dbff0a9445f652762eb6685", - "type": "github" - }, - "original": { - "owner": "SofusA", - "repo": "csharp-language-server", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -132,11 +109,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1742773104, - "narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", + "lastModified": 1739457209, + "narHash": "sha256-aIFi91DhSVtsiinX3OmjHIhBmkA6VKwQZf7RRgaHScw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", + "rev": "5ff0742fc6c2156e8d9b0fbb43678b0d3e8ce578", "type": "gitlab" }, "original": { @@ -217,11 +194,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -333,11 +310,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -391,15 +368,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742863891, - "narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=", + "lastModified": 1739415434, + "narHash": "sha256-ToTH8JnLcpclRT4jLrlSHhD7CfNmtGnVLZno60ziglc=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "366999efebcad2165f472ef93e9c996693bda75d", + "rev": "b5ee5262ada13884a6b56ea93eec8ea6f12e3624", "type": "github" }, "original": { @@ -410,11 +386,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -425,11 +401,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -441,11 +417,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1739206421, + "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "44534bc021b85c8d78e465021e21f33b856e2540", "type": "github" }, "original": { @@ -457,11 +433,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -496,11 +472,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1742893502, - "narHash": "sha256-W8M7Kzat8ySVY+bBW0FF6jB4xjdb8sLm14OHVyyu0KQ=", + "lastModified": 1739438287, + "narHash": "sha256-glDed6Vp6lAn7dkx/9O3Y2CMo675lB4A/Ydbfn0fesA=", "owner": "astro", "repo": "nix-openwrt-imagebuilder", - "rev": "89d3674159e5606b0c1db636e7c7463b7b976b45", + "rev": "bc7334b11e21abaed14264db9f7fa99c1da460de", "type": "github" }, "original": { @@ -518,11 +494,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -535,7 +511,6 @@ "inputs": { "agenix": "agenix", "arkenfox-userjs": "arkenfox-userjs", - "csharp-language-server": "csharp-language-server", "deploy-rs": "deploy-rs", "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", @@ -548,27 +523,30 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nvim-kitty-navigator": "nvim-kitty-navigator", "openwrt-imagebuilder": "openwrt-imagebuilder", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "roslyn-language-server": "roslyn-language-server" } }, - "rust-overlay": { + "roslyn-language-server": { "inputs": { + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ - "nixos-cosmic", "nixpkgs" ] }, "locked": { - "lastModified": 1742437918, - "narHash": "sha256-Vflb6KJVDikFcM9E231mRN88uk4+jo7BWtaaQMifthI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f03085549609e49c7bcbbee86a1949057d087199", + "lastModified": 1739209199, + "narHash": "sha256-IXemY38IgENRcnBw2/0hBkUU8dNwZr+kzrrVQd4EH/o=", + "owner": "SofusA", + "repo": "roslyn-language-server", + "rev": "e1e9831f8fc83121f87516b00401cca409392c29", "type": "github" }, "original": { - "owner": "oxalica", - "repo": "rust-overlay", + "owner": "SofusA", + "repo": "roslyn-language-server", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 4219e6d..a48f95f 100644 --- a/flake.nix +++ b/flake.nix @@ -80,8 +80,8 @@ rec { inputs.nixpkgs.follows = "nixpkgs"; }; - csharp-language-server = { - url = "github:SofusA/csharp-language-server"; + roslyn-language-server = { + url = "github:SofusA/roslyn-language-server"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; diff --git a/home/editors/helix/default.nix b/home/editors/helix/default.nix index e346dfb..03c9c61 100644 --- a/home/editors/helix/default.nix +++ b/home/editors/helix/default.nix @@ -140,7 +140,7 @@ in }; }; }; - roslyn.command = "csharp-language-server"; + roslyn.command = "roslyn-language-server"; statix = { command = "efm-langserver"; config = { diff --git a/home/editors/lsp.nix b/home/editors/lsp.nix index 4f39eec..1b8cea7 100644 --- a/home/editors/lsp.nix +++ b/home/editors/lsp.nix @@ -5,15 +5,7 @@ # language servers efm-langserver unstable.roslyn-ls - (pkgs.symlinkJoin { - name = "csharp-language-server"; - paths = [ inputs.csharp-language-server.packages.${system}.csharp-language-server ]; - buildInputs = [ pkgs.makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/csharp-language-server \ - --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.dotnet-sdk_9 ]}" - ''; - }) + inputs.roslyn-language-server.packages.${system}.roslyn-language-server omnisharp-roslyn nil unstable.nixd diff --git a/home/felschr-work.nix b/home/felschr-work.nix index 6d7011e..0002dd2 100644 --- a/home/felschr-work.nix +++ b/home/felschr-work.nix @@ -13,6 +13,7 @@ with pkgs; ./editors ./desktop ./git.nix + ./keybase.nix ./element.nix ./signal.nix ./browsers diff --git a/home/felschr.nix b/home/felschr.nix index d6909f5..712a704 100644 --- a/home/felschr.nix +++ b/home/felschr.nix @@ -8,6 +8,7 @@ ./desktop ./desktop/monitors.nix ./git.nix + ./keybase.nix ./element.nix ./signal.nix ./browsers diff --git a/home/keybase.nix b/home/keybase.nix new file mode 100644 index 0000000..29233a4 --- /dev/null +++ b/home/keybase.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: + +{ + services.keybase.enable = true; + # services.kbfs.enable = true; + + home.packages = [ pkgs.keybase-gui ]; +} diff --git a/home/tailscale.nix b/home/tailscale.nix index 5ea2546..2e9511f 100644 --- a/home/tailscale.nix +++ b/home/tailscale.nix @@ -1,12 +1,8 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - unstable.trayscale - (makeAutostartItem { - name = "dev.deedles.Trayscale"; - package = unstable.trayscale; - prependExtraArgs = [ "--hide-window" ]; - }) - ]; + services.trayscale = { + enable = true; + package = pkgs.unstable.trayscale; + }; } diff --git a/services/restic/home-pc.nix b/services/restic/home-pc.nix index fc8a39a..9874d8a 100644 --- a/services/restic/home-pc.nix +++ b/services/restic/home-pc.nix @@ -66,6 +66,7 @@ in "/home/*/.local/share/gnome-boxes" "/home/*/.local/share/bottles" "/home/*/.local/share/Steam" + "/home/*/.local/share/keybase" "/home/*/.local/share/libvirt" "/home/*/.local/share/lutris" "/home/*/.local/share/NuGet" @@ -80,6 +81,7 @@ in "/home/*/.config/Proton Pass" "/home/*/.config/spotify/Users" "/home/felschr/media" + "/home/felschr/keybase" "/home/felschr/dev" # backup ~/dev-backup instead # general