removed need for rec

updated syntax
made option to set obs autostart behaviour
2024-02-16 17:48:28 +01:00 · 2024-02-16 17:45:51 +01:00 · 2024-02-16 17:41:53 +01:00 · 2024-02-15 21:17:48 +01:00 · 2024-02-13 21:50:18 +01:00 · 2024-02-13 20:56:12 +01:00
14 changed files with 447 additions and 151 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1,13 +1,29 @@
 {
  "nodes": {
+    "appimage-runtime": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1652289700,
+        "narHash": "sha256-uxQBDy/JA7uEboTOUmGaZ2FAKY/0dQ9c0A0N8+J+a7I=",
+        "owner": "AppImageCrafters",
+        "repo": "appimage-runtime",
+        "rev": "6500a1ef68e039caba2ebab1c7ed74c2ea9e67a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AppImageCrafters",
+        "repo": "appimage-runtime",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
        "type": "github"
      },
      "original": {
@ -32,10 +48,59 @@
        "type": "github"
      }
    },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-utils": {
+      "locked": {
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
      "inputs": {
        "systems": "systems"
      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_2"
+      },
      "locked": {
        "lastModified": 1681202837,
        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
@ -50,7 +115,7 @@
        "type": "github"
      }
    },
-    "flake-utils_2": {
+    "flake-utils_4": {
      "locked": {
        "lastModified": 1667395993,
        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -94,20 +159,42 @@
        ]
      },
      "locked": {
-        "lastModified": 1694465129,
-        "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=",
+        "lastModified": 1706981411,
+        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b",
+        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "nix-appimage": {
+      "inputs": {
+        "appimage-runtime": "appimage-runtime",
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2",
+        "squashfuse": "squashfuse"
+      },
+      "locked": {
+        "lastModified": 1695276866,
+        "narHash": "sha256-/BBbYIoDhIPcVwhvau/g4lzrjTnudeRLW5qaTu7LAVs=",
+        "owner": "ralismark",
+        "repo": "nix-appimage",
+        "rev": "17dd6001ec228ea0b8505d6904fc5796d3de5012",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ralismark",
+        "repo": "nix-appimage",
+        "type": "github"
+      }
+    },
    "nix-index-database": {
      "inputs": {
        "nixpkgs": [
@ -115,11 +202,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1694921880,
-        "narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=",
+        "lastModified": 1707016097,
+        "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2",
+        "rev": "3e3dad2808379c522138e2e8b0eb73500721a237",
        "type": "github"
      },
      "original": {
@ -130,32 +217,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1694937365,
-        "narHash": "sha256-iHZSGrb9gVpZRR4B2ishUN/1LRKWtSHZNO37C8z1SmA=",
+        "lastModified": 1707091808,
+        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5d017a8822e0907fb96f7700a319f9fe2434de02",
+        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1694974614,
-        "narHash": "sha256-0mXsTjf6bAtRStahFiRxT1o8SiegvI02tZoIAhczZLE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2e2c6b2f027463700b557143cb04d561d8b63f9c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
+        "ref": "nixos-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -176,61 +247,28 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1694767346,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1684570954,
-        "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=",
+        "lastModified": 1659526864,
+        "narHash": "sha256-XFzXrc1+6DZb9hBgHfEzfwylPUSqVFJbQPs8eOgYufU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3",
+        "rev": "478f3cbc8448b5852539d785fbfe9a53304133be",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1675309347,
-        "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-22.05",
+        "type": "indirect"
      }
    },
    "nur": {
      "locked": {
-        "lastModified": 1694975080,
-        "narHash": "sha256-yxk3j1fV+f+BtNXgKgYgHS+hxAOBKCOGKQCZnuGJrjI=",
+        "lastModified": 1707245063,
+        "narHash": "sha256-1E7kPslBZpGTmz7UTR/HnpCy8Rfc4Kv/njBiTTF1G2g=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "851838871ae06d27373ca51878fef8591c1e1260",
+        "rev": "cd11db9649316bcd231a6ab9c677284ee0d8c184",
        "type": "github"
      },
      "original": {
@ -241,7 +279,7 @@
    },
    "pre-commit-hooks": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
        "flake-utils": [
          "wallpaper",
          "flake-utils"
@ -272,13 +310,92 @@
        "home-manager": "home-manager",
        "nix-index-database": "nix-index-database",
        "nixpkgs": "nixpkgs",
-        "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-unstable": "nixpkgs-unstable",
        "nur": "nur",
+        "scanned-image-extractor": "scanned-image-extractor",
+        "spicetify": "spicetify",
+        "starc": "starc",
        "vscode-extensions": "vscode-extensions",
        "wallpaper": "wallpaper"
      }
    },
+    "scanned-image-extractor": {
+      "inputs": {
+        "nix-appimage": "nix-appimage",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707220285,
+        "narHash": "sha256-JWXtWnw07xLTPeE51eiNS3MeMltP11DiS5cYsT1r1Tc=",
+        "ref": "refs/heads/main",
+        "rev": "846a94c50f089cafe49903ce6e157fe714520a8a",
+        "revCount": 11,
+        "type": "git",
+        "url": "https://git.krsnik.at/Kristian/scanned-image-extractor.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.krsnik.at/Kristian/scanned-image-extractor.git"
+      }
+    },
+    "spicetify": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1704167711,
+        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
+        "owner": "the-argus",
+        "repo": "spicetify-nix",
+        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "the-argus",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
+    "squashfuse": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1655253282,
+        "narHash": "sha256-RIhDXzpmrYUOwj5OYzjWKJw0cwE+L3t/9pIkg/hFXA0=",
+        "owner": "vasi",
+        "repo": "squashfuse",
+        "rev": "d1d7ddafb765098b34239eacaf2f9abee1fbc27c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vasi",
+        "repo": "squashfuse",
+        "type": "github"
+      }
+    },
+    "starc": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707220280,
+        "narHash": "sha256-VBgd9wOebW7RWym52434Mgz5w2k1csgw35JAe28Buvs=",
+        "ref": "refs/heads/main",
+        "rev": "5586cecb4f76dea16f38b2c0678904edbcfb191b",
+        "revCount": 18,
+        "type": "git",
+        "url": "https://git.krsnik.at/Kristian/starc-flake.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.krsnik.at/Kristian/starc-flake.git"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -294,18 +411,35 @@
        "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"
+      }
+    },
    "vscode-extensions": {
      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1695691129,
-        "narHash": "sha256-tUbgZOgmR/9vh4yvW3Bw6Xd+1f4DDcEI/EoqbO0SOuI=",
+        "lastModified": 1707182119,
+        "narHash": "sha256-Egt1PmjNAbx2nS0h/iWpaTCcOzLPHpRXzTJBt3waEAs=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "bd2d4d8c383ca5236a174742ef2d8d42307de40f",
+        "rev": "4e7767c214364217e0a7611dca3f3420555ceb20",
        "type": "github"
      },
      "original": {
@ -316,8 +450,10 @@
    },
    "wallpaper": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
