removed collisions

- gitkraken only on linux and nvtop only on linux

config/clipboard.rasi

@@ -1,121 +0,0 @@
-// Config //
-configuration {
-    modi:                        "drun";
-    show-icons:                  false;
-}
-
-* {
-   main-bg : #11111be6;
-   main-fg : #cdd6f4ff;
-   main-br : #cba6f7ff;
-   main-ex : #f5e0dcff;
-   select-bg : #b4befeff;
-   select-fg : #11111bff;
-   separatorcolor : transparent;
-   border-color : transparent;
- }
-
-// Main //
-window {
-    width:                       23em;
-    height:                      30em;
-    transparency:                "real";
-    fullscreen:                  false;
-    enabled:                     true;
-    cursor:                      "default";
-    spacing:                     0em;
-    padding:                     0em;
-    border-color:                @main-br;
-    background-color:            @main-bg;
-}
-mainbox {
-    enabled:                     true;
-    spacing:                     0em;
-    padding:                     0.5em;
-    orientation:                 vertical;
-    children:                    [ "wallbox" , "listbox" ];
-    background-color:            transparent;
-}
-wallbox {
-    spacing:                     0em;
-    padding:                     0em;
-    expand:                      false;
-    orientation:                 horizontal;
-    background-color:            transparent;
-    background-image:            url("~/.dotfiles/config/backgrounds/aurora_borealis.png", width);
-    children:                    [ "wallframe" , "inputbar" ];
-}
-wallframe {
-    width:                       5em;
-    spacing:                     0em;
-    padding:                     0em;
-    expand:                      false;
-    background-color:            @main-bg;
-    background-image:            url("~/.dotfiles/config/backgrounds/aurora_borealis.png", height);
-}
-
-
-// Inputs //
-inputbar {
-    enabled:                     true;
-    padding:                     0em;
-    children:                    [ "entry" ];
-    background-color:            @main-bg;
-    expand:                      true;
-}
-entry {
-    enabled:                     true;
-    padding:                     1.8em;
-    text-color:                  @main-fg;
-    background-color:            transparent;
-}
-
-
-// Lists //
-listbox {
-    spacing:                     0em;
-    padding:                     0em;
-    orientation:                 vertical;
-    children:                    [ "dummy" , "listview" , "dummy" ];
-    background-color:            transparent;
-}
-listview {
-    enabled:                     true;
-    padding:                     0.5em;
-    columns:                     1;
-    lines:                       11; 
-    cycle:                       true;
-    fixed-height:                true;
-    fixed-columns:               false;
-    expand:                      false;
-    cursor:                      "default";
-    background-color:            transparent;
-    text-color:                  @main-fg;
-}
-dummy {
-    spacing:                     0em;
-    padding:                     0em;
-    background-color:            transparent;
-}
-
-
-// Elements //
-element {
-    enabled:                     true;
-    padding:                     0.5em;
-    cursor:                      pointer;
-    background-color:            transparent;
-    text-color:                  @main-fg;
-}
-element selected.normal {
-    background-color:            @select-bg;
-    text-color:                  @select-fg;
-}
-element-text {
-    vertical-align:              0.0;
-    horizontal-align:            0.0;
-    cursor:                      inherit;
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-

ginoza/configuration.nix

@@ -23,7 +23,7 @@
     };
   };
 
-  # System level configuration
+  boot.loader.systemd-boot.enable = true;
   sys = {
     audio.enable = true;
     bootloader.systemd-boot.enable = true;

kogami/configuration.nix

@@ -29,10 +29,10 @@
     ];
   };
 
-  # System level configuration
+  boot.loader.systemd-boot.enable = true;
   sys = {
     audio.enable = true;
-    bootloader.systemd-boot.enable = true;
+    #bootloader.systemd-boot.enable = true;
     desktop = {
       steamdeck.enable = true;
     };

nixos/home/apps/terminal_tools.nix

@@ -10,21 +10,28 @@
   };
 
   config = lib.mkIf config.app_list.terminal_tools.enable {
-    home.packages = with pkgs; [
+    home.packages = with pkgs;
-      btop
+      [
-      cmatrix
+        btop
-      entr
+        cmatrix
-      figlet
+        entr
-      jp2a
+        figlet
-      yt-dlp
+        jp2a
-      #nvtopPackages.full
+        yt-dlp
-      wget
+        wget
-      curl
+        curl
-      fzf
+        fzf
-      tldr
+        tldr
-      ranger
+        ranger
-      unzip
+        unzip
-    ];
+      ]
+      ++ (
+        if pkgs.system == "x86_64-linux"
+        then [
+          nvtopPackages.full
+        ]
+        else []
+      );
 
     nixpkgs.config.allowUnfreePredicate = pkg:
       builtins.elem (lib.getName pkg) [

nixos/home/packages/programming/git.nix

@@ -16,15 +16,20 @@
       userEmail = "kohout.fi.2023@skola.ssps.cz";
     };
 
-    home.packages = with pkgs; [
+    home.packages = with pkgs;
-      git
+      [
-      github-cli
+        git
-      #gitkraken
+        github-cli
-    ];
+      ]
+      ++ (
+        if pkgs.system == "x86_64-linux"
+        then [gitkraken]
+        else []
+      );
 
-     nixpkgs.config.allowUnfreePredicate = pkg:
+    nixpkgs.config.allowUnfreePredicate = pkg:
-        builtins.elem (lib.getName pkg) [
+      builtins.elem (lib.getName pkg) [
-          "gitkraken"
+        "gitkraken"
-        ];
+      ];
   };
 }

nixos/system/settings/bootloader.nix

@@ -3,10 +3,10 @@
   config,
 }: {
   options = {
-    sys.bootloader.systemd.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader";
+    sys.bootloader.systemd-boot.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader";
   };
 
-  config = lib.mkIf config.sys.bootloader.systemd.enable {
+  config = lib.mkIf config.sys.bootloader.systemd-boot.enable {
     boot.loader.systemd-boot.enable = true;
   };
 }

nixos/system/system.nix

@@ -15,14 +15,14 @@
     ./settings/loginManager.nix
     ./settings/style.nix
     ./settings/default-applications.nix
-    ./settings/bootloader.nix
+    #./settings/bootloader.nix
 
     ./settings/user.nix
   ];
 
   sys = {
     audio.enable = lib.mkDefault true;
-    bootloader.systemd-boot.enable = lib.mkDefault true;
+    #bootloader.systemd-boot.enable = lib.mkDefault true;
     desktop = {
       plasma.enable =
         if userSettings.plasma == true

tsunemori/configuration.nix

@@ -18,11 +18,7 @@
 
   # Simply install just the packages
   environment.packages = with pkgs; [
-    # User-facing stuff that you really really want to have
+    nano
-    neovim
-    git
-    neofetch
-
     # Some common stuff that people expect to have
     #procps
     #killall