--- a/flake.nix
+++ b/flake.nix
@ -2,41 +2,63 @@
  description = "Home Manager configuration of kristian";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    # nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    # nixpkgs-master.url = "github:nixos/nixpkgs/master";

    home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # Nix User Repository
-    nur.url = "github:nix-community/NUR";
+    nur = {
+      url = "github:nix-community/NUR";
+    };

-    # Wallpaper
-    wallpaper.url = "github:lunik1/nix-wallpaper";
+    wallpaper = {
+      url = "github:lunik1/nix-wallpaper";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

-    # Nix index
    nix-index-database = {
      url = "github:Mic92/nix-index-database";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # VSCode Extensions
-    vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
+    vscode-extensions = {
+      url = "github:nix-community/nix-vscode-extensions";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    spicetify = {
+      url = "github:the-argus/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    starc = {
+      url = "git+https://git.krsnik.at/Kristian/starc-flake.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    scanned-image-extractor = {
+      url = "git+https://git.krsnik.at/Kristian/scanned-image-extractor.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = {
    self,
    nixpkgs,
-    nixpkgs-unstable,
-    nixpkgs-master,
+    # nixpkgs-unstable,
+    # nixpkgs-master,
    home-manager,
    nur,
    wallpaper,
    nix-index-database,
    vscode-extensions,
+    spicetify,
+    starc,
+    scanned-image-extractor,
  }: let
    system = "x86_64-linux";
    pkgs = nixpkgs.legacyPackages.${system};
@ -47,10 +69,15 @@
      commonModules = [
        ./systems/common
        {
-          _module.args.wallpaper = wallpaper.packages.${system}.default;
-          _module.args.vscode-extensions = vscode-extensions.extensions.${system};
+          _module.args = {
+            inherit spicetify;
+            wallpaper = wallpaper.packages.${system}.default;
+            libs = import ./libs;
+          };
        }

+        spicetify.homeManagerModule
+
        nur.nixosModules.nur

        nix-index-database.hmModules.nix-index
@ -60,21 +87,23 @@

        {
          nixpkgs.overlays = [
-            ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
-              final: prev: {
-                unstable = import nixpkgs-unstable {
-                  system = final.system;
-                  config.allowUnfreePredicate = _: true;
-                };
-                master = import nixpkgs-master {
-                  system = final.system;
-                  config.allowUnfreePredicate = _: true;
-                };
-              }
-            )
-            ( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074
-              final: prev: {davinci-resolve = final.master.davinci-resolve;}
-            )
+            vscode-extensions.overlays.default
+
+            starc.overlays.default
+            scanned-image-extractor.overlays.default
+
+            # ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
+            #   final: prev: {
+            #     unstable = import nixpkgs-unstable {
+            #       system = final.system;
+            #       config.allowUnfreePredicate = _: true;
+            #     };
+            #     master = import nixpkgs-master {
+            #       system = final.system;
+            #       config.allowUnfreePredicate = _: true;
+            #     };
+            #   }
+            # )
          ];
        }
      ];
--- a/libs/default.nix
+++ b/libs/default.nix
@ -0,0 +1,16 @@
+{
+  mkAutostart = {
+    pkgs,
+    name,
+    command,
+  }: {
+    source = "${
+      pkgs.makeDesktopItem {
+        name = "${name}-autostart";
+        desktopName = "${name}-autostart";
+        exec = command;
+        noDisplay = true;
+      }
+    }/share/applications/${name}-autostart.desktop";
+  };
+}
--- a/systems/common/bash.nix
+++ b/systems/common/bash.nix
@ -7,6 +7,7 @@
    '';

    shellAliases = {
+      code = "codium"; # Alias VSCode with VSCodium
      ll = "ls -lh";
      la = "ls -lah";
      ".." = "cd ..";
--- a/systems/common/default.nix
+++ b/systems/common/default.nix
@ -26,7 +26,9 @@
    ./gnome.nix
    ./gpg.nix
    ./nvim
+    ./obs.nix
    ./packages.nix
+    ./spiceify.nix
    ./thunderbird.nix
    ./vscode.nix
    ./mpv.nix
@ -35,18 +37,21 @@
  # Programs
  programs = {
    home-manager.enable = true; # Allow home-manager to manage itself
-    obs-studio.enable = true;
    yt-dlp.enable = true;
  };

  xdg.mimeApps = {
    enable = true;

-    defaultApplications = {
-      "image/png" = ["org.gnome.eog.desktop"];
-      "image/jpeg" = ["org.gnome.eog.desktop"];
-      "video/webm" = ["mpv.desktop"];
-      "application/pdf" = ["org.gnome.Evince.desktop"];
+    defaultApplications = let
+      imageViewer = ["org.gnome.Loupe.desktop"];
+      videoViewer = ["mpv.desktop"];
+      documentViewer = ["org.gnome.Evince.desktop"];
+    in {
+      "image/png" = imageViewer;
+      "image/jpeg" = imageViewer;
+      "video/webm" = videoViewer;
+      "application/pdf" = documentViewer;
    };
  };
 }
--- a/systems/common/firefox.nix
+++ b/systems/common/firefox.nix
@ -13,6 +13,7 @@
        sidebery
        sponsorblock
        dearrow
+        user-agent-string-switcher
      ];

      settings = {
--- a/systems/common/git.nix
+++ b/systems/common/git.nix
@ -1,9 +1,11 @@
 {...}: {
-  programs.git = rec {
-    enable = true;
-
+  programs.git = let
    userName = "Kristian Krsnik";
    userEmail = "git@krsnik.at";
+  in {
+    enable = true;
+
+    inherit userName userEmail;

    signing = {
      key = userEmail;
--- a/systems/common/gnome.nix
+++ b/systems/common/gnome.nix
@ -35,14 +35,12 @@
    in {
      picture-uri = "file://${wallpaper.override {
        preset = "nord-snow-aurora";
-        inherit width;
-        inherit height;
+        inherit width height;
      }}/share/wallpapers/nixos-wallpaper.png";

      picture-uri-dark = "file://${wallpaper.override {
        preset = "nord-night-aurora";
-        inherit width;
-        inherit height;
+        inherit width height;
      }}/share/wallpapers/nixos-wallpaper.png";
    };

@ -53,6 +51,10 @@
      move-to-workspace-right = ["<Shift><Alt>2"];
    };

+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      mic-mute = ["<Shift>AudioMute"];
+    };
+
    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
      binding = "<Shift><Alt>a";
      command = "kgx";
@ -75,6 +77,7 @@
    "org/gnome/mutter" = {
      edge-tiling = true;
      dynamic-workspaces = true;
+      workspaces-only-on-primary = true;
    };

    "org/gnome/Console" = {
--- a/systems/common/obs.nix
+++ b/systems/common/obs.nix
@ -0,0 +1,32 @@
+{
+  pkgs,
+  libs,
+  config,
+  ...
+}: let
+  cfg = config.programs.obs;
+in {
+  options.programs.obs = {
+    autostart = pkgs.lib.mkOption {
+      type = pkgs.lib.types.bool;
+      default = false;
+    };
+  };
+
+  config = {
+    programs.obs-studio = {
+      enable = true;
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-source-record
+      ];
+    };
+
+    xdg.configFile = pkgs.lib.mkIf cfg.autostart {
+      "autostart/obs-autostart.desktop" = libs.mkAutostart {
+        inherit pkgs;
+        name = "obs";
+        command = "obs --startreplaybuffer";
+      };
+    };
+  };
+}
--- a/systems/common/packages.nix
+++ b/systems/common/packages.nix
@ -6,13 +6,20 @@
  nixpkgs.config = {
    allowUnfree = false;

+    permittedInsecurePackages = [
+      "electron-25.9.0"
+    ];
+
    allowUnfreePredicate = pkg:
      builtins.elem (lib.getName pkg) [
-        "vscode"
-        "vscode-extension-MS-python-vscode-pylance"
-        "vscode-extension-github-copilot"
        "osu-lazer"
        "spotify"
+        "linuxsampler"
+        "libsciter"
+        "obsidian"
+        "steam"
+        "steam-original"
+        "davinci-resolve"
      ];
  };

@ -26,9 +33,16 @@
    logseq
    xournalpp
    libreoffice
+    onlyoffice-bin
+
+    # For windows applications
+    bottles

    # Games
+    lutris
    osu-lazer
+    r2modman
+    prismlauncher

    # Communication
    webcord
@ -38,25 +52,43 @@

    # Creative software
    gimp
+    inkscape
    davinci-resolve

    ardour # DAW
    # plugins
+    sfizz
    swh_lv2
    zynaddsubfx
    caps
    cmt
    distrho
    surge
+    calf
+    dexed
+    odin2
+    ninjas2
+    linuxsampler
+
+    yabridge
+    yabridgectl

    geonkick # for drums

    # Misc
    gnome-decoder
    tor-browser-bundle-bin
+    obsidian
+    easyeffects
+
+    starc
+    scanned-image-extractor
+
+    rustdesk
+    wireshark
+    mullvad-vpn

    # Entertainment
-    spotify
    hypnotix

    # VPN client for university
--- a/systems/common/spiceify.nix
+++ b/systems/common/spiceify.nix
@ -0,0 +1,23 @@
+{
+  pkgs,
+  spicetify,
+  ...
+}: let
+  spicePkgs = spicetify.packages.${pkgs.system}.default;
+in {
+  programs.spicetify = {
+    enable = true;
+
+    theme = spicePkgs.themes.text;
+    colorScheme = "CatppuccinLatte";
+
+    enabledExtensions = with spicePkgs.extensions; [
+      shuffle # shuffle+ (special characters are sanitized out of ext names)
+      groupSession
+      wikify
+      fullScreen
+      playlistIntersection
+      phraseToPlaylist
+    ];
+  };
+}
--- a/systems/common/vscode.nix
+++ b/systems/common/vscode.nix
@ -1,12 +1,8 @@
-{
-  pkgs,
-  vscode-extensions,
-  ...
-}: {
-  programs.vscode = rec {
+{pkgs, ...}: {
+  programs.vscode = {
    enable = true;

-    package = pkgs.unstable.vscode; # To use the latest unstable vscode
+    package = pkgs.vscodium; # Replace VSCode with VSCodium

    enableUpdateCheck = false;
    enableExtensionUpdateCheck = false;
@ -20,20 +16,21 @@
    ];

    # This will only yield extensions that are compatible with the installed version of vscode
-    extensions = with (vscode-extensions.forVSCodeVersion package.version).vscode-marketplace; [
+    extensions = with pkgs.vscode-marketplace; [
      jnoortheen.nix-ide
      mkhl.direnv
      ms-python.python
      ms-python.vscode-pylance
      ms-python.autopep8
      james-yu.latex-workshop
-      github.copilot
      davidanson.vscode-markdownlint
      tamasfe.even-better-toml
      asciidoctor.asciidoctor-vscode
      ziglang.vscode-zig
      slevesque.shader
      ms-vscode.cpptools
+      nvarner.typst-lsp
+      redhat.java

      streetsidesoftware.code-spell-checker
      streetsidesoftware.code-spell-checker-german
@ -42,7 +39,7 @@
    userSettings = {
      "git.enableCommitSigning" = true;

-      "window.menuBarVisibility" = "hidden";
+      "window.menuBarVisibility" = "toggle";

      "editor.fontFamily" = "'FiraCode Nerd Font'";
      "editor.fontLigatures" = true;
@ -61,6 +58,16 @@
        "editor.defaultFormatter" = "ms-python.autopep8";
      };

+      "[javascript]" = {
+        "editor.formatOnSave" = true;
+        "editor.formatOnSaveMode" = "modificationsIfAvailable";
+      };
+
+      "[typescript]" = {
+        "editor.formatOnSave" = true;
+        "editor.formatOnSaveMode" = "modificationsIfAvailable";
+      };
+
      "[latex]" = {
        "editor.formatOnSave" = true;
        "editor.formatOnSaveMode" = "file"; # modificationsIfAvailable does not work
@ -81,6 +88,12 @@
        "editor.formatOnSaveMode" = "modificationsIfAvailable";
      };

+      "[typst]" = {
+        "editor.defaultFormatter" = "nvarner.typst-lsp";
+        "editor.formatOnSave" = true;
+        "editor.formatOnSaveMode" = "modificationsIfAvailable";
+      };
+
      "nix.enableLanguageServer" = true;
      "nix.serverPath" = "${pkgs.nil}/bin/nil";
      "nix.serverSettings" = {
@ -103,22 +116,21 @@

      "cSpell.language" = "en,de-de";

-      "zig.zigPath" = ""; # Use the zig from the PATH
-      "zig.zls.path" = "${pkgs.unstable.zls}/bin/zls";
+      "zig.path" = "";
+      "zig.zls.path" = "";
+      "zig.initialSetupDone" = true;

-      "C_Cpp.default.compilerPath" = "${pkgs.gnat11}/bin/g++";
+      "typst-lsp.serverPath" = "${pkgs.typst-lsp}/bin/typst-lsp";
+      "typst-lsp.experimentalFormatterMode" = "on";
+
+      "C_Cpp.default.compilerPath" = "${pkgs.gnat}/bin/g++";
      "C_Cpp.default.includePath" = [
        "\${workspaceFolder}/**"
      ];
      "C_Cpp.clang_format_fallbackStyle" = "Microsoft";

-      "github.copilot.enable" = {
-        "*" = true;
-        plaintext = false;
-        markdown = false;
-        scminput = false;
-        cpp = false;
-      };
+      "redhat.telemetry.enabled" = false;
+      "java.jdt.ls.java.home" = "${pkgs.jdk21_headless}";
    };
  };
 }
--- a/systems/laptop/default.nix
+++ b/systems/laptop/default.nix
@ -11,4 +11,6 @@
      power-button-action = "hibernate";
    };
  };
+
+  programs.obs.autostart = false;
 }
--- a/systems/pc/default.nix
+++ b/systems/pc/default.nix
@ -11,4 +11,6 @@
      power-button-action = "suspend";
    };
  };
+
+  programs.obs.autostart = true;
 }
Author	SHA1	Message	Date
Kristian Krsnik	9ed92a3f91	removed need for rec	2024-02-16 17:48:28 +01:00
Kristian Krsnik	28ba8e57bc	updated syntax	2024-02-16 17:45:51 +01:00
Kristian Krsnik	ae6da0ecc4	made option to set obs autostart behaviour	2024-02-16 17:41:53 +01:00
Kristian Krsnik	ae4462d98f	made obx-studio autostart and started libs	2024-02-15 21:17:48 +01:00
Kristian Krsnik	b0c1be575b	changed colour theme and extentions	2024-02-13 21:50:18 +01:00
Kristian Krsnik	4f1f1dfa77	added spicetify	2024-02-13 20:56:12 +01:00
Kristian Krsnik	a7b7f92d94	updated mimetypes	2024-02-12 15:30:17 +01:00
Kristian Krsnik	fae38b30e1	changed image viewer	2024-02-10 13:09:59 +01:00
Kristian Krsnik	e1c6428218	Set Mic Mute Keybind	2024-02-08 13:20:42 +01:00
Kristian Krsnik	a2f5757a36	Added easyeffects	2024-02-06 23:09:55 +01:00
Kristian Krsnik	8b67965f22	formatting	2024-02-06 20:37:18 +01:00
Kristian Krsnik	71dffa98ad	updated inputs	2024-02-06 19:53:42 +01:00
Kristian Krsnik	5dfaa1d593	moved alias to bash module	2024-02-06 16:13:57 +01:00
Kristian Krsnik	9da8bbeb37	(re)moved comments	2024-02-06 15:52:02 +01:00
Kristian Krsnik	d7d2a131aa	nixpkgs followes to remove dependencies	2024-02-06 15:26:29 +01:00
Kristian Krsnik	489e53b3ca	Updated Flake * Replaced VSCode with VSCodium * Added own Overlays * Added PrismLauncher	2024-02-06 13:23:36 +01:00
Kristian Krsnik	2b7235f3e6	Installed PolyMC Appimage because the official Flake did not work	2024-02-05 22:16:29 +01:00
Kristian Krsnik	3266df0ae9	Added Scanned Image Extractor Application	2024-02-03 17:39:57 +01:00
Kristian Krsnik	541a9e9d7b	updated story architect another time	2024-01-25 18:34:42 +01:00
Kristian Krsnik	6149734aa3	updated starc version	2024-01-25 16:24:16 +01:00
Kristian Krsnik	9a2ff5baf8	new version of Story Architect	2024-01-25 13:57:25 +01:00
Kristian Krsnik	23a3c153f5	added Story Architect Package	2024-01-25 13:09:27 +01:00
Kristian Krsnik	cb97b5c09c	added mullvad-vpn client	2024-01-09 14:34:00 +01:00
Kristian Krsnik	e1f9112222	added java development tools	2024-01-08 23:33:47 +01:00
Kristian Krsnik	fae62232cc	added onlyoffice	2024-01-08 18:59:37 +01:00
Kristian Krsnik	dcf00b71fe	added the lutris game launcher	2023-12-28 20:45:53 +01:00
Kristian Krsnik	409eb0e4d9	use zig and zls from path	2023-12-11 21:45:34 +01:00
Kristian Krsnik	168460efff	added zig and zls to vscode	2023-12-11 15:39:00 +01:00
Kristian Krsnik	85ff8412a7	gnome wornspaces only on primary monitor	2023-12-09 15:45:35 +01:00
Kristian Krsnik	f26f739f29	added modmanager for risk of rain 2	2023-12-06 18:30:44 +01:00
Kristian Krsnik	5be09f440a	installed typst typesetting program	2023-12-06 17:30:01 +01:00
Kristian Krsnik	254ae35c72	updated to 23.11	2023-12-03 21:06:22 +01:00
Kristian Krsnik	6eff12ec36	added inkscape	2023-11-29 09:52:25 +01:00
Kristian Krsnik	30c4ee388f	added wireshark	2023-11-22 13:18:22 +01:00
Kristian Krsnik	bb14d0ed56	added obsidian	2023-11-09 10:41:37 +01:00
Kristian Krsnik	229804be02	added audio production plugins	2023-11-07 23:24:27 +01:00
Kristian Krsnik	625b1d0249	added bottles for windows applications	2023-11-07 21:52:43 +01:00
Kristian Krsnik	9fe61160a8	added firefox extension	2023-11-07 21:52:03 +01:00
Kristian Krsnik	38a7200862	added rustdesk for remote assistance	2023-11-07 21:51:42 +01:00